[Emacs-diffs] /srv/bzr/emacs/trunk r102547: * nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image.

[Jan D.]

------------------------------------------------------------
revno: 102547
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Thu 2010-12-02 10:33:57 +0100
message:
  * nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image.
modified:
  src/ChangeLog
  src/nsmenu.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-12-02 08:24:16 +0000
+++ b/src/ChangeLog     2010-12-02 09:33:57 +0000
@@ -1,5 +1,7 @@
 2010-12-02  Jan Djärv  <address@hidden>
 
+       * 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).
 

=== modified file 'src/nsmenu.m'
--- a/src/nsmenu.m      2010-11-23 19:36:48 +0000
+++ b/src/nsmenu.m      2010-12-02 09:33:57 +0000
@@ -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