diff options
| author | Marek Kasik <mkasik@redhat.com> | 2014-07-14 17:02:13 +0200 |
|---|---|---|
| committer | Marek Kasik <mkasik@redhat.com> | 2014-10-02 19:06:03 +0200 |
| commit | 8b5d30d4396ba0e3e0b2ff2e515d8eddb5c26849 (patch) | |
| tree | 943aa1f3823b96a6ccac13e3250add561f005237 /gdk/x11/gdkwindow-x11.c | |
| parent | 07722ae2ddf81edb2f4623bb2aa5ea7bf0301232 (diff) | |
| download | gtk+-8b5d30d4396ba0e3e0b2ff2e515d8eddb5c26849.tar.gz | |
Remove redundant checks for NULL
Remove checks for NULL before g_free() and g_clear_object().
Merge check for NULL, freeing of pointer and its setting
to NULL by g_clear_pointer().
https://bugzilla.gnome.org/show_bug.cgi?id=733157
Diffstat (limited to 'gdk/x11/gdkwindow-x11.c')
| -rw-r--r-- | gdk/x11/gdkwindow-x11.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index fa40f0d46a..fd1ea5d047 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -4977,12 +4977,7 @@ finish_drag (MoveResizeData *mv_resize) mv_resize->moveresize_emulation_window = NULL; g_object_unref (mv_resize->moveresize_window); mv_resize->moveresize_window = NULL; - - if (mv_resize->moveresize_pending_event) - { - g_free (mv_resize->moveresize_pending_event); - mv_resize->moveresize_pending_event = NULL; - } + g_clear_pointer (&mv_resize->moveresize_pending_event, g_free); } static int @@ -5677,8 +5672,7 @@ gdk_x11_window_set_opaque_region (GdkWindow *window, XA_CARDINAL, 32, PropModeReplace, (guchar *) data, nitems); - if (data != NULL) - g_free (data); + g_free (data); } static gboolean |