diff options
26 files changed, 55 insertions, 40 deletions
diff --git a/plugins/thunar-sendto-email/main.c b/plugins/thunar-sendto-email/main.c index 587cdd88..23b8c14a 100644 --- a/plugins/thunar-sendto-email/main.c +++ b/plugins/thunar-sendto-email/main.c @@ -307,7 +307,7 @@ tse_progress (const gchar *working_directory, watch_id = g_child_watch_add (pid, tse_child_watch, dialog); /* start the pulse timer */ - pulse_timer_id = g_timeout_add (125, (GSourceFunc) gtk_progress_bar_pulse, progress); + pulse_timer_id = g_timeout_add (125, (GSourceFunc) (void (*)(void)) gtk_progress_bar_pulse, progress); /* run the dialog */ response = gtk_dialog_run (GTK_DIALOG (dialog)); diff --git a/plugins/thunar-uca/thunar-uca-provider.c b/plugins/thunar-uca/thunar-uca-provider.c index 53dbc8d1..450616ce 100644 --- a/plugins/thunar-uca/thunar-uca-provider.c +++ b/plugins/thunar-uca/thunar-uca-provider.c @@ -246,7 +246,8 @@ thunar_uca_provider_get_file_menu_items (ThunarxMenuProvider *menu_provider, /* connect the "activate" signal */ g_signal_connect_data (G_OBJECT (item), "activate", G_CALLBACK (thunar_uca_provider_activated), - g_object_ref (G_OBJECT (uca_provider)), (GClosureNotify) g_object_unref, + g_object_ref (G_OBJECT (uca_provider)), + (GClosureNotify) (void (*)(void)) g_object_unref, G_CONNECT_SWAPPED); /* set the action path */ diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c index dc3cadf5..d5624a2b 100644 --- a/thunar/thunar-application.c +++ b/thunar/thunar-application.c @@ -908,7 +908,7 @@ thunar_application_uevent (GUdevClient *client, { /* only insert the path if we don't have it already */ if (g_slist_find_custom (application->volman_udis, sysfs_path, - (GCompareFunc) g_utf8_collate) == NULL) + (GCompareFunc) (void (*)(void)) g_utf8_collate) == NULL) { application->volman_udis = g_slist_prepend (application->volman_udis, g_strdup (sysfs_path)); @@ -928,7 +928,7 @@ thunar_application_uevent (GUdevClient *client, { /* look for the sysfs path in the list of pending paths */ lp = g_slist_find_custom (application->volman_udis, sysfs_path, - (GCompareFunc) g_utf8_collate); + (GCompareFunc) (void (*)(void)) g_utf8_collate); if (G_LIKELY (lp != NULL)) { diff --git a/thunar/thunar-component.c b/thunar/thunar-component.c index ddd42435..29cd6849 100644 --- a/thunar/thunar-component.c +++ b/thunar/thunar-component.c @@ -43,7 +43,7 @@ thunar_component_get_type (void) type = g_type_register_static_simple (G_TYPE_INTERFACE, I_("ThunarComponent"), sizeof (ThunarComponentIface), - (GClassInitFunc) thunar_component_class_init, + (GClassInitFunc) (void (*)(void)) thunar_component_class_init, 0, NULL, 0); diff --git a/thunar/thunar-deep-count-job.c b/thunar/thunar-deep-count-job.c index d36572eb..7efc400a 100644 --- a/thunar/thunar-deep-count-job.c +++ b/thunar/thunar-deep-count-job.c @@ -409,7 +409,7 @@ thunar_deep_count_job_new (GList *files, job->files = g_list_copy (files); job->query_flags = flags; - g_list_foreach (job->files, (GFunc) g_object_ref, NULL); + g_list_foreach (job->files, (GFunc) (void (*)(void)) g_object_ref, NULL); return job; } diff --git a/thunar/thunar-emblem-chooser.c b/thunar/thunar-emblem-chooser.c index 30953d63..1a7cdfee 100644 --- a/thunar/thunar-emblem-chooser.c +++ b/thunar/thunar-emblem-chooser.c @@ -230,7 +230,9 @@ thunar_emblem_chooser_unrealize (GtkWidget *widget) ThunarEmblemChooser *chooser = THUNAR_EMBLEM_CHOOSER (widget); /* drop all check buttons */ - gtk_container_foreach (GTK_CONTAINER (chooser->table), (GtkCallback) gtk_widget_destroy, NULL); + gtk_container_foreach (GTK_CONTAINER (chooser->table), + (GtkCallback) (void (*)(void)) gtk_widget_destroy, + NULL); /* release our reference on the icon theme */ g_signal_handlers_disconnect_by_func (G_OBJECT (chooser->icon_theme), thunar_emblem_chooser_theme_changed, chooser); @@ -276,7 +278,7 @@ thunar_emblem_chooser_button_toggled (GtkToggleButton *button, if (gtk_toggle_button_get_active (button)) { /* check if we need to add the new emblem */ - if (g_list_find_custom (emblem_names, emblem_name, (GCompareFunc) strcmp) == NULL) + if (g_list_find_custom (emblem_names, emblem_name, (GCompareFunc) (void (*)(void)) strcmp) == NULL) { emblem_names = g_list_append (emblem_names, (gchar *) emblem_name); is_modified = TRUE; @@ -284,7 +286,7 @@ thunar_emblem_chooser_button_toggled (GtkToggleButton *button, } else { - delete_link = g_list_find_custom (emblem_names, emblem_name, (GCompareFunc) strcmp); + delete_link = g_list_find_custom (emblem_names, emblem_name, (GCompareFunc) (void (*)(void)) strcmp); if (delete_link != NULL) { emblem_names = g_list_delete_link (emblem_names, delete_link); @@ -381,7 +383,9 @@ thunar_emblem_chooser_theme_changed (GtkIconTheme *icon_theme, _thunar_return_if_fail (chooser->icon_theme == icon_theme); /* drop the current buttons */ - gtk_container_foreach (GTK_CONTAINER (chooser->table), (GtkCallback) gtk_widget_destroy, NULL); + gtk_container_foreach (GTK_CONTAINER (chooser->table), + (GtkCallback) (void (*)(void)) gtk_widget_destroy, + NULL); /* create buttons for the new theme */ thunar_emblem_chooser_create_buttons (chooser); @@ -400,7 +404,7 @@ thunar_emblem_chooser_create_buttons (ThunarEmblemChooser *chooser) emblems = gtk_icon_theme_list_icons (chooser->icon_theme, "Emblems"); /* sort the emblem list */ - emblems = g_list_sort (emblems, (GCompareFunc) g_ascii_strcasecmp); + emblems = g_list_sort (emblems, (GCompareFunc) (void (*)(void)) g_ascii_strcasecmp); /* create buttons for the emblems */ for (lp = emblems; lp != NULL; lp = lp->next) diff --git a/thunar/thunar-icon-factory.c b/thunar/thunar-icon-factory.c index df240b07..7d3be1ad 100644 --- a/thunar/thunar-icon-factory.c +++ b/thunar/thunar-icon-factory.c @@ -387,7 +387,9 @@ thunar_icon_factory_sweep_timer (gpointer user_data) THUNAR_THREADS_ENTER /* ditch all icons whose ref_count is 1 */ - g_hash_table_foreach_remove (factory->icon_cache, (GHRFunc) thunar_icon_check_sweep, factory); + g_hash_table_foreach_remove (factory->icon_cache, + (GHRFunc) (void (*)(void)) thunar_icon_check_sweep, + factory); THUNAR_THREADS_LEAVE diff --git a/thunar/thunar-io-jobs.c b/thunar/thunar-io-jobs.c index eaaa7072..a6e2dc2a 100644 --- a/thunar/thunar-io-jobs.c +++ b/thunar/thunar-io-jobs.c @@ -1000,7 +1000,7 @@ thunar_io_jobs_change_group (GList *files, _thunar_return_val_if_fail (files != NULL, NULL); /* files are released when the list if destroyed */ - g_list_foreach (files, (GFunc) g_object_ref, NULL); + g_list_foreach (files, (GFunc) (void (*)(void)) g_object_ref, NULL); return thunar_simple_job_launch (_thunar_io_jobs_chown, 4, THUNAR_TYPE_G_FILE_LIST, files, @@ -1155,7 +1155,7 @@ thunar_io_jobs_change_mode (GList *files, _thunar_return_val_if_fail (files != NULL, NULL); /* files are released when the list if destroyed */ - g_list_foreach (files, (GFunc) g_object_ref, NULL); + g_list_foreach (files, (GFunc) (void (*)(void)) g_object_ref, NULL); return thunar_simple_job_launch (_thunar_io_jobs_chmod, 6, THUNAR_TYPE_G_FILE_LIST, files, diff --git a/thunar/thunar-list-model.c b/thunar/thunar-list-model.c index ac015e8e..5017f276 100644 --- a/thunar/thunar-list-model.c +++ b/thunar/thunar-list-model.c @@ -1741,7 +1741,7 @@ thunar_list_model_set_case_sensitive (ThunarListModel *store, /* emit a "changed" signal for each row, so the display is reloaded with the new case-sensitive setting */ gtk_tree_model_foreach (GTK_TREE_MODEL (store), - (GtkTreeModelForeachFunc) gtk_tree_model_row_changed, + (GtkTreeModelForeachFunc) (void (*)(void)) gtk_tree_model_row_changed, NULL); } } @@ -1789,7 +1789,9 @@ thunar_list_model_set_date_style (ThunarListModel *store, g_object_notify_by_pspec (G_OBJECT (store), list_model_props[PROP_DATE_STYLE]); /* emit a "changed" signal for each row, so the display is reloaded with the new date style */ - gtk_tree_model_foreach (GTK_TREE_MODEL (store), (GtkTreeModelForeachFunc) gtk_tree_model_row_changed, NULL); + gtk_tree_model_foreach (GTK_TREE_MODEL (store), + (GtkTreeModelForeachFunc) (void (*)(void)) gtk_tree_model_row_changed, + NULL); } } @@ -1834,7 +1836,9 @@ thunar_list_model_set_date_custom_style (ThunarListModel *store, g_object_notify_by_pspec (G_OBJECT (store), list_model_props[PROP_DATE_CUSTOM_STYLE]); /* emit a "changed" signal for each row, so the display is reloaded with the new date style */ - gtk_tree_model_foreach (GTK_TREE_MODEL (store), (GtkTreeModelForeachFunc) gtk_tree_model_row_changed, NULL); + gtk_tree_model_foreach (GTK_TREE_MODEL (store), + (GtkTreeModelForeachFunc) (void (*)(void)) gtk_tree_model_row_changed, + NULL); } } @@ -1996,7 +2000,7 @@ thunar_list_model_set_folders_first (ThunarListModel *store, /* emit a "changed" signal for each row, so the display is reloaded with the new folders first setting */ gtk_tree_model_foreach (GTK_TREE_MODEL (store), - (GtkTreeModelForeachFunc) gtk_tree_model_row_changed, + (GtkTreeModelForeachFunc) (void (*)(void)) gtk_tree_model_row_changed, NULL); } @@ -2155,7 +2159,7 @@ thunar_list_model_set_file_size_binary (ThunarListModel *store, /* emit a "changed" signal for each row, so the display is reloaded with the new binary file size setting */ gtk_tree_model_foreach (GTK_TREE_MODEL (store), - (GtkTreeModelForeachFunc) gtk_tree_model_row_changed, + (GtkTreeModelForeachFunc) (void (*)(void)) gtk_tree_model_row_changed, NULL); } } diff --git a/thunar/thunar-menu-util.c b/thunar/thunar-menu-util.c index ca32ee4c..5caacc41 100644 --- a/thunar/thunar-menu-util.c +++ b/thunar/thunar-menu-util.c @@ -72,7 +72,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS g_signal_connect_data (action, "activate", G_CALLBACK (extension_action_callback), g_object_ref (item), - (GClosureNotify) g_object_unref, 0); + (GClosureNotify) (void (*)(void)) g_object_unref, 0); g_free (name); g_free (label); diff --git a/thunar/thunar-navigator.c b/thunar/thunar-navigator.c index ff3e7617..ad5e8686 100644 --- a/thunar/thunar-navigator.c +++ b/thunar/thunar-navigator.c @@ -57,7 +57,7 @@ thunar_navigator_get_type (void) sizeof (ThunarNavigatorIface), (GBaseInitFunc) thunar_navigator_base_init, NULL, - (GClassInitFunc) thunar_navigator_class_init, + (GClassInitFunc) (void (*)(void)) thunar_navigator_class_init, NULL, NULL, 0, diff --git a/thunar/thunar-permissions-chooser.c b/thunar/thunar-permissions-chooser.c index 36ce9c17..1e803602 100644 --- a/thunar/thunar-permissions-chooser.c +++ b/thunar/thunar-permissions-chooser.c @@ -941,7 +941,7 @@ thunar_permissions_chooser_file_changed (ThunarPermissionsChooser *chooser) if (G_LIKELY (user != NULL)) { groups = g_list_copy (thunar_user_get_groups (user)); - g_list_foreach (groups, (GFunc) g_object_ref, NULL); + g_list_foreach (groups, (GFunc) (void (*)(void)) g_object_ref, NULL); } } diff --git a/thunar/thunar-properties-dialog.c b/thunar/thunar-properties-dialog.c index e612a926..848eb564 100644 --- a/thunar/thunar-properties-dialog.c +++ b/thunar/thunar-properties-dialog.c @@ -704,7 +704,7 @@ static gboolean thunar_properties_dialog_reload (ThunarPropertiesDialog *dialog) { /* reload the active files */ - g_list_foreach (dialog->files, (GFunc) thunar_file_reload, NULL); + g_list_foreach (dialog->files, (GFunc) (void (*)(void)) thunar_file_reload, NULL); return dialog->files != NULL; } diff --git a/thunar/thunar-sendto-model.c b/thunar/thunar-sendto-model.c index 42253864..35418582 100644 --- a/thunar/thunar-sendto-model.c +++ b/thunar/thunar-sendto-model.c @@ -154,7 +154,7 @@ thunar_sendto_model_load (ThunarSendtoModel *sendto_model) /* add to our handler list, sorted by their desktop-ids (reverse order) */ sendto_model->handlers = g_list_insert_sorted (sendto_model->handlers, G_APP_INFO (app_info), - (GCompareFunc) g_app_info_compare); + (GCompareFunc) (void (*)(void)) g_app_info_compare); /* attach the mime-types to the object */ mime_types = g_key_file_get_string_list (key_file, diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c index 0c9b5133..aa38b705 100644 --- a/thunar/thunar-shortcuts-model.c +++ b/thunar/thunar-shortcuts-model.c @@ -318,7 +318,7 @@ thunar_shortcuts_model_finalize (GObject *object) g_source_remove (model->bookmarks_idle_id); /* free all shortcuts */ - g_list_foreach (model->shortcuts, (GFunc) thunar_shortcut_free, model); + g_list_foreach (model->shortcuts, (GFunc) (void (*)(void)) thunar_shortcut_free, model); g_list_free (model->shortcuts); /* disconnect from the preferences */ diff --git a/thunar/thunar-side-pane.c b/thunar/thunar-side-pane.c index 6084738a..e17c6305 100644 --- a/thunar/thunar-side-pane.c +++ b/thunar/thunar-side-pane.c @@ -41,7 +41,7 @@ thunar_side_pane_get_type (void) type = g_type_register_static_simple (G_TYPE_INTERFACE, I_("ThunarSidePane"), sizeof (ThunarSidePaneIface), - (GClassInitFunc) thunar_side_pane_class_init, + (GClassInitFunc) (void (*)(void)) thunar_side_pane_class_init, 0, NULL, 0); diff --git a/thunar/thunar-templates-action.c b/thunar/thunar-templates-action.c index 33a263d8..42118ae3 100644 --- a/thunar/thunar-templates-action.c +++ b/thunar/thunar-templates-action.c @@ -343,7 +343,7 @@ thunar_templates_action_files_ready (ThunarJob *job, /* sort items so that directories come before files and ancestors come * before descendants */ - files = g_list_sort (files, (GCompareFunc) compare_files); + files = g_list_sort (files, (GCompareFunc) (void (*)(void)) compare_files); for (lp = g_list_first (files); lp != NULL; lp = lp->next) { diff --git a/thunar/thunar-thumbnailer.c b/thunar/thunar-thumbnailer.c index 0c45fd0b..0701d2cf 100644 --- a/thunar/thunar-thumbnailer.c +++ b/thunar/thunar-thumbnailer.c @@ -1089,7 +1089,7 @@ thunar_thumbnailer_queue_files (ThunarThumbnailer *thumbnailer, /* allocate a job */ job = g_slice_new0 (ThunarThumbnailerJob); job->thumbnailer = thumbnailer; - job->files = g_list_copy_deep (files, (GCopyFunc)g_object_ref, NULL); + job->files = g_list_copy_deep (files, (GCopyFunc) (void (*)(void)) g_object_ref, NULL); job->lazy_checks = lazy_checks ? 1 : 0; success = thunar_thumbnailer_begin_job (thumbnailer, job); diff --git a/thunar/thunar-tree-model.c b/thunar/thunar-tree-model.c index 3424f480..32bcc0da 100644 --- a/thunar/thunar-tree-model.c +++ b/thunar/thunar-tree-model.c @@ -295,7 +295,7 @@ thunar_tree_model_init (ThunarTreeModel *model) /* initialize the model data */ model->sort_case_sensitive = TRUE; - model->visible_func = (ThunarTreeModelVisibleFunc) exo_noop_true; + model->visible_func = (ThunarTreeModelVisibleFunc) (void (*)(void)) exo_noop_true; model->visible_data = NULL; model->cleanup_idle_id = 0; diff --git a/thunar/thunar-user.c b/thunar/thunar-user.c index ceba7b0d..3fef90cf 100644 --- a/thunar/thunar-user.c +++ b/thunar/thunar-user.c @@ -562,10 +562,14 @@ thunar_user_manager_flush_timer (gpointer user_data) THUNAR_THREADS_ENTER /* drop all cached groups */ - size += g_hash_table_foreach_remove (manager->groups, (GHRFunc) gtk_true, NULL); + size += g_hash_table_foreach_remove (manager->groups, + (GHRFunc) (void (*)(void)) gtk_true, + NULL); /* drop all cached users */ - size += g_hash_table_foreach_remove (manager->users, (GHRFunc) gtk_true, NULL); + size += g_hash_table_foreach_remove (manager->users, + (GHRFunc) (void (*)(void)) gtk_true, + NULL); /* reload groups and passwd files if we had cached entities */ if (G_LIKELY (size > 0)) diff --git a/thunar/thunar-view.c b/thunar/thunar-view.c index 698d6872..d2a15616 100644 --- a/thunar/thunar-view.c +++ b/thunar/thunar-view.c @@ -41,7 +41,7 @@ thunar_view_get_type (void) type = g_type_register_static_simple (G_TYPE_INTERFACE, I_("ThunarView"), sizeof (ThunarViewIface), - (GClassInitFunc) thunar_view_class_init, + (GClassInitFunc) (void (*)(void)) thunar_view_class_init, 0, NULL, 0); diff --git a/thunarx/thunarx-file-info.c b/thunarx/thunarx-file-info.c index ae9f184e..ad832062 100644 --- a/thunarx/thunarx-file-info.c +++ b/thunarx/thunarx-file-info.c @@ -427,12 +427,12 @@ GList* thunarx_file_info_list_copy (GList *file_infos) { #if GLIB_CHECK_VERSION (2, 34, 0) - return g_list_copy_deep (file_infos, (GCopyFunc) g_object_ref, NULL); + return g_list_copy_deep (file_infos, (GCopyFunc) (void (*)(void)) g_object_ref, NULL); #else GList *copy; copy = g_list_copy (file_infos); - g_list_foreach (copy, (GFunc) g_object_ref, NULL); + g_list_foreach (copy, (GFunc) (void (*)(void)) g_object_ref, NULL); return copy; #endif diff --git a/thunarx/thunarx-menu-item.c b/thunarx/thunarx-menu-item.c index d9a518c9..7622b89f 100644 --- a/thunarx/thunarx-menu-item.c +++ b/thunarx/thunarx-menu-item.c @@ -414,6 +414,6 @@ thunarx_menu_item_list_free (GList *items) { g_return_if_fail (items != NULL); - g_list_foreach (items, (GFunc)g_object_unref, NULL); + g_list_foreach (items, (GFunc) (void (*)(void)) g_object_unref, NULL); g_list_free (items); } diff --git a/thunarx/thunarx-menu.c b/thunarx/thunarx-menu.c index 97961b59..b3fcf208 100644 --- a/thunarx/thunarx-menu.c +++ b/thunarx/thunarx-menu.c @@ -138,7 +138,7 @@ thunarx_menu_get_items (ThunarxMenu *menu) g_return_val_if_fail (menu != NULL, NULL); items = g_list_copy (menu->priv->items); - g_list_foreach (items, (GFunc) g_object_ref, NULL); + g_list_foreach (items, (GFunc) (void (*)(void)) g_object_ref, NULL); return items; } diff --git a/thunarx/thunarx-provider-plugin.c b/thunarx/thunarx-provider-plugin.c index a1d3abfb..ef2a197f 100644 --- a/thunarx/thunarx-provider-plugin.c +++ b/thunarx/thunarx-provider-plugin.c @@ -53,7 +53,7 @@ thunarx_provider_plugin_get_type (void) type = g_type_register_static_simple (G_TYPE_INTERFACE, I_("ThunarxProviderPlugin"), sizeof (ThunarxProviderPluginIface), - (GClassInitFunc) thunarx_provider_plugin_class_init, + (GClassInitFunc) (void (*)(void)) thunarx_provider_plugin_class_init, 0, NULL, 0); diff --git a/thunarx/thunarx.h b/thunarx/thunarx.h index 192bf9a7..2ec42526 100644 --- a/thunarx/thunarx.h +++ b/thunarx/thunarx.h @@ -69,12 +69,12 @@ type_name##_register_type (ThunarxProviderPlugin *thunarx_define_type_plugin) \ sizeof (TypeName##Class), \ NULL, \ NULL, \ - (GClassInitFunc) type_name##_class_intern_init, \ + (GClassInitFunc) (void (*)(void)) type_name##_class_intern_init, \ NULL, \ NULL, \ sizeof (TypeName), \ 0, \ - (GInstanceInitFunc) type_name##_init, \ + (GInstanceInitFunc) (void (*)(void)) type_name##_init, \ NULL, \ }; \ thunarx_define_type_id = thunarx_provider_plugin_register_type (thunarx_define_type_plugin, TYPE_PARENT, \ @@ -87,7 +87,7 @@ type_name##_register_type (ThunarxProviderPlugin *thunarx_define_type_plugin) \ { \ static const GInterfaceInfo thunarx_implement_interface_info = \ { \ - (GInterfaceInitFunc) iface_init \ + (GInterfaceInitFunc) (void (*)(void)) iface_init \ }; \ thunarx_provider_plugin_add_interface (thunarx_define_type_plugin, thunarx_define_type_id, TYPE_IFACE, &thunarx_implement_interface_info); \ } |