gtranslator r3932 - in trunk: . src src/toolbareditor

[psanxiao svn gnome org]

Author: psanxiao
Date: Sat Feb  7 10:32:25 2009
New Revision: 3932
URL: http://svn.gnome.org/viewvc/gtranslator?rev=3932&view=rev

Log:
    	* src/toolbareditor/egg-editable-toolbar.c:
    	* src/window.c:
    	Using gtk_widget_get_data instead of g_object_get_data. (See bug #568892)

Modified:
   trunk/ChangeLog
   trunk/src/toolbareditor/egg-editable-toolbar.c
   trunk/src/window.c

Modified: trunk/src/toolbareditor/egg-editable-toolbar.c
==============================================================================
--- trunk/src/toolbareditor/egg-editable-toolbar.c	(original)
+++ trunk/src/toolbareditor/egg-editable-toolbar.c	Sat Feb  7 10:32:25 2009
@@ -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/window.c
==============================================================================
--- trunk/src/window.c	(original)
+++ trunk/src/window.c	Sat Feb  7 10:32:25 2009
@@ -1266,7 +1266,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);
 
 	g_object_get (G_OBJECT (action), "tooltip", &message, NULL);