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/quartz/GdkQuartzView.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/quartz/GdkQuartzView.c')
| -rw-r--r-- | gdk/quartz/GdkQuartzView.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/gdk/quartz/GdkQuartzView.c b/gdk/quartz/GdkQuartzView.c index a2ed1f58d1..cbd7fe5cbb 100644 --- a/gdk/quartz/GdkQuartzView.c +++ b/gdk/quartz/GdkQuartzView.c @@ -125,10 +125,7 @@ gchar *prev_str; markedRange = selectedRange = NSMakeRange (NSNotFound, 0); - prev_str = g_object_get_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT); - if (prev_str) - g_free (prev_str); - g_object_set_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT, NULL); + g_object_set_data_full (G_OBJECT (gdk_window), TIC_MARKED_TEXT, NULL, g_free); } -(void)setMarkedText: (id)aString selectedRange: (NSRange)newSelection replacementRange: (NSRange)replacementRange @@ -155,10 +152,7 @@ str = [aString UTF8String]; } - prev_str = g_object_get_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT); - if (prev_str) - g_free (prev_str); - g_object_set_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT, g_strdup (str)); + g_object_set_data_full (G_OBJECT (gdk_window), TIC_MARKED_TEXT, g_strdup (str), g_free); g_object_set_data (G_OBJECT (gdk_window), TIC_SELECTED_POS, GUINT_TO_POINTER (selectedRange.location)); g_object_set_data (G_OBJECT (gdk_window), TIC_SELECTED_LEN, @@ -214,10 +208,7 @@ str = [string UTF8String]; } - prev_str = g_object_get_data (G_OBJECT (gdk_window), TIC_INSERT_TEXT); - if (prev_str) - g_free (prev_str); - g_object_set_data (G_OBJECT (gdk_window), TIC_INSERT_TEXT, g_strdup (str)); + g_object_set_data_full (G_OBJECT (gdk_window), TIC_INSERT_TEXT, g_strdup (str), g_free); GDK_NOTE (EVENTS, g_print ("insertText: set %s (%p, nsview %p): %s\n", TIC_INSERT_TEXT, gdk_window, self, str ? str : "(empty)")); |