diff options
Diffstat (limited to 'cut-n-paste')
| -rw-r--r-- | cut-n-paste/toolbar-editor/egg-editable-toolbar.c | 22 |
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"); |