diff options
| author | Ernestas Kulik <ernestask@gnome.org> | 2018-07-25 10:00:09 +0300 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@gnome.org> | 2018-07-25 10:05:39 +0300 |
| commit | 6adaf7c33d9a0d59b8b17bcd860957ef94a5c134 (patch) | |
| tree | 0398d18e3c329f76f1a6d14ee3e688939d414b6d /gtk | |
| parent | 95a4eff6baddb174ef5ff8384250bd8c1e6e1f32 (diff) | |
| download | gtk+-g-clear-pointer-propagate.tar.gz | |
Remove GDestroyNotify casts in g_clear_pointer() usesg-clear-pointer-propagate
GLib master propagates argument types in g_clear_pointer(), which causes
the usual function pointer casts to GDestroyNotify to trip compiler
warnings. Additionally, this commit changes some cleanup functions where
appropriate (wl_data_source_destroy ->
gtk_primary_selection_source_destroy for struct
gtk_primary_selection_source).
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkdnd.c | 2 | ||||
| -rw-r--r-- | gtk/gtkscrolledwindow.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 25cc9e659d..1d70e56c86 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -847,7 +847,7 @@ gtk_drag_content_finalize (GObject *object) GtkDragContent *content = GTK_DRAG_CONTENT (object); g_clear_object (&content->widget); - g_clear_pointer (&content->formats, (GDestroyNotify) gdk_content_formats_unref); + g_clear_pointer (&content->formats, gdk_content_formats_unref); G_OBJECT_CLASS (gtk_drag_content_parent_class)->finalize (object); } diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 4c502846ae..2849042466 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -3253,7 +3253,7 @@ scrolled_window_deceleration_cb (GtkWidget *widget, gtk_adjustment_set_value (hadjustment, position); } else if (data->hscrolling) - g_clear_pointer (&data->hscrolling, (GDestroyNotify) gtk_kinetic_scrolling_free); + g_clear_pointer (&data->hscrolling, gtk_kinetic_scrolling_free); if (data->vscrolling && gtk_kinetic_scrolling_tick (data->vscrolling, elapsed, &position)) @@ -3262,7 +3262,7 @@ scrolled_window_deceleration_cb (GtkWidget *widget, gtk_adjustment_set_value (vadjustment, position); } else if (data->vscrolling) - g_clear_pointer (&data->vscrolling, (GDestroyNotify) gtk_kinetic_scrolling_free); + g_clear_pointer (&data->vscrolling, gtk_kinetic_scrolling_free); if (!data->hscrolling && !data->vscrolling) { |