aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@gnome.org>2009-04-28 16:35:20 +0800
committerXan Lopez <xan@gnome.org>2009-04-28 16:35:20 +0800
commitdcae8dfd69b1052907b94fc300537a20999938dc (patch)
tree80585f067d7522f6730be9b53d5aeb4751b0f17c
parent8951f7dc6b111e5297de24b868d12b5155241f3e (diff)
downloadgsoc2013-epiphany-dcae8dfd69b1052907b94fc300537a20999938dc.tar
gsoc2013-epiphany-dcae8dfd69b1052907b94fc300537a20999938dc.tar.gz
gsoc2013-epiphany-dcae8dfd69b1052907b94fc300537a20999938dc.tar.bz2
gsoc2013-epiphany-dcae8dfd69b1052907b94fc300537a20999938dc.tar.lz
gsoc2013-epiphany-dcae8dfd69b1052907b94fc300537a20999938dc.tar.xz
gsoc2013-epiphany-dcae8dfd69b1052907b94fc300537a20999938dc.tar.zst
gsoc2013-epiphany-dcae8dfd69b1052907b94fc300537a20999938dc.zip
egg-editable-toolbar: sync to latest upstream version (bug #580557)
-rw-r--r--lib/egg/egg-editable-toolbar.c20
1 files changed, 18 insertions, 2 deletions
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index aa4dbaa89..ba1a80756 100644
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -200,7 +200,12 @@ drag_begin_cb (GtkWidget *widget,
gtk_widget_hide (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 (GTK_WIDGET (item));
+ #endif
+
if (action != NULL)
{
g_object_notify (G_OBJECT (action), "tooltip");