From: Jan Djärv <jan.h.d@swipnet.se>
Date: Thu, 2 Dec 2010 09:33:57 +0000 (+0100)
Subject: * nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~84
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dd723bbd427e7c399de316fe48f1514fa8b0bf29;p=emacs.git

* nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 83d6d4c6e88..dc6a02d7faf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/nsmenu.m b/src/nsmenu.m
index b6ee93bdf6b..973f2c15e2f 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1049,10 +1049,15 @@ update_frame_tool_bar (FRAME_PTR f)
         {
           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 @@ update_frame_tool_bar (FRAME_PTR f)
           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