diff options
| author | rbuj <[email protected]> | 2019-03-03 10:43:16 +0100 |
|---|---|---|
| committer | rbuj <[email protected]> | 2019-04-09 21:40:56 +0200 |
| commit | bc48c3e4443a5d7e2fc39f1cd08dd2fbb26effb3 (patch) | |
| tree | 65ffd8dbdfa5abc3cd87f18d7058fafea1173915 /baobab | |
| parent | dd4c5965cd3fab114440d6b01e83153acdacd155 (diff) | |
| download | mate-utils-bc48c3e4443a5d7e2fc39f1cd08dd2fbb26effb3.tar.bz2 mate-utils-bc48c3e4443a5d7e2fc39f1cd08dd2fbb26effb3.tar.xz | |
Fix -Werror=cast-function-type with GCC 8
In addition, it removes unnecessary function type casts like:
(GDestroyNotify) g_object_unref
(GDestroyNotify) g_free
Diffstat (limited to 'baobab')
| -rw-r--r-- | baobab/src/baobab-remote-connect-dialog.c | 8 | ||||
| -rw-r--r-- | baobab/src/baobab.c | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/baobab/src/baobab-remote-connect-dialog.c b/baobab/src/baobab-remote-connect-dialog.c index c78725ca..6c901f3d 100644 --- a/baobab/src/baobab-remote-connect-dialog.c +++ b/baobab/src/baobab-remote-connect-dialog.c @@ -383,6 +383,12 @@ baobab_remote_connect_dialog_class_init (BaobabRemoteConnectDialogClass *class) gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = baobab_remote_connect_dialog_finalize; } +static void +destroy_label (GtkWidget *widget, + gpointer user_data) +{ + gtk_widget_destroy (widget); +} static void setup_for_type (BaobabRemoteConnectDialog *dialog) @@ -429,7 +435,7 @@ setup_for_type (BaobabRemoteConnectDialog *dialog) } /* Destroy all labels */ gtk_container_foreach (GTK_CONTAINER (dialog->details->grid), - (GtkCallback) gtk_widget_destroy, NULL); + destroy_label, NULL); i = 1; grid = dialog->details->grid; diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c index ff4f0bfa..33ef384e 100644 --- a/baobab/src/baobab.c +++ b/baobab/src/baobab.c @@ -721,8 +721,7 @@ baobab_set_excluded_locations (gchar **uris) { gint i; - g_slist_foreach (baobab.excluded_locations, (GFunc) g_object_unref, NULL); - g_slist_free (baobab.excluded_locations); + g_slist_free_full (baobab.excluded_locations, g_object_unref); baobab.excluded_locations = NULL; for (i = 0; uris[i] != NULL; ++i) { baobab.excluded_locations = g_slist_prepend (baobab.excluded_locations, @@ -896,8 +895,7 @@ baobab_shutdown (void) g_free (baobab.selected_path); - g_slist_foreach (baobab.excluded_locations, (GFunc) g_object_unref, NULL); - g_slist_free (baobab.excluded_locations); + g_slist_free_full (baobab.excluded_locations, g_object_unref); if (baobab.ui_settings) { g_object_unref (baobab.ui_settings); @@ -1319,7 +1317,7 @@ main (int argc, char *argv[]) g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, (GSourceFunc) start_proc_on_command_line, file, - (GDestroyNotify) g_object_unref); + g_object_unref); } g_strfreev (directories); |