# HG changeset patch
# User Jan D. <jan.h.d@swipnet.se>
# Date 1291282437 -3600
# Node ID 722e83b4c563b3ad82176211ca1b4ad468e08526
# Parent  df9e4ed95f9bc560c0c6716d8779749511fdf4b6
* nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image.

diff -r df9e4ed95f9b -r 722e83b4c563 src/ChangeLog
--- a/src/ChangeLog	Thu Dec 02 09:24:16 2010 +0100
+++ b/src/ChangeLog	Thu Dec 02 10:33:57 2010 +0100
@@ -1,5 +1,7 @@
 2010-12-02  Jan Djärv  <jan.h.d@swipnet.se>
 
+	* nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image.
+
 	* nsterm.m (ns_draw_glyph_string): Switch fore- and background if
 	drawing text under filled box cursor (Bug#7479).
 
diff -r df9e4ed95f9b -r 722e83b4c563 src/nsmenu.m
--- a/src/nsmenu.m	Thu Dec 02 09:24:16 2010 +0100
+++ b/src/nsmenu.m	Thu Dec 02 10:33:57 2010 +0100
@@ -1049,10 +1049,15 @@
         {
           idx = -1;
         }
+      helpObj = TOOLPROP (TOOL_BAR_ITEM_HELP);
+      if (NILP (helpObj))
+        helpObj = TOOLPROP (TOOL_BAR_ITEM_CAPTION);
+      helpText = NILP (helpObj) ? "" : (char *)SDATA (helpObj);
+
       /* Ignore invalid image specifications.  */
       if (!valid_image_p (image))
         {
-          NSLog (@"Invalid image for toolbar item");
+          /* Don't log anything, GNUS makes invalid images all the time.  */
           continue;
         }
 
@@ -1066,11 +1071,6 @@
           continue;
         }
 
-      helpObj = TOOLPROP (TOOL_BAR_ITEM_HELP);
-      if (NILP (helpObj))
-        helpObj = TOOLPROP (TOOL_BAR_ITEM_CAPTION);
-      helpText = NILP (helpObj) ? "" : (char *)SDATA (helpObj);
-
       [toolbar addDisplayItemWithImage: img->pixmap idx: i helpText: helpText
                                enabled: enabled_p];
 #undef TOOLPROP