aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@gnome.org>2011-02-13 05:42:22 +0800
committerXan Lopez <xan@gnome.org>2011-02-13 05:42:22 +0800
commit1f2b77565881709fe74d1f317e80c0f05c3ccaff (patch)
tree7446185b31230054f42bc7bab49c34ac51f271ed
parent552b8f94003391ee8255ced943e333801906801c (diff)
downloadgsoc2013-epiphany-1f2b77565881709fe74d1f317e80c0f05c3ccaff.tar.gz
gsoc2013-epiphany-1f2b77565881709fe74d1f317e80c0f05c3ccaff.tar.zst
gsoc2013-epiphany-1f2b77565881709fe74d1f317e80c0f05c3ccaff.zip
Sync with latest libegg
-rw-r--r--lib/egg/egg-editable-toolbar.c4
-rw-r--r--lib/egg/egg-toolbar-editor.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index 44f393dc4..24649e367 100644
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -439,7 +439,11 @@ configure_item_cursor (GtkToolItem *item,
cursor = gdk_cursor_new_for_display (gdk_screen_get_display (screen),
GDK_HAND2);
gdk_window_set_cursor (window, cursor);
+#if GTK_CHECK_VERSION (3,0,0)
+ g_object_unref (cursor);
+#else
gdk_cursor_unref (cursor);
+#endif
gtk_drag_source_set (widget, GDK_BUTTON1_MASK, dest_drag_types,
G_N_ELEMENTS (dest_drag_types), GDK_ACTION_MOVE);
diff --git a/lib/egg/egg-toolbar-editor.c b/lib/egg/egg-toolbar-editor.c
index fc97cbbca..bf76ca8b2 100644
--- a/lib/egg/egg-toolbar-editor.c
+++ b/lib/egg/egg-toolbar-editor.c
@@ -363,7 +363,11 @@ set_drag_cursor (GtkWidget *widget)
cursor = gdk_cursor_new_for_display (gdk_screen_get_display (screen),
GDK_HAND2);
gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
+#if GTK_CHECK_VERSION (3,0,0)
+ g_object_unref (cursor);
+#else
gdk_cursor_unref (cursor);
+#endif
}
static void