gimp r27940 - in branches/gimp-2-6: . app/widgets

[mitch svn gnome org]

Author: mitch
Date: Sat Jan 24 17:56:27 2009
New Revision: 27940
URL: http://svn.gnome.org/viewvc/gimp?rev=27940&view=rev

Log:
2009-01-24  Michael Natterer  <mitch gimp org>

	Merged from trunk:

	Bug 568890 â don't rely on GtkAction implementation details

	* app/widgets/gimpuimanager.c (gimp_ui_manager_menu_item_select):
	use gtk_widget_get_action() instead of g_object_get_data(),
	which relies on the name of the data key.



Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/app/widgets/gimpuimanager.c

Modified: branches/gimp-2-6/app/widgets/gimpuimanager.c
==============================================================================
--- branches/gimp-2-6/app/widgets/gimpuimanager.c	(original)
+++ branches/gimp-2-6/app/widgets/gimpuimanager.c	Sat Jan 24 17:56:27 2009
@@ -909,7 +909,7 @@
 gimp_ui_manager_menu_item_select (GtkWidget     *widget,
                                   GimpUIManager *manager)
 {
-  GtkAction *action = g_object_get_data (G_OBJECT (widget), "gtk-action");
+  GtkAction *action = gtk_widget_get_action (widget);
 
   if (action)
     {