diff options
| author | Sébastien Wilmet <swilmet@gnome.org> | 2015-11-06 10:42:40 +0100 |
|---|---|---|
| committer | Sébastien Wilmet <swilmet@gnome.org> | 2015-11-06 10:47:12 +0100 |
| commit | c408105a145ab0e40a0eb809b4926dc2d7432a80 (patch) | |
| tree | a12b383392f8e037adace0a135e49eb4304b6efb | |
| parent | 225caf489ff3fb504f1a12246caba9891a23e52e (diff) | |
| download | gedit-c408105a145ab0e40a0eb809b4926dc2d7432a80.tar.gz | |
Fix critical messages with NULL cursor
gdk_cursor_new_from_name() can return NULL.
https://bugzilla.gnome.org/show_bug.cgi?id=757639
| -rw-r--r-- | gedit/gedit-tab.c | 4 | ||||
| -rw-r--r-- | plugins/filebrowser/gedit-file-browser-widget.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gedit/gedit-tab.c b/gedit/gedit-tab.c index 3eeaa6872..c80b34d6a 100644 --- a/gedit/gedit-tab.c +++ b/gedit/gedit-tab.c @@ -467,7 +467,7 @@ set_cursor_according_to_state (GtkTextView *view, if (left_window != NULL) gdk_window_set_cursor (left_window, cursor); - g_object_unref (cursor); + g_clear_object (&cursor); } else { @@ -478,7 +478,7 @@ set_cursor_according_to_state (GtkTextView *view, if (left_window != NULL) gdk_window_set_cursor (left_window, NULL); - g_object_unref (cursor); + g_clear_object (&cursor); } } diff --git a/plugins/filebrowser/gedit-file-browser-widget.c b/plugins/filebrowser/gedit-file-browser-widget.c index fe3839559..add69fd1f 100644 --- a/plugins/filebrowser/gedit-file-browser-widget.c +++ b/plugins/filebrowser/gedit-file-browser-widget.c @@ -1954,7 +1954,6 @@ static void set_busy (GeditFileBrowserWidget *obj, gboolean busy) { - GdkCursor *cursor; GdkWindow *window; window = gtk_widget_get_window (GTK_WIDGET (obj->priv->treeview)); @@ -1965,11 +1964,12 @@ set_busy (GeditFileBrowserWidget *obj, if (busy) { GdkDisplay *display; + GdkCursor *cursor; display = gtk_widget_get_display (GTK_WIDGET (obj)); cursor = gdk_cursor_new_from_name (display, "progress"); gdk_window_set_cursor (window, cursor); - g_object_unref (cursor); + g_clear_object (&cursor); } else { |