summaryrefslogtreecommitdiff
path: root/baobab
diff options
context:
space:
mode:
authorrbuj <[email protected]>2019-03-03 10:43:16 +0100
committermonsta <[email protected]>2019-05-29 11:35:22 +0300
commit5bc4d4e8ff6420a5cf5d8fd898d0afee2fde18b2 (patch)
tree34996bc5e70b7ccfda7bcf6cfab98ca83cd15523 /baobab
parent10d0e538235a3d87c8a5c64193cbcf04c2a8a07b (diff)
downloadmate-utils-5bc4d4e8ff6420a5cf5d8fd898d0afee2fde18b2.tar.bz2
mate-utils-5bc4d4e8ff6420a5cf5d8fd898d0afee2fde18b2.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.c8
-rw-r--r--baobab/src/baobab.c8
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 603adb9b..b1f2b378 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 eeb07e43..4d2509ef 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);
@@ -1320,7 +1318,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);