Author: jannis Date: 2008-11-15 12:06:38 +0000 (Sat, 15 Nov 2008) New Revision: 28811
Modified: thunar/trunk/ChangeLog thunar/trunk/plugins/thunar-apr/thunar-apr-image-page.c thunar/trunk/plugins/thunar-sbr/thunar-sbr-case-renamer.c thunar/trunk/plugins/thunar-sbr/thunar-sbr-date-renamer.c thunar/trunk/plugins/thunar-sbr/thunar-sbr-insert-renamer.c thunar/trunk/plugins/thunar-sbr/thunar-sbr-number-renamer.c thunar/trunk/plugins/thunar-sbr/thunar-sbr-remove-renamer.c thunar/trunk/plugins/thunar-sendto-email/main.c thunar/trunk/tdb/tdb.c thunar/trunk/tdb/tdbtool.c thunar/trunk/thunar-vfs/thunar-vfs-io-jobs.c thunar/trunk/thunar-vfs/thunar-vfs-io-local.c thunar/trunk/thunar-vfs/thunar-vfs-io-trash.c thunar/trunk/thunar-vfs/thunar-vfs-mime-legacy.c thunar/trunk/thunar-vfs/thunar-vfs-mime-sniffer.c thunar/trunk/thunar-vfs/thunar-vfs-path.c thunar/trunk/thunar-vfs/thunar-vfs-thumb-jpeg.c thunar/trunk/thunar/sexy-url-label.c thunar/trunk/thunar/thunar-column-editor.c thunar/trunk/thunar/thunar-column-model.c thunar/trunk/thunar/thunar-gobject-extensions.c thunar/trunk/thunar/thunar-icon-renderer.c thunar/trunk/thunar/thunar-list-model.c thunar/trunk/thunar/thunar-path-entry.c thunar/trunk/thunar/thunar-preferences-dialog.c thunar/trunk/thunar/thunar-renamer-dialog.c thunar/trunk/thunar/thunar-renamer-model.c thunar/trunk/thunar/thunar-shortcuts-model.c thunar/trunk/thunar/thunar-shortcuts-view.c thunar/trunk/thunar/thunar-tree-model.c thunar/trunk/thunar/thunar-tree-view.c Log: * plugins/, tdb/, thunar-vfs/, thunar/: Fix several compiler warnings. Patch again provided by Nick Schermer. Modified: thunar/trunk/ChangeLog =================================================================== --- thunar/trunk/ChangeLog 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/ChangeLog 2008-11-15 12:06:38 UTC (rev 28811) @@ -1,5 +1,10 @@ 2008-11-15 Jannis Pohlmann <[EMAIL PROTECTED]> + * plugins/, tdb/, thunar-vfs/, thunar/: Fix several compiler warnings. + Patch again provided by Nick Schermer. + +2008-11-15 Jannis Pohlmann <[EMAIL PROTECTED]> + * thunar/thunar-tree-model.{c,h}, thunar/thunar-tree-view.c: Fix freeze in the tree view pane when the visibility of hidden files is toggled. Kudos to Nick Schermer for the patch. This fixes bug #2502. Modified: thunar/trunk/plugins/thunar-apr/thunar-apr-image-page.c =================================================================== --- thunar/trunk/plugins/thunar-apr/thunar-apr-image-page.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/plugins/thunar-apr/thunar-apr-image-page.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -109,7 +109,7 @@ GtkWidget *label; GtkWidget *table; #ifdef HAVE_EXIF - gint n; + guint n; #endif gtk_container_set_border_width (GTK_CONTAINER (image_page), 12); @@ -220,7 +220,7 @@ ExifEntry *exif_entry; ExifData *exif_data; gchar exif_buffer[1024]; - gint n; + guint n; #endif /* determine the URI for the file */ Modified: thunar/trunk/plugins/thunar-sbr/thunar-sbr-case-renamer.c =================================================================== --- thunar/trunk/plugins/thunar-sbr/thunar-sbr-case-renamer.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/plugins/thunar-sbr/thunar-sbr-case-renamer.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -110,7 +110,7 @@ GtkWidget *combo; GtkWidget *label; GtkWidget *hbox; - gint n; + guint n; hbox = gtk_hbox_new (FALSE, 12); gtk_box_pack_start (GTK_BOX (case_renamer), hbox, FALSE, FALSE, 0); Modified: thunar/trunk/plugins/thunar-sbr/thunar-sbr-date-renamer.c =================================================================== --- thunar/trunk/plugins/thunar-sbr/thunar-sbr-date-renamer.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/plugins/thunar-sbr/thunar-sbr-date-renamer.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -185,7 +185,7 @@ GtkWidget *spinner; GtkWidget *entry; GtkAdjustment *adjustment; - gint n; + guint n; /* allocate tooltips for the renamer */ date_renamer->tooltips = gtk_tooltips_new (); Modified: thunar/trunk/plugins/thunar-sbr/thunar-sbr-insert-renamer.c =================================================================== --- thunar/trunk/plugins/thunar-sbr/thunar-sbr-insert-renamer.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/plugins/thunar-sbr/thunar-sbr-insert-renamer.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -161,7 +161,7 @@ GtkWidget *label; GtkWidget *table; GtkWidget *hbox; - gint n; + guint n; table = gtk_table_new (2, 3, FALSE); gtk_table_set_row_spacings (GTK_TABLE (table), 6); Modified: thunar/trunk/plugins/thunar-sbr/thunar-sbr-number-renamer.c =================================================================== --- thunar/trunk/plugins/thunar-sbr/thunar-sbr-number-renamer.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/plugins/thunar-sbr/thunar-sbr-number-renamer.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -177,7 +177,7 @@ GtkWidget *entry; GtkWidget *label; GtkWidget *hbox; - gint n; + guint n; hbox = gtk_hbox_new (FALSE, 12); gtk_box_pack_start (GTK_BOX (number_renamer), hbox, FALSE, FALSE, 0); Modified: thunar/trunk/plugins/thunar-sbr/thunar-sbr-remove-renamer.c =================================================================== --- thunar/trunk/plugins/thunar-sbr/thunar-sbr-remove-renamer.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/plugins/thunar-sbr/thunar-sbr-remove-renamer.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -166,7 +166,7 @@ GtkWidget *combo; GtkWidget *label; GtkWidget *table; - gint n; + guint n; table = gtk_table_new (2, 3, FALSE); gtk_table_set_row_spacings (GTK_TABLE (table), 6); Modified: thunar/trunk/plugins/thunar-sendto-email/main.c =================================================================== --- thunar/trunk/plugins/thunar-sendto-email/main.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/plugins/thunar-sendto-email/main.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -136,7 +136,7 @@ gint response = TSE_RESPONSE_PLAIN; gint n_archives = 0; gint n_infos = 0; - gint n; + guint n; /* check the file infos */ for (lp = infos; lp != NULL; lp = lp->next, ++n_infos) Modified: thunar/trunk/tdb/tdb.c =================================================================== --- thunar/trunk/tdb/tdb.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/tdb/tdb.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -577,7 +577,7 @@ void tdb_dump_all(TDB_CONTEXT *tdb) { - int i; + unsigned int i; for (i=0;i<tdb->header.hash_size;i++) { tdb_dump_chain(tdb, i); } Modified: thunar/trunk/tdb/tdbtool.c =================================================================== --- thunar/trunk/tdb/tdbtool.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/tdb/tdbtool.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -100,7 +100,7 @@ static char *get_token(int startover) { - static char tmp[1024]; + static char tmp[1024]; static char *cont = NULL; char *insert, *start; char *k = strtok(NULL, " "); @@ -419,7 +419,7 @@ int main(int argc, char *argv[]) { - int bIterate = 0; + int bIterate = 0, ignore; char *line; char *tok; TDB_DATA iterate_kbuf; @@ -436,7 +436,7 @@ /* Shell command */ if (line[0] == '!') { - system(line + 1); + ignore = system(line + 1); continue; } Modified: thunar/trunk/thunar/sexy-url-label.c =================================================================== --- thunar/trunk/thunar/sexy-url-label.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar/sexy-url-label.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -358,7 +358,7 @@ "gtk-label-wrap-width"); if (wrap_width_data != NULL && - wrap_width_data->width != wrap_width * PANGO_SCALE) + (size_t) wrap_width_data->width != wrap_width * PANGO_SCALE) { wrap_width_data->width = wrap_width * PANGO_SCALE; priv->wrap_width = wrap_width; Modified: thunar/trunk/thunar/thunar-column-editor.c =================================================================== --- thunar/trunk/thunar/thunar-column-editor.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar/thunar-column-editor.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -523,7 +523,7 @@ GtkTreeSelection *selection; GParamSpec *pspec; GValue value = { 0, }; - gint n; + guint n; /* reset the given properties to its default values */ for (n = 0; n < G_N_ELEMENTS (PROPERTY_NAMES); ++n) Modified: thunar/trunk/thunar/thunar-column-model.c =================================================================== --- thunar/trunk/thunar/thunar-column-model.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar/thunar-column-model.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -108,7 +108,7 @@ * generated by another model. */ #ifndef NDEBUG - guint stamp; + gint stamp; #endif ThunarPreferences *preferences; @@ -492,7 +492,7 @@ /* find the current position of the value */ for (j = 0; j < THUNAR_N_VISIBLE_COLUMNS; ++j) - if (column_model->order[j] == value->value) + if (column_model->order[j] == (guint) value->value) break; /* check if valid */ @@ -895,7 +895,7 @@ { const gchar *column_name = _("Unknown"); GEnumClass *klass; - gint n; + guint n; _thunar_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), NULL); _thunar_return_val_if_fail (column < THUNAR_N_VISIBLE_COLUMNS, NULL); @@ -904,7 +904,7 @@ /* determine the column name from the ThunarColumn enum type */ klass = g_type_class_ref (THUNAR_TYPE_COLUMN); for (n = 0; n < klass->n_values; ++n) - if (klass->values[n].value == column) + if (klass->values[n].value == (gint) column) column_name = _(klass->values[n].value_nick); g_type_class_unref (klass); Modified: thunar/trunk/thunar/thunar-gobject-extensions.c =================================================================== --- thunar/trunk/thunar/thunar-gobject-extensions.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar/thunar-gobject-extensions.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -61,7 +61,7 @@ { GEnumClass *klass; gint value = 0; - gint n; + guint n; /* determine the enum value matching the src... */ klass = g_type_class_ref (G_VALUE_TYPE (dst)); Modified: thunar/trunk/thunar/thunar-icon-renderer.c =================================================================== --- thunar/trunk/thunar/thunar-icon-renderer.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar/thunar-icon-renderer.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -504,7 +504,7 @@ emblem_area.height = gdk_pixbuf_get_height (emblem); /* shrink insane emblems */ - if (G_UNLIKELY (MAX (emblem_area.width, emblem_area.height) > MIN ((2 * icon_renderer->size) / 3, 36))) + if (G_UNLIKELY (MAX (emblem_area.width, emblem_area.height) > (gint) MIN ((2 * icon_renderer->size) / 3, 36))) { /* scale down the emblem */ temp = exo_gdk_pixbuf_scale_ratio (emblem, MIN ((2 * icon_renderer->size) / 3, 36)); Modified: thunar/trunk/thunar/thunar-list-model.c =================================================================== --- thunar/trunk/thunar/thunar-list-model.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar/thunar-list-model.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -208,7 +208,7 @@ * generated by another model. */ #ifndef NDEBUG - guint stamp; + gint stamp; #endif gint nrows; Modified: thunar/trunk/thunar/thunar-path-entry.c =================================================================== --- thunar/trunk/thunar/thunar-path-entry.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar/thunar-path-entry.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -663,7 +663,7 @@ { ThunarPathEntry *path_entry = THUNAR_PATH_ENTRY (widget); - if (event->window == path_entry->icon_area && event->button == path_entry->drag_button) + if (event->window == path_entry->icon_area && event->button == (guint) path_entry->drag_button) { /* reset the drag button state */ path_entry->drag_button = 0; Modified: thunar/trunk/thunar/thunar-preferences-dialog.c =================================================================== --- thunar/trunk/thunar/thunar-preferences-dialog.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar/thunar-preferences-dialog.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -98,7 +98,7 @@ gpointer user_data) { GEnumClass *klass; - gint n; + guint n; klass = g_type_class_ref (THUNAR_TYPE_ICON_SIZE); for (n = 0; n < klass->n_values; ++n) Modified: thunar/trunk/thunar/thunar-renamer-dialog.c =================================================================== --- thunar/trunk/thunar/thunar-renamer-dialog.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar/thunar-renamer-dialog.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -335,7 +335,7 @@ GList *renamers = NULL; GList *lp; gint active = 0; - gint n; + guint n; /* allocate a new bulk rename model */ renamer_dialog->model = thunar_renamer_model_new (); Modified: thunar/trunk/thunar/thunar-renamer-model.c =================================================================== --- thunar/trunk/thunar/thunar-renamer-model.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar/thunar-renamer-model.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -131,7 +131,7 @@ * generated by another model. */ #ifndef NDEBUG - guint stamp; + gint stamp; #endif ThunarRenamerMode mode; Modified: thunar/trunk/thunar/thunar-shortcuts-model.c =================================================================== --- thunar/trunk/thunar/thunar-shortcuts-model.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar/thunar-shortcuts-model.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -144,7 +144,7 @@ * generated by another model. */ #ifndef NDEBUG - guint stamp; + gint stamp; #endif GList *shortcuts; @@ -272,7 +272,7 @@ GList *lp; guint n; gchar *desktop_path = NULL; - gint desktop_index; + guint desktop_index; #ifndef NDEBUG model->stamp = g_random_int (); @@ -750,7 +750,7 @@ _thunar_return_if_fail (shortcut->file == NULL || THUNAR_IS_FILE (shortcut->file)); _thunar_return_if_fail (gtk_tree_path_get_depth (path) > 0); _thunar_return_if_fail (gtk_tree_path_get_indices (path)[0] >= 0); - _thunar_return_if_fail (gtk_tree_path_get_indices (path)[0] <= g_list_length (model->shortcuts)); + _thunar_return_if_fail (gtk_tree_path_get_indices (path)[0] <= (gint) g_list_length (model->shortcuts)); /* we want to stay informed about changes to the file */ if (G_LIKELY (shortcut->file != NULL)) @@ -1505,7 +1505,7 @@ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model)); _thunar_return_if_fail (gtk_tree_path_get_depth (dst_path) > 0); _thunar_return_if_fail (gtk_tree_path_get_indices (dst_path)[0] >= 0); - _thunar_return_if_fail (gtk_tree_path_get_indices (dst_path)[0] <= g_list_length (model->shortcuts)); + _thunar_return_if_fail (gtk_tree_path_get_indices (dst_path)[0] <= (gint) g_list_length (model->shortcuts)); _thunar_return_if_fail (THUNAR_IS_FILE (file)); /* verify that the file is not already in use as shortcut */ @@ -1553,7 +1553,7 @@ _thunar_return_if_fail (gtk_tree_path_get_depth (src_path) > 0); _thunar_return_if_fail (gtk_tree_path_get_depth (dst_path) > 0); _thunar_return_if_fail (gtk_tree_path_get_indices (src_path)[0] >= 0); - _thunar_return_if_fail (gtk_tree_path_get_indices (src_path)[0] < g_list_length (model->shortcuts)); + _thunar_return_if_fail (gtk_tree_path_get_indices (src_path)[0] < (gint) g_list_length (model->shortcuts)); _thunar_return_if_fail (gtk_tree_path_get_indices (dst_path)[0] > 0); index_src = gtk_tree_path_get_indices (src_path)[0]; @@ -1603,7 +1603,7 @@ } /* generate the remaining order */ - for (; index < g_list_length (model->shortcuts); ++index) + for (; index < (gint) g_list_length (model->shortcuts); ++index) order[index] = index; /* tell all listeners about the reordering just performed */ @@ -1636,7 +1636,7 @@ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model)); _thunar_return_if_fail (gtk_tree_path_get_depth (path) > 0); _thunar_return_if_fail (gtk_tree_path_get_indices (path)[0] >= 0); - _thunar_return_if_fail (gtk_tree_path_get_indices (path)[0] < g_list_length (model->shortcuts)); + _thunar_return_if_fail (gtk_tree_path_get_indices (path)[0] < (gint) g_list_length (model->shortcuts)); /* lookup the shortcut for the given path */ shortcut = g_list_nth_data (model->shortcuts, gtk_tree_path_get_indices (path)[0]); Modified: thunar/trunk/thunar/thunar-shortcuts-view.c =================================================================== --- thunar/trunk/thunar/thunar-shortcuts-view.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar/thunar-shortcuts-view.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -405,7 +405,7 @@ ThunarShortcutsView *view = THUNAR_SHORTCUTS_VIEW (widget); /* check if we have an event matching the pressed button state */ - if (G_LIKELY (view->pressed_button == event->button)) + if (G_LIKELY (view->pressed_button == (gint) event->button)) { /* check if we should simply open or open in new window */ if (G_LIKELY (event->button == 1)) Modified: thunar/trunk/thunar/thunar-tree-model.c =================================================================== --- thunar/trunk/thunar/thunar-tree-model.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar/thunar-tree-model.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -166,7 +166,7 @@ * generated by another model. */ #ifndef NDEBUG - guint stamp; + gint stamp; #endif /* removable volumes */ Modified: thunar/trunk/thunar/thunar-tree-view.c =================================================================== --- thunar/trunk/thunar/thunar-tree-view.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar/thunar-tree-view.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -679,7 +679,7 @@ ThunarTreeView *view = THUNAR_TREE_VIEW (widget); /* check if we have an event matching the pressed button state */ - if (G_LIKELY (view->pressed_button == event->button)) + if (G_LIKELY (view->pressed_button == (gint) event->button)) { /* check if we should simply open or open in new window */ if (G_LIKELY (event->button == 1)) Modified: thunar/trunk/thunar-vfs/thunar-vfs-io-jobs.c =================================================================== --- thunar/trunk/thunar-vfs/thunar-vfs-io-jobs.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar-vfs/thunar-vfs-io-jobs.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -328,8 +328,8 @@ if (g_stat (absolute_path, &statb) == 0) { /* determine the new uid/gid */ - nuid = (uid < 0) ? statb.st_uid : uid; - ngid = (gid < 0) ? statb.st_gid : gid; + nuid = (uid < 0) ? (gint) statb.st_uid : uid; + ngid = (gid < 0) ? (gint) statb.st_gid : gid; /* try to apply the new ownership */ if (chown (absolute_path, nuid, ngid) < 0) Modified: thunar/trunk/thunar-vfs/thunar-vfs-io-local.c =================================================================== --- thunar/trunk/thunar-vfs/thunar-vfs-io-local.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar-vfs/thunar-vfs-io-local.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -628,6 +628,7 @@ GList *lp; GList *ln; gint n; + gint ignore; _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_local (path), NULL); _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL); @@ -678,7 +679,7 @@ g_thread_pool_free (pool, FALSE, TRUE); /* change back to the previous working directory */ - chdir (current_dir); + ignore = chdir (current_dir); } /* release the chdir lock */ Modified: thunar/trunk/thunar-vfs/thunar-vfs-io-trash.c =================================================================== --- thunar/trunk/thunar-vfs/thunar-vfs-io-trash.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar-vfs/thunar-vfs-io-trash.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -830,7 +830,7 @@ g_free (original_uri); /* try to save the content (all at once) */ - if (write (fd, content, strlen (content)) != strlen (content)) + if (write (fd, content, strlen (content)) != (ssize_t) strlen (content)) { /* no space left, etc. */ g_free (content); Modified: thunar/trunk/thunar-vfs/thunar-vfs-mime-legacy.c =================================================================== --- thunar/trunk/thunar-vfs/thunar-vfs-mime-legacy.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar-vfs/thunar-vfs-mime-legacy.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -156,10 +156,10 @@ { gint indent; gint offset; - guint value_length; + gint value_length; guchar *value; guchar *mask; - guint range_length; + glong range_length; guint word_size; }; @@ -286,7 +286,7 @@ { valid_matchlet = TRUE; - if (i + matchlet->value_length > length) + if (i + matchlet->value_length > (gint) length) return FALSE; if (matchlet->mask) @@ -800,7 +800,7 @@ + THUNAR_VFS_MIME_LEGACY_MATCHLET (lp->data)->offset; /* check if new max */ - if (n > legacy->max_buffer_extents) + if (n > (gint) legacy->max_buffer_extents) legacy->max_buffer_extents = n; } Modified: thunar/trunk/thunar-vfs/thunar-vfs-mime-sniffer.c =================================================================== --- thunar/trunk/thunar-vfs/thunar-vfs-mime-sniffer.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar-vfs/thunar-vfs-mime-sniffer.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -75,7 +75,7 @@ * UTF8 character, or if we really have an invalid UTF8 string. */ remaining = length - (end - data); - if (g_utf8_get_char_validated (end, remaining) == -2) + if (g_utf8_get_char_validated (end, remaining) == (gunichar)-2) return TRUE; #ifdef HAVE_MBRTOWC Modified: thunar/trunk/thunar-vfs/thunar-vfs-path.c =================================================================== --- thunar/trunk/thunar-vfs/thunar-vfs-path.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar-vfs/thunar-vfs-path.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -1014,7 +1014,7 @@ gsize bufsize = 512; gsize bufpos = 0; GList *lp; - gint n; + guint n; /* allocate initial buffer */ buffer = g_malloc (bufsize + 1); Modified: thunar/trunk/thunar-vfs/thunar-vfs-thumb-jpeg.c =================================================================== --- thunar/trunk/thunar-vfs/thunar-vfs-thumb-jpeg.c 2008-11-15 12:04:41 UTC (rev 28810) +++ thunar/trunk/thunar-vfs/thunar-vfs-thumb-jpeg.c 2008-11-15 12:06:38 UTC (rev 28811) @@ -115,7 +115,7 @@ if (G_LIKELY (num_bytes > 0)) { - num_bytes = MIN (num_bytes, source->bytes_in_buffer); + num_bytes = MIN (num_bytes, (glong) source->bytes_in_buffer); source->next_input_byte += num_bytes; source->bytes_in_buffer -= num_bytes; @@ -191,7 +191,7 @@ guchar *pixels = NULL; guchar *p; gint out_num_components; - gint n; + guint n; /* setup JPEG error handling */ cinfo.err = jpeg_std_error (&handler.mgr); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits