gimp r25478 - in trunk: . app/display

[neo svn gnome org]

Author: neo
Date: Mon Apr 14 07:50:55 2008
New Revision: 25478
URL: http://svn.gnome.org/viewvc/gimp?rev=25478&view=rev

Log:
2008-04-14  Sven Neumann  <sven gimp org>

	* app/display/gimpstatusbar.c (gimp_statusbar_label_expose): 
added
	a sanity check.

	* app/display/gimpdisplayshell-layer-select.c: formatting.



Modified:
   trunk/ChangeLog
   trunk/app/display/gimpdisplayshell-layer-select.c
   trunk/app/display/gimpstatusbar.c

Modified: trunk/app/display/gimpdisplayshell-layer-select.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-layer-select.c	(original)
+++ trunk/app/display/gimpdisplayshell-layer-select.c	Mon Apr 14 07:50:55 2008
@@ -85,7 +85,7 @@
     return;
 
   layer_select = layer_select_new (image, layer,
-                                   GIMP_CORE_CONFIG (shell->display->config)->layer_preview_size);
+                                   image->gimp->config->layer_preview_size);
   layer_select_advance (layer_select, move);
 
   gtk_window_set_screen (GTK_WINDOW (layer_select->shell),

Modified: trunk/app/display/gimpstatusbar.c
==============================================================================
--- trunk/app/display/gimpstatusbar.c	(original)
+++ trunk/app/display/gimpstatusbar.c	Mon Apr 14 07:50:55 2008
@@ -1163,8 +1163,9 @@
   if (! stock_id)
     return FALSE;
 
-  pixbuf = gtk_widget_render_icon (widget, stock_id,
-                                   GTK_ICON_SIZE_MENU, NULL);
+  pixbuf = gtk_widget_render_icon (widget, stock_id, GTK_ICON_SIZE_MENU, NULL);
+
+  g_return_val_if_fail (pixbuf != NULL, FALSE);
 
   if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
     {