eog r4966 - in trunk: . cut-n-paste/toolbar-editor src

[friemann svn gnome org]

Author: friemann
Date: Fri Jan 23 21:36:27 2009
New Revision: 4966
URL: http://svn.gnome.org/viewvc/eog?rev=4966&view=rev

Log:
2009-01-23  Felix Riemann  <friemann svn gnome org>

	* cut-n-paste/toolbar-editor/egg-editable-toolbar.c:
	(drag_begin_cb), (drag_end_cb), (configure_item_tooltip):
	Update to latest code from libegg to fix this.
	* src/eog-window.c: (menu_item_select_cb):
	Don't rely on GTK associating an action to its proxy widget 
	using the "gtk-action" keyword.
	Fixes bug #568882 (Christian Persch).


Modified:
   trunk/ChangeLog
   trunk/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
   trunk/src/eog-window.c

Modified: trunk/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
==============================================================================
--- trunk/cut-n-paste/toolbar-editor/egg-editable-toolbar.c	(original)
+++ trunk/cut-n-paste/toolbar-editor/egg-editable-toolbar.c	Fri Jan 23 21:36:27 2009
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- *  $Id: egg-editable-toolbar.c 891 2008-08-08 21:14:52Z friemann $
+ *  $Id: egg-editable-toolbar.c 925 2009-01-23 17:58:16Z xan $
  */
 
 #include "config.h"
@@ -200,7 +200,7 @@
   
   gtk_widget_hide (widget);
 
-  action = g_object_get_data (G_OBJECT (widget), "gtk-action");
+  action = gtk_widget_get_action (widget);
   if (action == NULL) return;
   
   flags = egg_toolbars_model_get_name_flags (etoolbar->priv->model,
@@ -226,7 +226,7 @@
     {
       gtk_widget_show (widget);
 
-      action = g_object_get_data (G_OBJECT (widget), "gtk-action");
+      action = gtk_widget_get_action (widget);
       if (action == NULL) return;
       
       flags = egg_toolbars_model_get_name_flags (etoolbar->priv->model,
@@ -497,8 +497,7 @@
 static void
 configure_item_tooltip (GtkToolItem *item)
 {
-  GtkAction *action = g_object_get_data (G_OBJECT (item),
-					 "gtk-action");
+  GtkAction *action = gtk_widget_get_action (GTK_WIDGET (item));
   
   if (action != NULL)
     {

Modified: trunk/src/eog-window.c
==============================================================================
--- trunk/src/eog-window.c	(original)
+++ trunk/src/eog-window.c	Fri Jan 23 21:36:27 2009
@@ -3496,7 +3496,7 @@
 	GtkAction *action;
 	char *message;
 
-	action = g_object_get_data (G_OBJECT (proxy), "gtk-action");
+	action = gtk_widget_get_action (GTK_WIDGET (proxy));
 
 	g_return_if_fail (action != NULL);