diff options
84 files changed, 378 insertions, 256 deletions
@@ -1,3 +1,114 @@ +2000-11-13 Pavel Cisler <pavel@eazel.com> + + reviewed by: Darin Adler <darin@eazel.com> + + * configure.in: + Enable the sign-compare and cast-align warnings. + + * components/help/converters/gnome-db2html2/gdb3html.c: + (find_first_element): + * components/help/hyperbola-filefmt.c: (fmt_free_tree_info): + * components/help/hyperbola-nav-index.c: + (hyperbola_navigation_index_update_clist), (despace), + (end_element): + * components/history/nautilus-history-view.c: + (history_load_location): + * components/mozilla/nautilus-mozilla-content-view.c: + (string_list_get_index_of_string): + * components/services/install/lib/eazel-install-corba-types.c: + (corba_string_sequence_to_glist), + (corba_packagedatastructlist_from_packagedata_list), + (packagedata_list_from_corba_packagedatastructlist), + (categorydata_list_from_corba_categorystructlist): + * components/services/install/lib/eazel-install-query.c: + (eazel_install_simple_rpm_query): + * components/services/install/lib/eazel-install-rpm-glue.c: + (eazel_install_monitor_rpm_process_pipe): + * components/services/install/lib/eazel-install-rpm-signature.c: + (read_rpm_lead), (read_rpm_signature): + * components/services/trilobite/libtrilobite/trilobite-root-helper. + c: (trilobite_root_helper_run_program), + (trilobite_root_helper_set_time): + * cut-n-paste-code/widgets/nautilusclist/nautilusclist.c: + (nautilus_clist_get_arg), (nautilus_clist_construct): + * helper-utilities/authenticate/nautilus-authenticate.c: (main): + * libnautilus-extensions/nautilus-background.c: + (set_image_and_color_image_loading_done_callback): + * libnautilus-extensions/nautilus-buffered-widget.c: + (nautilus_gdk_pixbuf_tile_alpha): + * libnautilus-extensions/nautilus-caption-table.c: + (entry_activate): + * libnautilus-extensions/nautilus-caption-table.h: + * libnautilus-extensions/nautilus-ctree.c: + (nautilus_ctree_node_nth), (nautilus_ctree_drag_motion): + * libnautilus-extensions/nautilus-ctree.h: + * libnautilus-extensions/nautilus-directory-async.c: + (metafile_write): + * libnautilus-extensions/nautilus-file-changes-queue.c: + (nautilus_file_changes_consume_changes): + * libnautilus-extensions/nautilus-file-operations-progress.c: + (truncate_string_from_start): + * libnautilus-extensions/nautilus-file-operations.c: + (extract_string_until): + * libnautilus-extensions/nautilus-file-utilities.c: + (nautilus_read_entire_file): + * libnautilus-extensions/nautilus-gdk-extensions.c: + (nautilus_get_largest_fitting_font): + * libnautilus-extensions/nautilus-global-preferences.c: + (global_preferences_get_sidebar_panel_view_identifiers): + * libnautilus-extensions/nautilus-gtk-extensions.c: + (nautilus_gtk_window_set_initial_geometry_from_string), + (nautilus_gtk_menu_set_item_visibility): + * libnautilus-extensions/nautilus-icon-canvas-item.c: + (draw_or_measure_label_text), (draw_or_measure_label_text_aa): + * libnautilus-extensions/nautilus-icon-container.c: + (rubberband_timeout_callback), (destroy), (compute_stretch): + * libnautilus-extensions/nautilus-icon-container.h: + (nautilus_icon_container_find_drop_target): + * libnautilus-extensions/nautilus-icon-factory.c: + (check_recently_used_list), (get_themed_icon_file_path), + (revise_scale_factors_if_too_big): + * libnautilus-extensions/nautilus-icon-text-item.c: + (recompute_bounding_box), (iti_draw), (iti_selection_motion): + * libnautilus-extensions/nautilus-label.c: + (nautilus_label_size_allocate), (label_recompute_line_geometries): + * libnautilus-extensions/nautilus-list.c: (draw_cell), + (nautilus_list_drag_data_received): + * libnautilus-extensions/nautilus-mime-actions.c: + (server_matches_content_requirements), + (nautilus_do_component_query): + * libnautilus-extensions/nautilus-password-dialog.c: + (caption_table_activate_callback): + * libnautilus-extensions/nautilus-preferences-item.c: + (has_image_file): + * libnautilus-extensions/nautilus-scalable-font.c: + (file_as_string), (parse_font_description_file), + (nautilus_text_layout_new): + * libnautilus-extensions/nautilus-scalable-font.h: + * libnautilus-extensions/nautilus-volume-monitor.c: + (check_permissions): + * libnautilus/nautilus-view.c: + (nautilus_shallow_g_list_from_uri_list): + * libnautilus/nautilus-zoomable.c: + (nautilus_g_list_from_ZoomLevelList): + * librsvg/rsvg-ft.c: (rsvg_ft_measure_or_render_string): + * librsvg/rsvg.c: (rsvg_parse_transform): + * src/file-manager/fm-icon-view.c: + (fm_icon_view_create_background_context_menu_items), + (get_sort_criterion_by_metadata_text), (get_sort_criterion_by_id): + * src/file-manager/fm-list-view.c: (select_row_common), + (select_matching_name_callback), (select_previous_next_common), + (fm_list_view_bump_zoom_level): + * src/nautilus-search-bar-criterion.c: + (nautilus_search_bar_criterion_update_valid_criteria_choices): + * src/nautilus-shell.c: (corba_open_windows), + (corba_open_default_window): + * src/nautilus-sidebar.c: (nautilus_sidebar_add_panel_items): + * src/nautilus-window-menus.c: + (nautilus_window_disable_keyboard_navigation_for_menus): + * src/nautilus-window.c: (nautilus_window_size_request): + Fix all sign-compare violations. + 2000-11-13 Mathieu Lacage <mathieu@eazel.com> Buddy: pavel. diff --git a/components/help/converters/gnome-db2html2/gdb3html.c b/components/help/converters/gnome-db2html2/gdb3html.c index f24247e97..3be30a46b 100644 --- a/components/help/converters/gnome-db2html2/gdb3html.c +++ b/components/help/converters/gnome-db2html2/gdb3html.c @@ -160,8 +160,8 @@ find_first_element (Context *context, GSList *args) for (ptr = context->stack; ptr; ptr = ptr->next) { for (element_ptr = args; element_ptr; element_ptr = element_ptr->next) { - if (((StackElement*) ptr->data)->info && - ((StackElement*) ptr->data)->info->index == GPOINTER_TO_INT (element_ptr->data)) + if (((StackElement *) ptr->data)->info && + ((StackElement *) ptr->data)->info->index == GPOINTER_TO_UINT (element_ptr->data)) return (StackElement *) ptr->data; } } diff --git a/components/help/hyperbola-filefmt.c b/components/help/hyperbola-filefmt.c index cc8dc8f4b..80f5a9c2c 100644 --- a/components/help/hyperbola-filefmt.c +++ b/components/help/hyperbola-filefmt.c @@ -229,7 +229,7 @@ static void fmt_free_tree_info(HyperbolaDocTree *tree) { TreeInfo *tinfo; - int i; + guint i; tinfo = tree->user_data; if(!tinfo) diff --git a/components/help/hyperbola-nav-index.c b/components/help/hyperbola-nav-index.c index f54761050..f7ba4b0ef 100644 --- a/components/help/hyperbola-nav-index.c +++ b/components/help/hyperbola-nav-index.c @@ -194,7 +194,7 @@ hyperbola_navigation_index_update_clist(HyperbolaNavigationIndex *hni) g_print("Word %d is %s\n", cci.nwords, ctmp); cci.nwords++; } - while((ctmp = strtok(NULL, ", \t")) && cci.nwords < sizeof(cci.words)/sizeof(cci.words[0])); + while((ctmp = strtok(NULL, ", \t")) && (size_t)cci.nwords < sizeof(cci.words)/sizeof(cci.words[0])); } cci.did_select = FALSE; @@ -347,7 +347,7 @@ despace(GString *s) char *ctmp, *ctmp_s = NULL; int i; - g_assert(s->len == strlen(s->str)); + g_assert(s->len == (int) strlen(s->str)); for(ctmp = s->str, i = s->len; *ctmp; ctmp++, i--) { if(isspace(*ctmp)) @@ -364,7 +364,7 @@ despace(GString *s) memmove(ctmp_s + 1, ctmp, i + 1); ctmp = ctmp_s + 2; i--; - if(i != strlen(ctmp)) + if(i != (int) strlen(ctmp)) g_error("i (%d) != strlen(ctmp) (%ld)", i, (long)strlen(ctmp)); } ctmp_s = NULL; @@ -535,7 +535,7 @@ end_element (SAXParseInfo *spi, else this_type = NONE; - g_return_if_fail(this_type != NONE && !spi->stinfo[this_type] && this_type == spi->sub_type); + g_return_if_fail(this_type != NONE && !spi->stinfo[this_type] && this_type == (int) spi->sub_type); if(spi->sub_text->len) { diff --git a/components/history/nautilus-history-view.c b/components/history/nautilus-history-view.c index 9dfb19330..247d16a5b 100644 --- a/components/history/nautilus-history-view.c +++ b/components/history/nautilus-history-view.c @@ -142,7 +142,7 @@ history_load_location (NautilusView *view, NautilusBookmark *bookmark; Nautilus_HistoryList *history_list; Nautilus_HistoryItem *item; - int i; + guint i; static int lock = 0; if (lock != 0) { diff --git a/components/mozilla/nautilus-mozilla-content-view.c b/components/mozilla/nautilus-mozilla-content-view.c index a65c8f9b6..f06e32693 100644 --- a/components/mozilla/nautilus-mozilla-content-view.c +++ b/components/mozilla/nautilus-mozilla-content-view.c @@ -1079,7 +1079,7 @@ mozilla_dom_mouse_click_callback (GtkMozEmbed *mozilla, static gint string_list_get_index_of_string (const char *string_list[], guint num_strings, const char *string) { - gint i; + guint i; g_return_val_if_fail (string != NULL, STRING_LIST_NOT_FOUND); g_return_val_if_fail (string_list != NULL, STRING_LIST_NOT_FOUND); diff --git a/components/services/install/lib/eazel-install-corba-types.c b/components/services/install/lib/eazel-install-corba-types.c index 8345df939..09b847d35 100644 --- a/components/services/install/lib/eazel-install-corba-types.c +++ b/components/services/install/lib/eazel-install-corba-types.c @@ -27,7 +27,7 @@ static GList* corba_string_sequence_to_glist (CORBA_sequence_CORBA_string provides) { GList *result = NULL; - int iterator; + guint iterator; for (iterator = 0; iterator < provides._length; iterator++) { result = g_list_prepend (result, g_strdup (provides._buffer[iterator])); @@ -55,7 +55,7 @@ Trilobite_Eazel_PackageDataStructList corba_packagedatastructlist_from_packagedata_list (GList *packages) { Trilobite_Eazel_PackageDataStructList packagelist; - int i; + guint i; packagelist._length = g_list_length (packages); packagelist._buffer = CORBA_sequence_Trilobite_Eazel_PackageDataStruct_allocbuf (packagelist._length); @@ -168,7 +168,7 @@ GList* packagedata_list_from_corba_packagedatastructlist (const Trilobite_Eazel_PackageDataStructList corbapack) { GList *result; - int i; + guint i; result = NULL; @@ -287,7 +287,7 @@ GList* categorydata_list_from_corba_categorystructlist (const Trilobite_Eazel_CategoryStructList corbacategories) { GList *categories; - int i,j; + guint i,j; categories = NULL; diff --git a/components/services/install/lib/eazel-install-query.c b/components/services/install/lib/eazel-install-query.c index e5edd54e3..698ca385f 100644 --- a/components/services/install/lib/eazel-install-query.c +++ b/components/services/install/lib/eazel-install-query.c @@ -81,7 +81,7 @@ eazel_install_simple_rpm_query (EazelInstall *service, dbiIndexSet matches; rpmdb db; int rc; - int i; + guint i; gboolean free_db_system = FALSE; /* g_message (_("Querying for %s in package database in %s"), input, root); */ diff --git a/components/services/install/lib/eazel-install-rpm-glue.c b/components/services/install/lib/eazel-install-rpm-glue.c index 64e9df1de..29dac59d4 100644 --- a/components/services/install/lib/eazel-install-rpm-glue.c +++ b/components/services/install/lib/eazel-install-rpm-glue.c @@ -130,7 +130,7 @@ eazel_install_monitor_rpm_process_pipe (GIOChannel *source, EazelInstall *service) { char tmp; - static int package_name_length = 256; + static guint package_name_length = 256; static char package_name [256]; ssize_t bytes_read; static PackageData *pack = NULL; diff --git a/components/services/install/lib/eazel-install-rpm-signature.c b/components/services/install/lib/eazel-install-rpm-signature.c index 16a0b12f1..24c16993e 100644 --- a/components/services/install/lib/eazel-install-rpm-signature.c +++ b/components/services/install/lib/eazel-install-rpm-signature.c @@ -70,7 +70,7 @@ static int read_rpm_lead (int fd) { unsigned char buffer[96]; - int bytes = 0; + guint bytes = 0; int n; while (bytes < sizeof (buffer)) { @@ -114,7 +114,7 @@ read_rpm_signature (int fd, char **signature, int *signature_len) *signature = NULL; - for (bytes = 0; bytes < sizeof (header); ) { + for (bytes = 0; bytes < (int) sizeof (header); ) { n = read (fd, &header + bytes, sizeof (header) - bytes); if (n <= 0) { return -1; @@ -126,7 +126,7 @@ read_rpm_signature (int fd, char **signature, int *signature_len) header.data_size = ntohl (header.data_size); entry = g_new0 (RPMEntry, header.entries); - for (bytes = 0; bytes < (header.entries * sizeof (RPMEntry)); ) { + for (bytes = 0; bytes < (int) (header.entries * sizeof (RPMEntry)); ) { n = read (fd, entry + bytes, (header.entries * sizeof (RPMEntry)) - bytes); if (n <= 0) { goto bail; @@ -153,7 +153,7 @@ read_rpm_signature (int fd, char **signature, int *signature_len) } for (bytes = 0; bytes < offset; ) { - n = read (fd, buffer, MIN (offset - bytes, sizeof (buffer))); + n = read (fd, buffer, MIN (offset - bytes, (int) sizeof (buffer))); if (n <= 0) { goto bail; } @@ -176,7 +176,7 @@ read_rpm_signature (int fd, char **signature, int *signature_len) } offset = header.data_size - (*signature_len + offset); for (bytes = 0; bytes < offset; ) { - n = read (fd, buffer, MIN (offset - bytes, sizeof (buffer))); + n = read (fd, buffer, MIN (offset - bytes, (int) sizeof (buffer))); if (n <= 0) { goto bail; } diff --git a/components/services/trilobite/libtrilobite/trilobite-root-helper.c b/components/services/trilobite/libtrilobite/trilobite-root-helper.c index ef22f2665..2f9daeacd 100644 --- a/components/services/trilobite/libtrilobite/trilobite-root-helper.c +++ b/components/services/trilobite/libtrilobite/trilobite-root-helper.c @@ -488,7 +488,8 @@ trilobite_root_helper_run_program (TrilobiteRootHelper *root_helper, const char } out = g_strdup_printf ("%s %u\n", program, g_list_length (argv)); - if (write (root_helper->pipe_stdin, out, strlen (out)) < strlen (out)) { + len = strlen (out); + if (write (root_helper->pipe_stdin, out, len) < len) { g_free (out); goto bail; } @@ -528,7 +529,8 @@ trilobite_root_helper_set_time (TrilobiteRootHelper *root_helper, GList *argv, i GList *item; char *out; char ch; - + int len; + if (fd) { *fd = -1; } @@ -540,7 +542,8 @@ trilobite_root_helper_set_time (TrilobiteRootHelper *root_helper, GList *argv, i } out = g_strdup_printf ("set-time %s\n", (char *)item->data); - if (write (root_helper->pipe_stdin, out, strlen (out)) < strlen (out)) { + len = strlen (out); + if (write (root_helper->pipe_stdin, out, len) < len) { g_free (out); goto bail; } diff --git a/configure.in b/configure.in index e4f72d429..9c1611ba1 100644 --- a/configure.in +++ b/configure.in @@ -687,6 +687,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then -Wall \ -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \ -Wnested-externs -Wpointer-arith \ + -Wcast-align -Wsign-compare \ -Werror \ $CFLAGS" diff --git a/cut-n-paste-code/widgets/nautilusclist/nautilusclist.c b/cut-n-paste-code/widgets/nautilusclist/nautilusclist.c index 48d203e6c..b9d1c4dc4 100644 --- a/cut-n-paste-code/widgets/nautilusclist/nautilusclist.c +++ b/cut-n-paste-code/widgets/nautilusclist/nautilusclist.c @@ -881,7 +881,7 @@ nautilus_clist_get_arg (GtkObject *object, switch (arg_id) { - guint i; + int i; case ARG_N_COLUMNS: GTK_VALUE_UINT (*arg) = clist->columns; @@ -1038,7 +1038,7 @@ nautilus_clist_construct (NautilusCList *clist, if (titles) { - guint i; + int i; NAUTILUS_CLIST_SET_FLAG (clist, CLIST_SHOW_TITLES); for (i = 0; i < columns; i++) @@ -5513,7 +5513,7 @@ nautilus_clist_forall (GtkContainer *container, gpointer callback_data) { NautilusCList *clist; - guint i; + int i; g_return_if_fail (container != NULL); g_return_if_fail (NAUTILUS_IS_CLIST (container)); @@ -7599,7 +7599,7 @@ nautilus_clist_drag_leave (GtkWidget *widget, list = context->targets; while (list) { - if (atom == GPOINTER_TO_INT (list->data)) + if (atom == GPOINTER_TO_UINT (list->data)) { NAUTILUS_CLIST_CLASS_FW (clist)->draw_drag_highlight (clist, @@ -7654,7 +7654,7 @@ nautilus_clist_drag_motion (GtkWidget *widget, list = context->targets; while (list) { - if (atom == GPOINTER_TO_INT (list->data)) + if (atom == GPOINTER_TO_UINT (list->data)) break; list = list->next; } @@ -7728,7 +7728,7 @@ nautilus_clist_drag_drop (GtkWidget *widget, list = context->targets; while (list) { - if (atom == GPOINTER_TO_INT (list->data)) + if (atom == GPOINTER_TO_UINT (list->data)) return TRUE; list = list->next; } diff --git a/helper-utilities/authenticate/nautilus-authenticate.c b/helper-utilities/authenticate/nautilus-authenticate.c index 47e4f0833..826a791dd 100644 --- a/helper-utilities/authenticate/nautilus-authenticate.c +++ b/helper-utilities/authenticate/nautilus-authenticate.c @@ -51,13 +51,11 @@ int main (int argc, char *argv[]) gnome_init ("PrivilegedAuthentication", "1.0", argc, argv); - if (argc > 1) - { + if (argc > 1) { GString *str = g_string_new (""); - guint i; + int i; - for(i = 1; i < argc; i++) - { + for(i = 1; i < argc; i++) { if (i > 1) g_string_append(str, " "); @@ -87,8 +85,7 @@ int main (int argc, char *argv[]) username = nautilus_password_dialog_get_username (NAUTILUS_PASSWORD_DIALOG (password_dialog)); password = nautilus_password_dialog_get_password (NAUTILUS_PASSWORD_DIALOG (password_dialog)); - if (nautilus_authenticate_authenticate (username, password)) - { + if (nautilus_authenticate_authenticate (username, password)) { /* Free the password right away to blow it away from memory. */ if (password) { g_free(password); @@ -112,15 +109,8 @@ int main (int argc, char *argv[]) username); } - if (username) { - g_free(username); - username = NULL; - } - - if (password) { - g_free(password); - password = NULL; - } + g_free(username); + g_free(password); } return rv; diff --git a/libnautilus-extensions/nautilus-background.c b/libnautilus-extensions/nautilus-background.c index 1d4326712..41b8afc8f 100644 --- a/libnautilus-extensions/nautilus-background.c +++ b/libnautilus-extensions/nautilus-background.c @@ -1061,8 +1061,8 @@ nautilus_background_set_image_uri (NautilusBackground *background, const char *i static void set_image_and_color_image_loading_done_callback (NautilusBackground *background, gboolean successful_load, const char *color) { - gtk_signal_disconnect_by_func (GTK_OBJECT (background), GTK_SIGNAL_FUNC (set_image_and_color_image_loading_done_callback), (gpointer) color); - nautilus_background_set_color (background, color); + gtk_signal_disconnect_by_func (GTK_OBJECT (background), GTK_SIGNAL_FUNC (set_image_and_color_image_loading_done_callback), (gpointer) color); + nautilus_background_set_color (background, color); } /* Use this fn to set both the image and color and avoid flash. The color isn't diff --git a/libnautilus-extensions/nautilus-buffered-widget.c b/libnautilus-extensions/nautilus-buffered-widget.c index bf3cd7388..2fe8a6b6a 100644 --- a/libnautilus-extensions/nautilus-buffered-widget.c +++ b/libnautilus-extensions/nautilus-buffered-widget.c @@ -322,8 +322,8 @@ nautilus_gdk_pixbuf_tile_alpha (GdkPixbuf *pixbuf, GdkInterpType interpolation_mode, guchar overall_alpha) { - gint x; - gint y; + guint x; + guint y; guchar *pixels; guchar *tile_pixels; guint num_ver_iterations; @@ -335,8 +335,8 @@ nautilus_gdk_pixbuf_tile_alpha (GdkPixbuf *pixbuf, g_return_if_fail (pixbuf != NULL); g_return_if_fail (tile_pixbuf != NULL); - g_return_if_fail (tile_width <= gdk_pixbuf_get_width (tile_pixbuf)); - g_return_if_fail (tile_height <= gdk_pixbuf_get_height (tile_pixbuf)); + g_return_if_fail ((int) tile_width <= gdk_pixbuf_get_width (tile_pixbuf)); + g_return_if_fail ((int) tile_height <= gdk_pixbuf_get_height (tile_pixbuf)); g_return_if_fail (gdk_pixbuf_get_pixels (pixbuf) != NULL); g_return_if_fail (gdk_pixbuf_get_pixels (tile_pixbuf) != NULL); @@ -350,18 +350,16 @@ nautilus_gdk_pixbuf_tile_alpha (GdkPixbuf *pixbuf, y = 0; - for (j = 0; j < num_ver_iterations; j++) - { + for (j = 0; j < num_ver_iterations; j++) { x = 0; - for (i = 0; i < num_hor_iterations; i++) - { - guint copy_width; - guint copy_height; - gint dst_x; - gint dst_y; - gint dst_x2; - gint dst_y2; + for (i = 0; i < num_hor_iterations; i++) { + gint copy_width; + gint copy_height; + guint dst_x; + guint dst_y; + guint dst_x2; + guint dst_y2; dst_x = x; dst_y = y; @@ -372,18 +370,15 @@ nautilus_gdk_pixbuf_tile_alpha (GdkPixbuf *pixbuf, dst_x2 = dst_x + copy_width; dst_y2 = dst_y + copy_height; - if (dst_x2 > width) - { + if (dst_x2 > width) { copy_width -= (dst_x2 - width); } - if (dst_y2 > height) - { + if (dst_y2 > height) { copy_height -= (dst_y2 - height); } - if (copy_width > 0 && copy_height > 0) - { + if (copy_width > 0 && copy_height > 0) { GdkRectangle destination_area; destination_area.x = dst_x; diff --git a/libnautilus-extensions/nautilus-caption-table.c b/libnautilus-extensions/nautilus-caption-table.c index b6341e1cd..f4678b26f 100644 --- a/libnautilus-extensions/nautilus-caption-table.c +++ b/libnautilus-extensions/nautilus-caption-table.c @@ -281,19 +281,20 @@ entry_activate (GtkWidget *widget, gpointer data) index = caption_table_index_of_entry (caption_table, widget); /* Check for an invalid index */ - if (index == -1) + if (index == -1) { return; - + } + /* Check for the last index */ - if (index < caption_table->detail->num_rows) - { + if (index < (int) caption_table->detail->num_rows) { /* Look for the next sensitive entry */ - GtkWidget* sensitive_entry = + GtkWidget *sensitive_entry = caption_table_find_next_sensitive_entry (caption_table, index + 1); /* Make the next sensitive entry take focus */ - if (sensitive_entry) + if (sensitive_entry) { gtk_widget_grab_focus (sensitive_entry); + } } /* Emit the activate signal */ diff --git a/libnautilus-extensions/nautilus-caption-table.h b/libnautilus-extensions/nautilus-caption-table.h index d899289d1..612fe029e 100644 --- a/libnautilus-extensions/nautilus-caption-table.h +++ b/libnautilus-extensions/nautilus-caption-table.h @@ -57,7 +57,7 @@ struct _NautilusCaptionTableClass { GtkTableClass parent_class; - void (*activate) (GtkWidget *caption_table, int active_entry); + void (*activate) (GtkWidget *caption_table, guint active_entry); }; GtkType nautilus_caption_table_get_type (void); diff --git a/libnautilus-extensions/nautilus-ctree.c b/libnautilus-extensions/nautilus-ctree.c index e81203df5..50f19b6a1 100644 --- a/libnautilus-extensions/nautilus-ctree.c +++ b/libnautilus-extensions/nautilus-ctree.c @@ -4135,7 +4135,7 @@ nautilus_ctree_find_node_ptr (NautilusCTree *ctree, NautilusCTreeNode * nautilus_ctree_node_nth (NautilusCTree *ctree, - guint row) + int row) { g_return_val_if_fail (ctree != NULL, NULL); g_return_val_if_fail (NAUTILUS_IS_CTREE (ctree), NULL); @@ -5988,7 +5988,7 @@ nautilus_ctree_drag_motion (GtkWidget *widget, list = context->targets; while (list) { - if (atom == GPOINTER_TO_INT (list->data)) + if (atom == GPOINTER_TO_UINT (list->data)) break; list = list->next; } diff --git a/libnautilus-extensions/nautilus-ctree.h b/libnautilus-extensions/nautilus-ctree.h index c5db50f6c..3e58e4fd6 100644 --- a/libnautilus-extensions/nautilus-ctree.h +++ b/libnautilus-extensions/nautilus-ctree.h @@ -236,7 +236,7 @@ NautilusCTreeNode * nautilus_ctree_last (NautilusCTree *c NautilusCTreeNode * nautilus_ctree_find_node_ptr (NautilusCTree *ctree, NautilusCTreeRow *ctree_row); NautilusCTreeNode * nautilus_ctree_node_nth (NautilusCTree *ctree, - guint row); + int row); gboolean nautilus_ctree_find (NautilusCTree *ctree, NautilusCTreeNode *node, NautilusCTreeNode *child); diff --git a/libnautilus-extensions/nautilus-directory-async.c b/libnautilus-extensions/nautilus-directory-async.c index bb1487fa3..00cc9621d 100644 --- a/libnautilus-extensions/nautilus-directory-async.c +++ b/libnautilus-extensions/nautilus-directory-async.c @@ -65,7 +65,7 @@ struct MetafileWriteState { gboolean use_public_metafile; GnomeVFSAsyncHandle *handle; xmlChar *buffer; - int size; + GnomeVFSFileSize size; gboolean write_again; }; @@ -855,6 +855,8 @@ nautilus_metafile_write_start (NautilusDirectory *directory) static void metafile_write (NautilusDirectory *directory) { + int xml_doc_size; + g_assert (NAUTILUS_IS_DIRECTORY (directory)); nautilus_directory_ref (directory); @@ -881,7 +883,8 @@ metafile_write (NautilusDirectory *directory) = can_use_public_metafile (directory); xmlDocDumpMemory (directory->details->metafile, &directory->details->metafile_write_state->buffer, - &directory->details->metafile_write_state->size); + &xml_doc_size); + directory->details->metafile_write_state->size = xml_doc_size; nautilus_metafile_write_start (directory); } diff --git a/libnautilus-extensions/nautilus-file-changes-queue.c b/libnautilus-extensions/nautilus-file-changes-queue.c index cc26fbb70..3919bf54e 100644 --- a/libnautilus-extensions/nautilus-file-changes-queue.c +++ b/libnautilus-extensions/nautilus-file-changes-queue.c @@ -318,8 +318,8 @@ nautilus_file_changes_consume_changes (gboolean consume_all) GList *position_setting_requests; URIPair *pair; NautilusFileChangesQueuePositionSetting *position_setting; - int kind; - int chunk_count; + NautilusFileChangeKind kind; + guint chunk_count; NautilusFileChangesQueue *queue; diff --git a/libnautilus-extensions/nautilus-file-operations-progress.c b/libnautilus-extensions/nautilus-file-operations-progress.c index 7ba7ffb33..b2dee80d3 100644 --- a/libnautilus-extensions/nautilus-file-operations-progress.c +++ b/libnautilus-extensions/nautilus-file-operations-progress.c @@ -86,7 +86,7 @@ truncate_string_from_start (const char *string, GdkFont *font, guint length) static guint dotdotdot = 0; int truncate_offset; - if (gdk_string_width (font, string) <= length) { + if (gdk_string_width (font, string) <= (int) length) { /* string is already short enough*/ return g_strdup (string); } @@ -101,7 +101,7 @@ truncate_string_from_start (const char *string, GdkFont *font, guint length) /* Cut the font length of string to length. */ length -= dotdotdot; for (truncate_offset = 0; ; truncate_offset++) { - if (gdk_string_width (font, string + truncate_offset) <= length) { + if (gdk_string_width (font, string + truncate_offset) <= (int) length) { break; } } diff --git a/libnautilus-extensions/nautilus-file-operations.c b/libnautilus-extensions/nautilus-file-operations.c index 7f806ed0f..661421568 100644 --- a/libnautilus-extensions/nautilus-file-operations.c +++ b/libnautilus-extensions/nautilus-file-operations.c @@ -622,7 +622,7 @@ extract_string_until (const char *original, const char *until_substring) { char *result; - g_assert (strlen (original) >= until_substring - original); + g_assert ((int) strlen (original) >= until_substring - original); g_assert (until_substring - original >= 0); result = g_malloc (until_substring - original + 1); diff --git a/libnautilus-extensions/nautilus-file-utilities.c b/libnautilus-extensions/nautilus-file-utilities.c index ff0221838..b2ab669b5 100644 --- a/libnautilus-extensions/nautilus-file-utilities.c +++ b/libnautilus-extensions/nautilus-file-utilities.c @@ -63,7 +63,7 @@ struct NautilusReadFileHandle { gpointer callback_data; gboolean is_open; char *buffer; - int bytes_read; + GnomeVFSFileSize bytes_read; }; #undef PTHREAD_ASYNC_READ @@ -635,7 +635,7 @@ nautilus_read_entire_file (const char *uri, GnomeVFSResult result; GnomeVFSHandle *handle; char *buffer; - int total_bytes_read; + GnomeVFSFileSize total_bytes_read; GnomeVFSFileSize bytes_read; *file_size = 0; diff --git a/libnautilus-extensions/nautilus-gdk-extensions.c b/libnautilus-extensions/nautilus-gdk-extensions.c index 970132791..924fac16a 100644 --- a/libnautilus-extensions/nautilus-gdk-extensions.c +++ b/libnautilus-extensions/nautilus-gdk-extensions.c @@ -562,10 +562,10 @@ nautilus_gdk_font_equal (GdkFont *font_a_null_allowed, GdkFont * nautilus_get_largest_fitting_font (const char *text_to_format, int width, const char *font_template) { - int font_index, this_width; + guint font_index; + int this_width; char *font_name; - /*const int font_sizes[5] = { 28, 24, 18, 14, 12 };*/ - const int font_sizes[4] = { 20, 18, 14, 12 }; + const int font_sizes[] = { 20, 18, 14, 12 }; GdkFont *candidate_font; char *alt_text_to_format = NULL; char *temp_str; diff --git a/libnautilus-extensions/nautilus-global-preferences.c b/libnautilus-extensions/nautilus-global-preferences.c index d02519ab1..fd1363d78 100644 --- a/libnautilus-extensions/nautilus-global-preferences.c +++ b/libnautilus-extensions/nautilus-global-preferences.c @@ -371,7 +371,7 @@ global_preferences_get_sidebar_panel_view_identifiers (void) CORBA_Environment ev; const char *query; OAF_ServerInfoList *oaf_result; - int i; + guint i; NautilusViewIdentifier *id; GList *view_identifiers; diff --git a/libnautilus-extensions/nautilus-gtk-extensions.c b/libnautilus-extensions/nautilus-gtk-extensions.c index 4f6d1c46c..f2e876ad7 100644 --- a/libnautilus-extensions/nautilus-gtk-extensions.c +++ b/libnautilus-extensions/nautilus-gtk-extensions.c @@ -429,8 +429,8 @@ nautilus_gtk_window_set_initial_geometry_from_string (GtkWindow *window, /* Make sure the window isn't smaller than makes sense for this window. * Other sanity checks are performed in set_initial_geometry. */ - width = MAX (width, minimum_width); - height = MAX (height, minimum_height); + width = MAX (width, (int) minimum_width); + height = MAX (height, (int) minimum_height); nautilus_gtk_window_set_initial_geometry (window, left, top, width, height); } @@ -591,7 +591,7 @@ nautilus_gtk_menu_set_item_visibility (GtkMenu *menu, int index, gboolean visibl g_return_if_fail (GTK_IS_MENU (menu)); children = gtk_container_children (GTK_CONTAINER (menu)); - g_return_if_fail (index >= 0 && index < g_list_length (children)); + g_return_if_fail (index >= 0 && index < (int) g_list_length (children)); menu_item = GTK_WIDGET (g_list_nth_data (children, index)); if (visible) { diff --git a/libnautilus-extensions/nautilus-icon-canvas-item.c b/libnautilus-extensions/nautilus-icon-canvas-item.c index 476e8849a..7d503ef51 100644 --- a/libnautilus-extensions/nautilus-icon-canvas-item.c +++ b/libnautilus-extensions/nautilus-icon-canvas-item.c @@ -666,7 +666,7 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item, int icon_bottom) { NautilusIconCanvasItemDetails *details; - int width_so_far, height_so_far; + guint width_so_far, height_so_far; GdkGC* gc; GdkGCValues save_gc; guint32 label_color; @@ -784,7 +784,7 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item, } } - width_so_far = MAX (width_so_far, icon_text_info->width); + width_so_far = MAX (width_so_far, (guint) icon_text_info->width); height_so_far += icon_text_info->height; gnome_icon_text_info_free (icon_text_info); @@ -802,8 +802,8 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item, * before the call to draw. We might later decide to use this function * differently and change these asserts. */ - g_assert (height_so_far == details->text_height); - g_assert (width_so_far == details->text_width); + g_assert ((int) height_so_far == details->text_height); + g_assert ((int) width_so_far == details->text_width); gdk_gc_set_foreground (gc, &save_gc.foreground); @@ -1299,7 +1299,7 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item, int icon_bottom) { NautilusIconCanvasItemDetails *details; - int width_so_far, height_so_far; + guint width_so_far, height_so_far; guint32 label_name_color; guint32 label_info_color; GnomeCanvasItem *canvas_item; @@ -1429,7 +1429,7 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item, } - width_so_far = MAX (width_so_far, icon_text_layout->width); + width_so_far = MAX (width_so_far, (guint) icon_text_layout->width); height_so_far += icon_text_layout->height; nautilus_text_layout_free (icon_text_layout); @@ -1448,8 +1448,8 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item, * before the call to draw. We might later decide to use this function * differently and change these asserts. */ - g_assert (height_so_far == details->text_height); - g_assert (width_so_far == details->text_width); + g_assert ((int) height_so_far == details->text_height); + g_assert ((int) width_so_far == details->text_width); box_left = icon_left + (icon_width - width_so_far) / 2; diff --git a/libnautilus-extensions/nautilus-icon-container.c b/libnautilus-extensions/nautilus-icon-container.c index 48119b11a..0f00ea602 100644 --- a/libnautilus-extensions/nautilus-icon-container.c +++ b/libnautilus-extensions/nautilus-icon-container.c @@ -1300,7 +1300,7 @@ rubberband_timeout_callback (gpointer data) } if (y_scroll == 0 && x_scroll == 0 - && band_info->prev_x == x && band_info->prev_y == y) { + && (int) band_info->prev_x == x && (int) band_info->prev_y == y) { return TRUE; } @@ -2132,7 +2132,7 @@ static void destroy (GtkObject *object) { NautilusIconContainer *container; - int i; + guint i; container = NAUTILUS_ICON_CONTAINER (object); @@ -3764,7 +3764,7 @@ nautilus_icon_container_request_update (NautilusIconContainer *container, /* zooming */ -int +NautilusZoomLevel nautilus_icon_container_get_zoom_level (NautilusIconContainer *container) { return container->details->zoom_level; @@ -4219,8 +4219,8 @@ compute_stretch (StretchState *start, int x_stretch, y_stretch; /* Figure out which handle we are dragging. */ - right = start->pointer_x > start->icon_x + start->icon_size / 2; - bottom = start->pointer_y > start->icon_y + start->icon_size / 2; + right = start->pointer_x > start->icon_x + (int) start->icon_size / 2; + bottom = start->pointer_y > start->icon_y + (int) start->icon_size / 2; /* Figure out how big we should stretch. */ x_stretch = start->pointer_x - current->pointer_x; diff --git a/libnautilus-extensions/nautilus-icon-container.h b/libnautilus-extensions/nautilus-icon-container.h index c884cb993..c4e02b05d 100644 --- a/libnautilus-extensions/nautilus-icon-container.h +++ b/libnautilus-extensions/nautilus-icon-container.h @@ -190,7 +190,7 @@ void nautilus_icon_container_unstretch (NautilusIconCo void nautilus_icon_container_start_renaming_selected_item (NautilusIconContainer *container); /* options */ -int nautilus_icon_container_get_zoom_level (NautilusIconContainer *view); +NautilusZoomLevel nautilus_icon_container_get_zoom_level (NautilusIconContainer *view); void nautilus_icon_container_set_zoom_level (NautilusIconContainer *view, int new_zoom_level); void nautilus_icon_container_set_single_click_mode (NautilusIconContainer *container, diff --git a/libnautilus-extensions/nautilus-icon-factory.c b/libnautilus-extensions/nautilus-icon-factory.c index 7b6eeba05..10592fd4f 100644 --- a/libnautilus-extensions/nautilus-icon-factory.c +++ b/libnautilus-extensions/nautilus-icon-factory.c @@ -316,7 +316,7 @@ check_recently_used_list (void) { NautilusIconFactory *factory; NautilusCircularList *head, *node, *next; - int count; + guint count; factory = get_icon_factory (); @@ -875,7 +875,7 @@ get_themed_icon_file_path (const char *theme_name, gboolean aa_mode, IconDetails *details) { - int i; + guint i; gboolean include_size; char *themed_icon_name, *partial_path, *path, *aa_path, *xml_path; xmlDocPtr doc; @@ -1759,14 +1759,14 @@ revise_scale_factors_if_too_big (GdkPixbuf *pixbuf, double *scale_x, double *scale_y) { - int width, height; + guint width, height; double y_distortion; width = gdk_pixbuf_get_width (pixbuf); height = gdk_pixbuf_get_height (pixbuf); - if ((int) (width * *scale_x) <= size->maximum_width - && (int) (height * *scale_y) <= size->maximum_height) { + if ((int) (width * *scale_x) <= (int) size->maximum_width + && (int) (height * *scale_y) <= (int) size->maximum_height) { return; } diff --git a/libnautilus-extensions/nautilus-icon-text-item.c b/libnautilus-extensions/nautilus-icon-text-item.c index 88e18d79b..5ff22d9ea 100644 --- a/libnautilus-extensions/nautilus-icon-text-item.c +++ b/libnautilus-extensions/nautilus-icon-text-item.c @@ -312,7 +312,7 @@ recompute_bounding_box (Iti *iti) double affine[6]; ArtPoint p, q; int x1, y1, x2, y2; - int width, height; + guint width, height; ItiPrivate *priv; item = GNOME_CANVAS_ITEM (iti); @@ -565,7 +565,7 @@ iti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, { Iti *iti; GtkStyle *style; - int w, h; + guint w, h; int xofs, yofs; ItiPrivate *priv; @@ -853,12 +853,14 @@ iti_selection_motion (Iti *iti, int idx) ItiPrivate *priv; GtkEditable *e; + g_assert (idx >= 0); + priv = iti->priv; e = GTK_EDITABLE (priv->entry); - if (idx < e->current_pos) { + if (idx < (int) e->current_pos) { e->selection_start_pos = idx; - e->selection_end_pos = e->current_pos; + e->selection_end_pos = e->current_pos; } else { e->selection_start_pos = e->current_pos; e->selection_end_pos = idx; diff --git a/libnautilus-extensions/nautilus-label.c b/libnautilus-extensions/nautilus-label.c index e6ab8b5ff..ac931e183 100644 --- a/libnautilus-extensions/nautilus-label.c +++ b/libnautilus-extensions/nautilus-label.c @@ -333,7 +333,10 @@ nautilus_label_size_allocate (GtkWidget *widget, GtkAllocation *allocation) label = NAUTILUS_LABEL (widget); - if (label->detail->line_wrap_width == -1) { + /* FIXME: + * this never happens + */ + if ((int) label->detail->line_wrap_width == -1) { label_recompute_line_geometries (label); } } @@ -568,7 +571,10 @@ label_recompute_line_geometries (NautilusLabel *label) /* determine the width to use for wrapping. A wrap width of -1 means use all of the available space. */ /* Don't use it if the widget is too small, since we won't be able to fit any words in */ - if (label->detail->line_wrap_width == -1 && clipped_widget_width > 32) { + /* FIXME: + * the -1 case never happens + */ + if ((int) label->detail->line_wrap_width == -1 && clipped_widget_width > 32) { wrap_width = clipped_widget_width; } else { wrap_width = label->detail->line_wrap_width; @@ -582,7 +588,7 @@ label_recompute_line_geometries (NautilusLabel *label) label->detail->total_text_line_height += label->detail->text_layouts[i]->height; - if (label->detail->text_layouts[i]->width > label->detail->max_text_line_width) { + if (label->detail->text_layouts[i]->width > (int) label->detail->max_text_line_width) { label->detail->max_text_line_width = label->detail->text_layouts[i]->width; } } diff --git a/libnautilus-extensions/nautilus-list.c b/libnautilus-extensions/nautilus-list.c index 64e646049..83172a4ad 100644 --- a/libnautilus-extensions/nautilus-list.c +++ b/libnautilus-extensions/nautilus-list.c @@ -2210,9 +2210,9 @@ draw_cell (NautilusCList *clist, GdkRectangle *area, int row_index, int column_i for (p = NAUTILUS_CELL_PIXBUF_LIST (row->cell[column_index])->pixbufs; p != NULL; p = p->next) { pixbuf_width = gdk_pixbuf_get_width (p->data); - if ((p->next != NULL && pixbuf_width + ellipsis_width >= + if ((p->next != NULL && (int) (pixbuf_width + ellipsis_width) >= cell_rectangle.x + cell_rectangle.width - offset) - || (pixbuf_width >= cell_rectangle.x + cell_rectangle.width - offset)) { + || ((int) pixbuf_width >= cell_rectangle.x + cell_rectangle.width - offset)) { /* Not enough room for this icon & ellipsis, just draw ellipsis. */ gdk_draw_string (clist->clist_window, style->font, fg_gc, @@ -3203,7 +3203,6 @@ nautilus_list_drag_data_received (GtkWidget *widget, GdkDragContext *context, drag_info->drop_occured = FALSE; drag_info->got_drop_data_type = FALSE; } - } diff --git a/libnautilus-extensions/nautilus-mime-actions.c b/libnautilus-extensions/nautilus-mime-actions.c index e855df9ac..cc2d623a6 100644 --- a/libnautilus-extensions/nautilus-mime-actions.c +++ b/libnautilus-extensions/nautilus-mime-actions.c @@ -1462,7 +1462,7 @@ server_matches_content_requirements (OAF_ServerInfo *server, { OAF_Property *prop; GNOME_stringlist types; - int i; + guint i; /* Components explicitly requested in the metafile are not capability tested. */ if (g_list_find_custom (explicit_iids, (gpointer) server->iid, (GCompareFunc) strcmp) != NULL) { @@ -1472,7 +1472,7 @@ server_matches_content_requirements (OAF_ServerInfo *server, if (!server_has_content_requirements (server)) { return TRUE; } else { - prop = oaf_server_info_prop_find (server, "nautilus:required_directory_content_mime_types"); + prop = oaf_server_info_prop_find (server, "nautilus:required_directory_content_mime_types"); types = prop->v._u.value_stringv; @@ -1537,7 +1537,7 @@ nautilus_do_component_query (const char *mime_type, if (ev->_major == CORBA_NO_EXCEPTION && oaf_result != NULL && oaf_result->_length > 0) { GHashTable *content_types; - int i; + guint i; content_types = mime_type_list_to_hash_table (item_mime_types); diff --git a/libnautilus-extensions/nautilus-password-dialog.c b/libnautilus-extensions/nautilus-password-dialog.c index 6fa6e6b60..cdb6150b3 100644 --- a/libnautilus-extensions/nautilus-password-dialog.c +++ b/libnautilus-extensions/nautilus-password-dialog.c @@ -83,7 +83,7 @@ static void dialog_close_callback (GtkWidget gpointer callback_data); /* Caption table callbacks */ static void caption_table_activate_callback (GtkWidget *widget, - gint entry, + guint entry, gpointer callback_data); @@ -183,7 +183,7 @@ dialog_close_callback (GtkWidget *widget, gpointer callback_data) /* Caption table callbacks */ static void -caption_table_activate_callback (GtkWidget *widget, gint entry, gpointer callback_data) +caption_table_activate_callback (GtkWidget *widget, guint entry, gpointer callback_data) { NautilusPasswordDialog *password_dialog; diff --git a/libnautilus-extensions/nautilus-preferences-item.c b/libnautilus-extensions/nautilus-preferences-item.c index 76eded512..d2b3253be 100644 --- a/libnautilus-extensions/nautilus-preferences-item.c +++ b/libnautilus-extensions/nautilus-preferences-item.c @@ -48,7 +48,7 @@ enum static const guint PREFERENCES_ITEM_TITLE_SPACING = 4; static const guint PREFERENCES_ITEM_FRAME_BORDER_WIDTH = 6; -static const gint PREFERENCES_ITEM_UNDEFINED_ITEM = -1; +static const NautilusPreferencesItemType PREFERENCES_ITEM_UNDEFINED_ITEM = -1U; struct _NautilusPreferencesItemDetails { @@ -508,7 +508,7 @@ static gboolean has_image_file(const char *directory_uri, const char *dir_name, const char *required_file) { char *temp_str, *base_uri; - int index; + guint index; GnomeVFSResult result; GnomeVFSFileInfo *file_info; diff --git a/libnautilus-extensions/nautilus-scalable-font.c b/libnautilus-extensions/nautilus-scalable-font.c index bdf849329..7475d5ccb 100644 --- a/libnautilus-extensions/nautilus-scalable-font.c +++ b/libnautilus-extensions/nautilus-scalable-font.c @@ -159,7 +159,7 @@ file_as_string (const char *file_name) fclose (stream); - if (num_read != stat_info.st_size) { + if ((ssize_t)num_read != stat_info.st_size) { g_free (result); return NULL; } @@ -178,7 +178,7 @@ parse_font_description_file (const char *directory, char *fonts_dir_content; NautilusStringList *tokenized_list; guint i; - gint count; + guint count; g_return_val_if_fail (directory != NULL, FALSE); g_return_val_if_fail (g_file_exists (directory), FALSE); @@ -1470,7 +1470,7 @@ nautilus_text_layout_new (const NautilusScalableFont *font, guint font_size, const char *text, const char *separators, - int max_width, + guint max_width, gboolean confine) { NautilusTextLayout *text_layout; @@ -1478,7 +1478,8 @@ nautilus_text_layout_new (const NautilusScalableFont *font, const char *row_end; const char *s, *word_start, *word_end, *old_word_end; char *sub_text; - int i, w_len, w; + int i, w_len; + guint w; const char *text_iter; int text_len, separators_len; diff --git a/libnautilus-extensions/nautilus-scalable-font.h b/libnautilus-extensions/nautilus-scalable-font.h index 8c269e868..fb0bca9c8 100644 --- a/libnautilus-extensions/nautilus-scalable-font.h +++ b/libnautilus-extensions/nautilus-scalable-font.h @@ -202,7 +202,7 @@ NautilusTextLayout *nautilus_text_layout_new (const NautilusScalableFont *font guint font_size, const char *text, const char *separators, - int max_width, + guint max_width, gboolean confine); void nautilus_text_layout_paint (const NautilusTextLayout *text_info, GdkPixbuf *pixbuf, diff --git a/libnautilus-extensions/nautilus-volume-monitor.c b/libnautilus-extensions/nautilus-volume-monitor.c index 5bbe698cf..2948bac83 100644 --- a/libnautilus-extensions/nautilus-volume-monitor.c +++ b/libnautilus-extensions/nautilus-volume-monitor.c @@ -684,7 +684,7 @@ mount_volumes_check_status (NautilusVolumeMonitor *monitor) static gboolean check_permissions (const char *filename, int mode) { - int euid, egid; + guint euid, egid; struct stat statbuf; euid = geteuid (); diff --git a/libnautilus-private/nautilus-background.c b/libnautilus-private/nautilus-background.c index 1d4326712..41b8afc8f 100644 --- a/libnautilus-private/nautilus-background.c +++ b/libnautilus-private/nautilus-background.c @@ -1061,8 +1061,8 @@ nautilus_background_set_image_uri (NautilusBackground *background, const char *i static void set_image_and_color_image_loading_done_callback (NautilusBackground *background, gboolean successful_load, const char *color) { - gtk_signal_disconnect_by_func (GTK_OBJECT (background), GTK_SIGNAL_FUNC (set_image_and_color_image_loading_done_callback), (gpointer) color); - nautilus_background_set_color (background, color); + gtk_signal_disconnect_by_func (GTK_OBJECT (background), GTK_SIGNAL_FUNC (set_image_and_color_image_loading_done_callback), (gpointer) color); + nautilus_background_set_color (background, color); } /* Use this fn to set both the image and color and avoid flash. The color isn't diff --git a/libnautilus-private/nautilus-buffered-widget.c b/libnautilus-private/nautilus-buffered-widget.c index bf3cd7388..2fe8a6b6a 100644 --- a/libnautilus-private/nautilus-buffered-widget.c +++ b/libnautilus-private/nautilus-buffered-widget.c @@ -322,8 +322,8 @@ nautilus_gdk_pixbuf_tile_alpha (GdkPixbuf *pixbuf, GdkInterpType interpolation_mode, guchar overall_alpha) { - gint x; - gint y; + guint x; + guint y; guchar *pixels; guchar *tile_pixels; guint num_ver_iterations; @@ -335,8 +335,8 @@ nautilus_gdk_pixbuf_tile_alpha (GdkPixbuf *pixbuf, g_return_if_fail (pixbuf != NULL); g_return_if_fail (tile_pixbuf != NULL); - g_return_if_fail (tile_width <= gdk_pixbuf_get_width (tile_pixbuf)); - g_return_if_fail (tile_height <= gdk_pixbuf_get_height (tile_pixbuf)); + g_return_if_fail ((int) tile_width <= gdk_pixbuf_get_width (tile_pixbuf)); + g_return_if_fail ((int) tile_height <= gdk_pixbuf_get_height (tile_pixbuf)); g_return_if_fail (gdk_pixbuf_get_pixels (pixbuf) != NULL); g_return_if_fail (gdk_pixbuf_get_pixels (tile_pixbuf) != NULL); @@ -350,18 +350,16 @@ nautilus_gdk_pixbuf_tile_alpha (GdkPixbuf *pixbuf, y = 0; - for (j = 0; j < num_ver_iterations; j++) - { + for (j = 0; j < num_ver_iterations; j++) { x = 0; - for (i = 0; i < num_hor_iterations; i++) - { - guint copy_width; - guint copy_height; - gint dst_x; - gint dst_y; - gint dst_x2; - gint dst_y2; + for (i = 0; i < num_hor_iterations; i++) { + gint copy_width; + gint copy_height; + guint dst_x; + guint dst_y; + guint dst_x2; + guint dst_y2; dst_x = x; dst_y = y; @@ -372,18 +370,15 @@ nautilus_gdk_pixbuf_tile_alpha (GdkPixbuf *pixbuf, dst_x2 = dst_x + copy_width; dst_y2 = dst_y + copy_height; - if (dst_x2 > width) - { + if (dst_x2 > width) { copy_width -= (dst_x2 - width); } - if (dst_y2 > height) - { + if (dst_y2 > height) { copy_height -= (dst_y2 - height); } - if (copy_width > 0 && copy_height > 0) - { + if (copy_width > 0 && copy_height > 0) { GdkRectangle destination_area; destination_area.x = dst_x; diff --git a/libnautilus-private/nautilus-caption-table.c b/libnautilus-private/nautilus-caption-table.c index b6341e1cd..f4678b26f 100644 --- a/libnautilus-private/nautilus-caption-table.c +++ b/libnautilus-private/nautilus-caption-table.c @@ -281,19 +281,20 @@ entry_activate (GtkWidget *widget, gpointer data) index = caption_table_index_of_entry (caption_table, widget); /* Check for an invalid index */ - if (index == -1) + if (index == -1) { return; - + } + /* Check for the last index */ - if (index < caption_table->detail->num_rows) - { + if (index < (int) caption_table->detail->num_rows) { /* Look for the next sensitive entry */ - GtkWidget* sensitive_entry = + GtkWidget *sensitive_entry = caption_table_find_next_sensitive_entry (caption_table, index + 1); /* Make the next sensitive entry take focus */ - if (sensitive_entry) + if (sensitive_entry) { gtk_widget_grab_focus (sensitive_entry); + } } /* Emit the activate signal */ diff --git a/libnautilus-private/nautilus-caption-table.h b/libnautilus-private/nautilus-caption-table.h index d899289d1..612fe029e 100644 --- a/libnautilus-private/nautilus-caption-table.h +++ b/libnautilus-private/nautilus-caption-table.h @@ -57,7 +57,7 @@ struct _NautilusCaptionTableClass { GtkTableClass parent_class; - void (*activate) (GtkWidget *caption_table, int active_entry); + void (*activate) (GtkWidget *caption_table, guint active_entry); }; GtkType nautilus_caption_table_get_type (void); diff --git a/libnautilus-private/nautilus-ctree.c b/libnautilus-private/nautilus-ctree.c index e81203df5..50f19b6a1 100644 --- a/libnautilus-private/nautilus-ctree.c +++ b/libnautilus-private/nautilus-ctree.c @@ -4135,7 +4135,7 @@ nautilus_ctree_find_node_ptr (NautilusCTree *ctree, NautilusCTreeNode * nautilus_ctree_node_nth (NautilusCTree *ctree, - guint row) + int row) { g_return_val_if_fail (ctree != NULL, NULL); g_return_val_if_fail (NAUTILUS_IS_CTREE (ctree), NULL); @@ -5988,7 +5988,7 @@ nautilus_ctree_drag_motion (GtkWidget *widget, list = context->targets; while (list) { - if (atom == GPOINTER_TO_INT (list->data)) + if (atom == GPOINTER_TO_UINT (list->data)) break; list = list->next; } diff --git a/libnautilus-private/nautilus-ctree.h b/libnautilus-private/nautilus-ctree.h index c5db50f6c..3e58e4fd6 100644 --- a/libnautilus-private/nautilus-ctree.h +++ b/libnautilus-private/nautilus-ctree.h @@ -236,7 +236,7 @@ NautilusCTreeNode * nautilus_ctree_last (NautilusCTree *c NautilusCTreeNode * nautilus_ctree_find_node_ptr (NautilusCTree *ctree, NautilusCTreeRow *ctree_row); NautilusCTreeNode * nautilus_ctree_node_nth (NautilusCTree *ctree, - guint row); + int row); gboolean nautilus_ctree_find (NautilusCTree *ctree, NautilusCTreeNode *node, NautilusCTreeNode *child); diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c index bb1487fa3..00cc9621d 100644 --- a/libnautilus-private/nautilus-directory-async.c +++ b/libnautilus-private/nautilus-directory-async.c @@ -65,7 +65,7 @@ struct MetafileWriteState { gboolean use_public_metafile; GnomeVFSAsyncHandle *handle; xmlChar *buffer; - int size; + GnomeVFSFileSize size; gboolean write_again; }; @@ -855,6 +855,8 @@ nautilus_metafile_write_start (NautilusDirectory *directory) static void metafile_write (NautilusDirectory *directory) { + int xml_doc_size; + g_assert (NAUTILUS_IS_DIRECTORY (directory)); nautilus_directory_ref (directory); @@ -881,7 +883,8 @@ metafile_write (NautilusDirectory *directory) = can_use_public_metafile (directory); xmlDocDumpMemory (directory->details->metafile, &directory->details->metafile_write_state->buffer, - &directory->details->metafile_write_state->size); + &xml_doc_size); + directory->details->metafile_write_state->size = xml_doc_size; nautilus_metafile_write_start (directory); } diff --git a/libnautilus-private/nautilus-file-changes-queue.c b/libnautilus-private/nautilus-file-changes-queue.c index cc26fbb70..3919bf54e 100644 --- a/libnautilus-private/nautilus-file-changes-queue.c +++ b/libnautilus-private/nautilus-file-changes-queue.c @@ -318,8 +318,8 @@ nautilus_file_changes_consume_changes (gboolean consume_all) GList *position_setting_requests; URIPair *pair; NautilusFileChangesQueuePositionSetting *position_setting; - int kind; - int chunk_count; + NautilusFileChangeKind kind; + guint chunk_count; NautilusFileChangesQueue *queue; diff --git a/libnautilus-private/nautilus-file-operations-progress.c b/libnautilus-private/nautilus-file-operations-progress.c index 7ba7ffb33..b2dee80d3 100644 --- a/libnautilus-private/nautilus-file-operations-progress.c +++ b/libnautilus-private/nautilus-file-operations-progress.c @@ -86,7 +86,7 @@ truncate_string_from_start (const char *string, GdkFont *font, guint length) static guint dotdotdot = 0; int truncate_offset; - if (gdk_string_width (font, string) <= length) { + if (gdk_string_width (font, string) <= (int) length) { /* string is already short enough*/ return g_strdup (string); } @@ -101,7 +101,7 @@ truncate_string_from_start (const char *string, GdkFont *font, guint length) /* Cut the font length of string to length. */ length -= dotdotdot; for (truncate_offset = 0; ; truncate_offset++) { - if (gdk_string_width (font, string + truncate_offset) <= length) { + if (gdk_string_width (font, string + truncate_offset) <= (int) length) { break; } } diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index 7f806ed0f..661421568 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -622,7 +622,7 @@ extract_string_until (const char *original, const char *until_substring) { char *result; - g_assert (strlen (original) >= until_substring - original); + g_assert ((int) strlen (original) >= until_substring - original); g_assert (until_substring - original >= 0); result = g_malloc (until_substring - original + 1); diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c index ff0221838..b2ab669b5 100644 --- a/libnautilus-private/nautilus-file-utilities.c +++ b/libnautilus-private/nautilus-file-utilities.c @@ -63,7 +63,7 @@ struct NautilusReadFileHandle { gpointer callback_data; gboolean is_open; char *buffer; - int bytes_read; + GnomeVFSFileSize bytes_read; }; #undef PTHREAD_ASYNC_READ @@ -635,7 +635,7 @@ nautilus_read_entire_file (const char *uri, GnomeVFSResult result; GnomeVFSHandle *handle; char *buffer; - int total_bytes_read; + GnomeVFSFileSize total_bytes_read; GnomeVFSFileSize bytes_read; *file_size = 0; diff --git a/libnautilus-private/nautilus-gdk-extensions.c b/libnautilus-private/nautilus-gdk-extensions.c index 970132791..924fac16a 100644 --- a/libnautilus-private/nautilus-gdk-extensions.c +++ b/libnautilus-private/nautilus-gdk-extensions.c @@ -562,10 +562,10 @@ nautilus_gdk_font_equal (GdkFont *font_a_null_allowed, GdkFont * nautilus_get_largest_fitting_font (const char *text_to_format, int width, const char *font_template) { - int font_index, this_width; + guint font_index; + int this_width; char *font_name; - /*const int font_sizes[5] = { 28, 24, 18, 14, 12 };*/ - const int font_sizes[4] = { 20, 18, 14, 12 }; + const int font_sizes[] = { 20, 18, 14, 12 }; GdkFont *candidate_font; char *alt_text_to_format = NULL; char *temp_str; diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c index d02519ab1..fd1363d78 100644 --- a/libnautilus-private/nautilus-global-preferences.c +++ b/libnautilus-private/nautilus-global-preferences.c @@ -371,7 +371,7 @@ global_preferences_get_sidebar_panel_view_identifiers (void) CORBA_Environment ev; const char *query; OAF_ServerInfoList *oaf_result; - int i; + guint i; NautilusViewIdentifier *id; GList *view_identifiers; diff --git a/libnautilus-private/nautilus-gtk-extensions.c b/libnautilus-private/nautilus-gtk-extensions.c index 4f6d1c46c..f2e876ad7 100644 --- a/libnautilus-private/nautilus-gtk-extensions.c +++ b/libnautilus-private/nautilus-gtk-extensions.c @@ -429,8 +429,8 @@ nautilus_gtk_window_set_initial_geometry_from_string (GtkWindow *window, /* Make sure the window isn't smaller than makes sense for this window. * Other sanity checks are performed in set_initial_geometry. */ - width = MAX (width, minimum_width); - height = MAX (height, minimum_height); + width = MAX (width, (int) minimum_width); + height = MAX (height, (int) minimum_height); nautilus_gtk_window_set_initial_geometry (window, left, top, width, height); } @@ -591,7 +591,7 @@ nautilus_gtk_menu_set_item_visibility (GtkMenu *menu, int index, gboolean visibl g_return_if_fail (GTK_IS_MENU (menu)); children = gtk_container_children (GTK_CONTAINER (menu)); - g_return_if_fail (index >= 0 && index < g_list_length (children)); + g_return_if_fail (index >= 0 && index < (int) g_list_length (children)); menu_item = GTK_WIDGET (g_list_nth_data (children, index)); if (visible) { diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c index 476e8849a..7d503ef51 100644 --- a/libnautilus-private/nautilus-icon-canvas-item.c +++ b/libnautilus-private/nautilus-icon-canvas-item.c @@ -666,7 +666,7 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item, int icon_bottom) { NautilusIconCanvasItemDetails *details; - int width_so_far, height_so_far; + guint width_so_far, height_so_far; GdkGC* gc; GdkGCValues save_gc; guint32 label_color; @@ -784,7 +784,7 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item, } } - width_so_far = MAX (width_so_far, icon_text_info->width); + width_so_far = MAX (width_so_far, (guint) icon_text_info->width); height_so_far += icon_text_info->height; gnome_icon_text_info_free (icon_text_info); @@ -802,8 +802,8 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item, * before the call to draw. We might later decide to use this function * differently and change these asserts. */ - g_assert (height_so_far == details->text_height); - g_assert (width_so_far == details->text_width); + g_assert ((int) height_so_far == details->text_height); + g_assert ((int) width_so_far == details->text_width); gdk_gc_set_foreground (gc, &save_gc.foreground); @@ -1299,7 +1299,7 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item, int icon_bottom) { NautilusIconCanvasItemDetails *details; - int width_so_far, height_so_far; + guint width_so_far, height_so_far; guint32 label_name_color; guint32 label_info_color; GnomeCanvasItem *canvas_item; @@ -1429,7 +1429,7 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item, } - width_so_far = MAX (width_so_far, icon_text_layout->width); + width_so_far = MAX (width_so_far, (guint) icon_text_layout->width); height_so_far += icon_text_layout->height; nautilus_text_layout_free (icon_text_layout); @@ -1448,8 +1448,8 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item, * before the call to draw. We might later decide to use this function * differently and change these asserts. */ - g_assert (height_so_far == details->text_height); - g_assert (width_so_far == details->text_width); + g_assert ((int) height_so_far == details->text_height); + g_assert ((int) width_so_far == details->text_width); box_left = icon_left + (icon_width - width_so_far) / 2; diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index 48119b11a..0f00ea602 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -1300,7 +1300,7 @@ rubberband_timeout_callback (gpointer data) } if (y_scroll == 0 && x_scroll == 0 - && band_info->prev_x == x && band_info->prev_y == y) { + && (int) band_info->prev_x == x && (int) band_info->prev_y == y) { return TRUE; } @@ -2132,7 +2132,7 @@ static void destroy (GtkObject *object) { NautilusIconContainer *container; - int i; + guint i; container = NAUTILUS_ICON_CONTAINER (object); @@ -3764,7 +3764,7 @@ nautilus_icon_container_request_update (NautilusIconContainer *container, /* zooming */ -int +NautilusZoomLevel nautilus_icon_container_get_zoom_level (NautilusIconContainer *container) { return container->details->zoom_level; @@ -4219,8 +4219,8 @@ compute_stretch (StretchState *start, int x_stretch, y_stretch; /* Figure out which handle we are dragging. */ - right = start->pointer_x > start->icon_x + start->icon_size / 2; - bottom = start->pointer_y > start->icon_y + start->icon_size / 2; + right = start->pointer_x > start->icon_x + (int) start->icon_size / 2; + bottom = start->pointer_y > start->icon_y + (int) start->icon_size / 2; /* Figure out how big we should stretch. */ x_stretch = start->pointer_x - current->pointer_x; diff --git a/libnautilus-private/nautilus-icon-container.h b/libnautilus-private/nautilus-icon-container.h index c884cb993..c4e02b05d 100644 --- a/libnautilus-private/nautilus-icon-container.h +++ b/libnautilus-private/nautilus-icon-container.h @@ -190,7 +190,7 @@ void nautilus_icon_container_unstretch (NautilusIconCo void nautilus_icon_container_start_renaming_selected_item (NautilusIconContainer *container); /* options */ -int nautilus_icon_container_get_zoom_level (NautilusIconContainer *view); +NautilusZoomLevel nautilus_icon_container_get_zoom_level (NautilusIconContainer *view); void nautilus_icon_container_set_zoom_level (NautilusIconContainer *view, int new_zoom_level); void nautilus_icon_container_set_single_click_mode (NautilusIconContainer *container, diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c index 7b6eeba05..10592fd4f 100644 --- a/libnautilus-private/nautilus-icon-factory.c +++ b/libnautilus-private/nautilus-icon-factory.c @@ -316,7 +316,7 @@ check_recently_used_list (void) { NautilusIconFactory *factory; NautilusCircularList *head, *node, *next; - int count; + guint count; factory = get_icon_factory (); @@ -875,7 +875,7 @@ get_themed_icon_file_path (const char *theme_name, gboolean aa_mode, IconDetails *details) { - int i; + guint i; gboolean include_size; char *themed_icon_name, *partial_path, *path, *aa_path, *xml_path; xmlDocPtr doc; @@ -1759,14 +1759,14 @@ revise_scale_factors_if_too_big (GdkPixbuf *pixbuf, double *scale_x, double *scale_y) { - int width, height; + guint width, height; double y_distortion; width = gdk_pixbuf_get_width (pixbuf); height = gdk_pixbuf_get_height (pixbuf); - if ((int) (width * *scale_x) <= size->maximum_width - && (int) (height * *scale_y) <= size->maximum_height) { + if ((int) (width * *scale_x) <= (int) size->maximum_width + && (int) (height * *scale_y) <= (int) size->maximum_height) { return; } diff --git a/libnautilus-private/nautilus-icon-text-item.c b/libnautilus-private/nautilus-icon-text-item.c index 88e18d79b..5ff22d9ea 100644 --- a/libnautilus-private/nautilus-icon-text-item.c +++ b/libnautilus-private/nautilus-icon-text-item.c @@ -312,7 +312,7 @@ recompute_bounding_box (Iti *iti) double affine[6]; ArtPoint p, q; int x1, y1, x2, y2; - int width, height; + guint width, height; ItiPrivate *priv; item = GNOME_CANVAS_ITEM (iti); @@ -565,7 +565,7 @@ iti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, { Iti *iti; GtkStyle *style; - int w, h; + guint w, h; int xofs, yofs; ItiPrivate *priv; @@ -853,12 +853,14 @@ iti_selection_motion (Iti *iti, int idx) ItiPrivate *priv; GtkEditable *e; + g_assert (idx >= 0); + priv = iti->priv; e = GTK_EDITABLE (priv->entry); - if (idx < e->current_pos) { + if (idx < (int) e->current_pos) { e->selection_start_pos = idx; - e->selection_end_pos = e->current_pos; + e->selection_end_pos = e->current_pos; } else { e->selection_start_pos = e->current_pos; e->selection_end_pos = idx; diff --git a/libnautilus-private/nautilus-label.c b/libnautilus-private/nautilus-label.c index e6ab8b5ff..ac931e183 100644 --- a/libnautilus-private/nautilus-label.c +++ b/libnautilus-private/nautilus-label.c @@ -333,7 +333,10 @@ nautilus_label_size_allocate (GtkWidget *widget, GtkAllocation *allocation) label = NAUTILUS_LABEL (widget); - if (label->detail->line_wrap_width == -1) { + /* FIXME: + * this never happens + */ + if ((int) label->detail->line_wrap_width == -1) { label_recompute_line_geometries (label); } } @@ -568,7 +571,10 @@ label_recompute_line_geometries (NautilusLabel *label) /* determine the width to use for wrapping. A wrap width of -1 means use all of the available space. */ /* Don't use it if the widget is too small, since we won't be able to fit any words in */ - if (label->detail->line_wrap_width == -1 && clipped_widget_width > 32) { + /* FIXME: + * the -1 case never happens + */ + if ((int) label->detail->line_wrap_width == -1 && clipped_widget_width > 32) { wrap_width = clipped_widget_width; } else { wrap_width = label->detail->line_wrap_width; @@ -582,7 +588,7 @@ label_recompute_line_geometries (NautilusLabel *label) label->detail->total_text_line_height += label->detail->text_layouts[i]->height; - if (label->detail->text_layouts[i]->width > label->detail->max_text_line_width) { + if (label->detail->text_layouts[i]->width > (int) label->detail->max_text_line_width) { label->detail->max_text_line_width = label->detail->text_layouts[i]->width; } } diff --git a/libnautilus-private/nautilus-list.c b/libnautilus-private/nautilus-list.c index 64e646049..83172a4ad 100644 --- a/libnautilus-private/nautilus-list.c +++ b/libnautilus-private/nautilus-list.c @@ -2210,9 +2210,9 @@ draw_cell (NautilusCList *clist, GdkRectangle *area, int row_index, int column_i for (p = NAUTILUS_CELL_PIXBUF_LIST (row->cell[column_index])->pixbufs; p != NULL; p = p->next) { pixbuf_width = gdk_pixbuf_get_width (p->data); - if ((p->next != NULL && pixbuf_width + ellipsis_width >= + if ((p->next != NULL && (int) (pixbuf_width + ellipsis_width) >= cell_rectangle.x + cell_rectangle.width - offset) - || (pixbuf_width >= cell_rectangle.x + cell_rectangle.width - offset)) { + || ((int) pixbuf_width >= cell_rectangle.x + cell_rectangle.width - offset)) { /* Not enough room for this icon & ellipsis, just draw ellipsis. */ gdk_draw_string (clist->clist_window, style->font, fg_gc, @@ -3203,7 +3203,6 @@ nautilus_list_drag_data_received (GtkWidget *widget, GdkDragContext *context, drag_info->drop_occured = FALSE; drag_info->got_drop_data_type = FALSE; } - } diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c index e855df9ac..cc2d623a6 100644 --- a/libnautilus-private/nautilus-mime-actions.c +++ b/libnautilus-private/nautilus-mime-actions.c @@ -1462,7 +1462,7 @@ server_matches_content_requirements (OAF_ServerInfo *server, { OAF_Property *prop; GNOME_stringlist types; - int i; + guint i; /* Components explicitly requested in the metafile are not capability tested. */ if (g_list_find_custom (explicit_iids, (gpointer) server->iid, (GCompareFunc) strcmp) != NULL) { @@ -1472,7 +1472,7 @@ server_matches_content_requirements (OAF_ServerInfo *server, if (!server_has_content_requirements (server)) { return TRUE; } else { - prop = oaf_server_info_prop_find (server, "nautilus:required_directory_content_mime_types"); + prop = oaf_server_info_prop_find (server, "nautilus:required_directory_content_mime_types"); types = prop->v._u.value_stringv; @@ -1537,7 +1537,7 @@ nautilus_do_component_query (const char *mime_type, if (ev->_major == CORBA_NO_EXCEPTION && oaf_result != NULL && oaf_result->_length > 0) { GHashTable *content_types; - int i; + guint i; content_types = mime_type_list_to_hash_table (item_mime_types); diff --git a/libnautilus-private/nautilus-password-dialog.c b/libnautilus-private/nautilus-password-dialog.c index 6fa6e6b60..cdb6150b3 100644 --- a/libnautilus-private/nautilus-password-dialog.c +++ b/libnautilus-private/nautilus-password-dialog.c @@ -83,7 +83,7 @@ static void dialog_close_callback (GtkWidget gpointer callback_data); /* Caption table callbacks */ static void caption_table_activate_callback (GtkWidget *widget, - gint entry, + guint entry, gpointer callback_data); @@ -183,7 +183,7 @@ dialog_close_callback (GtkWidget *widget, gpointer callback_data) /* Caption table callbacks */ static void -caption_table_activate_callback (GtkWidget *widget, gint entry, gpointer callback_data) +caption_table_activate_callback (GtkWidget *widget, guint entry, gpointer callback_data) { NautilusPasswordDialog *password_dialog; diff --git a/libnautilus-private/nautilus-preferences-item.c b/libnautilus-private/nautilus-preferences-item.c index 76eded512..d2b3253be 100644 --- a/libnautilus-private/nautilus-preferences-item.c +++ b/libnautilus-private/nautilus-preferences-item.c @@ -48,7 +48,7 @@ enum static const guint PREFERENCES_ITEM_TITLE_SPACING = 4; static const guint PREFERENCES_ITEM_FRAME_BORDER_WIDTH = 6; -static const gint PREFERENCES_ITEM_UNDEFINED_ITEM = -1; +static const NautilusPreferencesItemType PREFERENCES_ITEM_UNDEFINED_ITEM = -1U; struct _NautilusPreferencesItemDetails { @@ -508,7 +508,7 @@ static gboolean has_image_file(const char *directory_uri, const char *dir_name, const char *required_file) { char *temp_str, *base_uri; - int index; + guint index; GnomeVFSResult result; GnomeVFSFileInfo *file_info; diff --git a/libnautilus-private/nautilus-scalable-font.c b/libnautilus-private/nautilus-scalable-font.c index bdf849329..7475d5ccb 100644 --- a/libnautilus-private/nautilus-scalable-font.c +++ b/libnautilus-private/nautilus-scalable-font.c @@ -159,7 +159,7 @@ file_as_string (const char *file_name) fclose (stream); - if (num_read != stat_info.st_size) { + if ((ssize_t)num_read != stat_info.st_size) { g_free (result); return NULL; } @@ -178,7 +178,7 @@ parse_font_description_file (const char *directory, char *fonts_dir_content; NautilusStringList *tokenized_list; guint i; - gint count; + guint count; g_return_val_if_fail (directory != NULL, FALSE); g_return_val_if_fail (g_file_exists (directory), FALSE); @@ -1470,7 +1470,7 @@ nautilus_text_layout_new (const NautilusScalableFont *font, guint font_size, const char *text, const char *separators, - int max_width, + guint max_width, gboolean confine) { NautilusTextLayout *text_layout; @@ -1478,7 +1478,8 @@ nautilus_text_layout_new (const NautilusScalableFont *font, const char *row_end; const char *s, *word_start, *word_end, *old_word_end; char *sub_text; - int i, w_len, w; + int i, w_len; + guint w; const char *text_iter; int text_len, separators_len; diff --git a/libnautilus-private/nautilus-scalable-font.h b/libnautilus-private/nautilus-scalable-font.h index 8c269e868..fb0bca9c8 100644 --- a/libnautilus-private/nautilus-scalable-font.h +++ b/libnautilus-private/nautilus-scalable-font.h @@ -202,7 +202,7 @@ NautilusTextLayout *nautilus_text_layout_new (const NautilusScalableFont *font guint font_size, const char *text, const char *separators, - int max_width, + guint max_width, gboolean confine); void nautilus_text_layout_paint (const NautilusTextLayout *text_info, GdkPixbuf *pixbuf, diff --git a/libnautilus-private/nautilus-volume-monitor.c b/libnautilus-private/nautilus-volume-monitor.c index 5bbe698cf..2948bac83 100644 --- a/libnautilus-private/nautilus-volume-monitor.c +++ b/libnautilus-private/nautilus-volume-monitor.c @@ -684,7 +684,7 @@ mount_volumes_check_status (NautilusVolumeMonitor *monitor) static gboolean check_permissions (const char *filename, int mode) { - int euid, egid; + guint euid, egid; struct stat statbuf; euid = geteuid (); diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c index 6319ad8be..971495c84 100644 --- a/libnautilus/nautilus-view.c +++ b/libnautilus/nautilus-view.c @@ -98,7 +98,7 @@ GList * nautilus_shallow_g_list_from_uri_list (const Nautilus_URIList *uri_list) { GList *list; - int i; + guint i; list = NULL; for (i = 0; i < uri_list->_length; i++) { diff --git a/libnautilus/nautilus-zoomable.c b/libnautilus/nautilus-zoomable.c index a7dd0e61f..3cd6b184e 100644 --- a/libnautilus/nautilus-zoomable.c +++ b/libnautilus/nautilus-zoomable.c @@ -128,7 +128,7 @@ GList * nautilus_g_list_from_ZoomLevelList (const Nautilus_ZoomLevelList *zoom_level_list) { GList *list; - int i; + guint i; double *zoom_level_ptr; list = NULL; diff --git a/librsvg/rsvg-ft.c b/librsvg/rsvg-ft.c index ee25b4645..694e74ffa 100644 --- a/librsvg/rsvg-ft.c +++ b/librsvg/rsvg-ft.c @@ -795,14 +795,14 @@ rsvg_ft_measure_or_render_string (RsvgFTCtx *ctx, RsvgFTGlyph *result; RsvgFTGlyph **glyphs; int *glyph_xy; - int i, j; + guint i; ArtIRect bbox, glyph_bbox; int rowstride; guchar *buf; double glyph_affine[6]; FT_UInt glyph_index; FT_UInt last_glyph = 0; /* for kerning */ - int n_glyphs; + guint n_glyphs; double init_x, init_y; g_return_val_if_fail (ctx != NULL, NULL); @@ -821,8 +821,8 @@ rsvg_ft_measure_or_render_string (RsvgFTCtx *ctx, glyphs = g_new (RsvgFTGlyph *, length); glyph_xy = g_new (int, length * 2); - for (j = 0; j < 6; j++) - glyph_affine[j] = affine[j]; + for (i = 0; i < 6; i++) + glyph_affine[i] = affine[i]; init_x = affine[4]; init_y = affine[5]; diff --git a/librsvg/rsvg.c b/librsvg/rsvg.c index c7a2aa388..b0c58955e 100644 --- a/librsvg/rsvg.c +++ b/librsvg/rsvg.c @@ -377,7 +377,7 @@ rsvg_parse_transform (double dst[6], const char *src) char keyword[32]; double args[6]; int n_args; - int key_len; + guint key_len; double tmp_affine[6]; art_affine_identity (dst); diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c index faa88db2e..460eb5163 100644 --- a/src/file-manager/fm-icon-view.c +++ b/src/file-manager/fm-icon-view.c @@ -770,7 +770,7 @@ fm_icon_view_create_background_context_menu_items (FMDirectoryView *view, GtkMenu *layout_submenu; gboolean is_auto_layout; int position; - int i; + guint i; g_assert (GTK_IS_MENU (menu)); @@ -1159,7 +1159,7 @@ set_sort_reversed (FMIconView *icon_view, gboolean new_value) static const SortCriterion * get_sort_criterion_by_metadata_text (const char *metadata_text) { - int i; + guint i; /* Figure out what the new sort setting should be. */ for (i = 0; i < NAUTILUS_N_ELEMENTS (sort_criteria); i++) { @@ -1173,7 +1173,7 @@ get_sort_criterion_by_metadata_text (const char *metadata_text) static const SortCriterion * get_sort_criterion_by_id (const char *id) { - int i; + guint i; /* Figure out what the new sort setting should be. */ for (i = 0; i < NAUTILUS_N_ELEMENTS (sort_criteria); i++) { diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index 025b07f0f..3b6b8622b 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -388,15 +388,16 @@ make_sorted_row_array (GtkWidget *widget) } static void -select_row_common (GtkWidget *widget, const GPtrArray *array, int array_row_index) +select_row_common (GtkWidget *widget, const GPtrArray *array, guint array_row_index) { NautilusCListRow *row; int list_row_index; - if (array_row_index >= array->len) + if (array_row_index >= array->len) { + g_assert (array->len >= 1); array_row_index = array->len - 1; + } - g_assert (array_row_index >= 0); row = g_ptr_array_index (array, array_row_index); g_assert (row != NULL); @@ -429,6 +430,7 @@ select_matching_name_callback (GtkWidget *widget, const char *pattern, FMListVie array_row_index = nautilus_g_ptr_array_search (array, match_row_name, (char *) pattern, FALSE); + g_assert (array_row_index >= 0); select_row_common (widget, array, array_row_index); g_ptr_array_free (array, TRUE); @@ -439,7 +441,7 @@ select_previous_next_common (GtkWidget *widget, FMListView *list_view, gboolean { GPtrArray *array; int array_row_index; - int index; + guint index; int first_selected_row; int last_selected_row; @@ -493,10 +495,11 @@ select_previous_next_common (GtkWidget *widget, FMListView *list_view, gboolean array_row_index = 0; } - if (array_row_index >= array->len) { + if (array_row_index >= (int) array->len) { array_row_index = array->len - 1; } + g_assert (array_row_index); select_row_common (widget, array, array_row_index); g_ptr_array_free (array, TRUE); @@ -1101,7 +1104,7 @@ fm_list_view_bump_zoom_level (FMDirectoryView *view, int zoom_increment) list_view = FM_LIST_VIEW (view); old_level = fm_list_view_get_zoom_level (list_view); - if (zoom_increment < 0 && 0 - zoom_increment > old_level) { + if (zoom_increment < 0 && 0 - zoom_increment > (int) old_level) { new_level = NAUTILUS_ZOOM_LEVEL_SMALLEST; } else { new_level = MIN (old_level + zoom_increment, diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c index 844151c26..407f1a2a9 100644 --- a/src/nautilus-information-panel.c +++ b/src/nautilus-information-panel.c @@ -359,7 +359,7 @@ nautilus_sidebar_add_panel_items(NautilusSidebar *sidebar, GtkWidget *menu) CORBA_Environment ev; const char *query; OAF_ServerInfoList *oaf_result; - int i; + guint i; gboolean enabled; GList *name_list; GtkWidget *menu_item; diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c index 02b6ec6b0..1996d067b 100644 --- a/src/nautilus-navigation-window-menus.c +++ b/src/nautilus-navigation-window-menus.c @@ -1084,7 +1084,7 @@ remove_underline_accelerator_from_menu_title (NautilusWindow *window, void nautilus_window_disable_keyboard_navigation_for_menus (NautilusWindow *window) { - int index; + guint index; #ifdef UIH /* FIXME bugzilla.eazel.com 2327: diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c index b95e8cbc3..5eb5bbd86 100644 --- a/src/nautilus-navigation-window.c +++ b/src/nautilus-navigation-window.c @@ -770,11 +770,11 @@ nautilus_window_size_request (GtkWidget *widget, max_width = get_max_forced_width (); max_height = get_max_forced_height (); - if (requisition->width > max_width) { + if (requisition->width > (int) max_width) { requisition->width = max_width; } - if (requisition->height > max_height) { + if (requisition->height > (int) max_height) { requisition->height = max_height; } } diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c index b95e8cbc3..5eb5bbd86 100644 --- a/src/nautilus-object-window.c +++ b/src/nautilus-object-window.c @@ -770,11 +770,11 @@ nautilus_window_size_request (GtkWidget *widget, max_width = get_max_forced_width (); max_height = get_max_forced_height (); - if (requisition->width > max_width) { + if (requisition->width > (int) max_width) { requisition->width = max_width; } - if (requisition->height > max_height) { + if (requisition->height > (int) max_height) { requisition->height = max_height; } } diff --git a/src/nautilus-search-bar-criterion.c b/src/nautilus-search-bar-criterion.c index ea6955a64..e945d9a30 100644 --- a/src/nautilus-search-bar-criterion.c +++ b/src/nautilus-search-bar-criterion.c @@ -607,7 +607,7 @@ nautilus_search_bar_criterion_update_valid_criteria_choices (NautilusSearchBarCr { GtkWidget *old_menu, *new_menu; GtkWidget *item; - int i; + guint i; /* We remove the whole menu and put in a new one. */ new_menu = gtk_menu_new (); diff --git a/src/nautilus-shell.c b/src/nautilus-shell.c index 54e6b48ec..31fc8e8ce 100644 --- a/src/nautilus-shell.c +++ b/src/nautilus-shell.c @@ -261,7 +261,7 @@ corba_open_windows (PortableServer_Servant servant, CORBA_Environment *ev) { NautilusShell *shell; - int i; + guint i; shell = NAUTILUS_SHELL (((BonoboObjectServant *) servant)->bonobo_object); @@ -280,7 +280,7 @@ corba_open_default_window (PortableServer_Servant servant, shell = NAUTILUS_SHELL (((BonoboObjectServant *) servant)->bonobo_object); - if (! restore_window_states (shell)) { + if (!restore_window_states (shell)) { /* Open a window pointing at the default location. */ open_window (shell, NULL); } diff --git a/src/nautilus-sidebar.c b/src/nautilus-sidebar.c index 844151c26..407f1a2a9 100644 --- a/src/nautilus-sidebar.c +++ b/src/nautilus-sidebar.c @@ -359,7 +359,7 @@ nautilus_sidebar_add_panel_items(NautilusSidebar *sidebar, GtkWidget *menu) CORBA_Environment ev; const char *query; OAF_ServerInfoList *oaf_result; - int i; + guint i; gboolean enabled; GList *name_list; GtkWidget *menu_item; diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c index b95e8cbc3..5eb5bbd86 100644 --- a/src/nautilus-spatial-window.c +++ b/src/nautilus-spatial-window.c @@ -770,11 +770,11 @@ nautilus_window_size_request (GtkWidget *widget, max_width = get_max_forced_width (); max_height = get_max_forced_height (); - if (requisition->width > max_width) { + if (requisition->width > (int) max_width) { requisition->width = max_width; } - if (requisition->height > max_height) { + if (requisition->height > (int) max_height) { requisition->height = max_height; } } diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c index 02b6ec6b0..1996d067b 100644 --- a/src/nautilus-window-menus.c +++ b/src/nautilus-window-menus.c @@ -1084,7 +1084,7 @@ remove_underline_accelerator_from_menu_title (NautilusWindow *window, void nautilus_window_disable_keyboard_navigation_for_menus (NautilusWindow *window) { - int index; + guint index; #ifdef UIH /* FIXME bugzilla.eazel.com 2327: diff --git a/src/nautilus-window.c b/src/nautilus-window.c index b95e8cbc3..5eb5bbd86 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -770,11 +770,11 @@ nautilus_window_size_request (GtkWidget *widget, max_width = get_max_forced_width (); max_height = get_max_forced_height (); - if (requisition->width > max_width) { + if (requisition->width > (int) max_width) { requisition->width = max_width; } - if (requisition->height > max_height) { + if (requisition->height > (int) max_height) { requisition->height = max_height; } } |