gthumb r2506 - in trunk: . libgthumb src

[mjc svn gnome org]

Author: mjc
Date: Fri Feb 13 18:24:33 2009
New Revision: 2506
URL: http://svn.gnome.org/viewvc/gthumb?rev=2506&view=rev

Log:
Merged 2503:2505 from gthumb-2-10.


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/libgthumb/gtk-utils.c
   trunk/src/gth-browser.c
   trunk/src/gth-viewer.c

Modified: trunk/libgthumb/gtk-utils.c
==============================================================================
--- trunk/libgthumb/gtk-utils.c	(original)
+++ trunk/libgthumb/gtk-utils.c	Fri Feb 13 18:24:33 2009
@@ -910,10 +910,14 @@
 						icon_no_extension,
 						size,
 						0);
-	retval = g_strdup (gtk_icon_info_get_filename (icon_info));
-
 	g_free (icon_no_extension);
-	gtk_icon_info_free (icon_info);
+
+        if (icon_info) {
+		retval = g_strdup (gtk_icon_info_get_filename (icon_info));
+		gtk_icon_info_free (icon_info);
+	}
+        else
+       		retval = NULL;
 
 	return retval;
 }

Modified: trunk/src/gth-browser.c
==============================================================================
--- trunk/src/gth-browser.c	(original)
+++ trunk/src/gth-browser.c	Fri Feb 13 18:24:33 2009
@@ -5152,7 +5152,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);

Modified: trunk/src/gth-viewer.c
==============================================================================
--- trunk/src/gth-viewer.c	(original)
+++ trunk/src/gth-viewer.c	Fri Feb 13 18:24:33 2009
@@ -289,7 +289,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);