[evince] [libegg] Resync with libegg to remove deprecated GTK+ symbols
- From: Nickolay V. Shmyrev <nshmyrev src gnome org>
- To: svn-commits-list gnome org
- Subject: [evince] [libegg] Resync with libegg to remove deprecated GTK+ symbols
- Date: Thu, 30 Apr 2009 04:47:04 -0400 (EDT)
commit de24c673c89e61630509b6cbbc5b291c159e72fd
Author: Javier Jardón <javierjc1982 gmail com>
Date: Thu Apr 30 12:46:15 2009 +0400
[libegg] Resync with libegg to remove deprecated GTK+ symbols
Fixes GNOME bug #580556
---
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");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]