diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-01-15 16:09:47 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-01-15 16:09:47 +0100 |
| commit | 2de22faab6d8918f6d5001edeb3f794cac829710 (patch) | |
| tree | b8dd8e221be8d6fdaefc4f5ea7299f0993e4ba87 /src | |
| parent | 76cad7a49fd7c5876e780bda4823d55a73ed2556 (diff) | |
| download | caja-2de22faab6d8918f6d5001edeb3f794cac829710.tar.bz2 caja-2de22faab6d8918f6d5001edeb3f794cac829710.tar.xz | |
GTK3 general: don't use gdk_cursor_unref()
taken from:
https://git.gnome.org/browse/nautilus/commit/?id=74a8f78
Diffstat (limited to 'src')
| -rw-r--r-- | src/caja-window.c | 4 | ||||
| -rw-r--r-- | src/file-manager/fm-list-view.c | 4 | ||||
| -rw-r--r-- | src/file-manager/fm-properties-window.c | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/caja-window.c b/src/caja-window.c index 6a1cb402..1392bad2 100644 --- a/src/caja-window.c +++ b/src/caja-window.c @@ -417,7 +417,11 @@ update_cursor (CajaWindow *window) { cursor = gdk_cursor_new (GDK_WATCH); gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (window)), cursor); +#if GTK_CHECK_VERSION(3,0,0) + g_object_unref (cursor); +#else gdk_cursor_unref (cursor); +#endif } else { diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index 56ff9b17..f78b080a 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -2960,11 +2960,15 @@ fm_list_view_click_policy_changed (FMDirectoryView *directory_view) } } +#if GTK_CHECK_VERSION(3,0,0) + g_clear_object (&hand_cursor); +#else if (hand_cursor != NULL) { gdk_cursor_unref (hand_cursor); hand_cursor = NULL; } +#endif } else if (click_policy_auto_value == CAJA_CLICK_POLICY_SINGLE) { diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index 87b75a6d..13b40b27 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -4067,7 +4067,11 @@ start_long_operation (FMPropertiesWindow *window) cursor = gdk_cursor_new (GDK_WATCH); gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (window)), cursor); +#if GTK_CHECK_VERSION(3,0,0) + g_object_unref (cursor); +#else gdk_cursor_unref (cursor); +#endif } window->details->long_operation_underway ++; } |