Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Jardón <javierjc1982@gmail.com>2009-04-30 08:46:15 (GMT)
committer Nickolay V. Shmyrev <nshmyrev@yandex.ru>2009-04-30 08:46:15 (GMT)
commitde24c673c89e61630509b6cbbc5b291c159e72fd (patch)
tree304a16dfb247742bd989961f5a364f4183f70a70
parentc5c33418643f0272f0e0a996c1fa7fb5eb9a4b63 (diff)
[libegg] Resync with libegg to remove deprecated GTK+ symbols
Fixes GNOME bug #580556
-rw-r--r--cut-n-paste/toolbar-editor/egg-editable-toolbar.c22
1 files changed, 19 insertions, 3 deletions
diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
index 9ad940a..9913703 100644
--- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
+++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
@@ -200,7 +200,12 @@ drag_begin_cb (GtkWidget *widget,
gtk_widget_hide (widget);
- action = gtk_widget_get_action (widget);
+#if GTK_CHECK_VERSION (2, 16, 0)
+ action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (widget));
+#else
+action = gtk_widget_get_action (widget);
+#endif
+
if (action == NULL) return;
flags = egg_toolbars_model_get_name_flags (etoolbar->priv->model,
@@ -226,7 +231,12 @@ drag_end_cb (GtkWidget *widget,
{
gtk_widget_show (widget);
+#if GTK_CHECK_VERSION (2, 16, 0)
+ action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (widget));
+#else
action = gtk_widget_get_action (widget);
+#endif
+
if (action == NULL) return;
flags = egg_toolbars_model_get_name_flags (etoolbar->priv->model,
@@ -497,8 +507,14 @@ configure_item_cursor (GtkToolItem *item,
static void
configure_item_tooltip (GtkToolItem *item)
{
- GtkAction *action = gtk_widget_get_action (GTK_WIDGET (item));
-
+ GtkAction *action;
+
+#if GTK_CHECK_VERSION (2, 16, 0)
+ action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (item));
+#else
+ action = gtk_widget_get_action (GTKWIDGET (item));
+#endif
+
if (action != NULL)
{
g_object_notify (G_OBJECT (action), "tooltip");