[Emacs-diffs] /srv/bzr/emacs/trunk r99919: * xmenu.c (apply_systemfont_to_menu): *childs was incorrectly used.

[Jan D]

------------------------------------------------------------
revno: 99919 [merge]
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Fri 2010-04-16 19:06:41 +0200
message:
  * xmenu.c (apply_systemfont_to_menu): *childs was incorrectly used.
modified:
  src/ChangeLog
  src/xmenu.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-16 01:00:45 +0000
+++ b/src/ChangeLog     2010-04-16 17:05:20 +0000
@@ -1,3 +1,7 @@
+2010-04-16  Jan Djärv  <address@hidden>
+
+       * xmenu.c (apply_systemfont_to_menu): *childs was incorrectly used.
+
 2010-04-16  Ken Brown  <address@hidden>  (tiny change)
 
        * s/cygwin.h: Avoid linking against static libgcc.

=== modified file 'src/xmenu.c'
--- a/src/xmenu.c       2010-04-11 18:25:09 +0000
+++ b/src/xmenu.c       2010-04-16 17:05:31 +0000
@@ -978,14 +978,9 @@
   if (XtIsShell (w)) /* popup menu */
     {
       Widget *childs = NULL;
-      int num = 0;
-
-      XtVaGetValues (w, XtNnumChildren, &num, NULL);
-      if (num != 1) return; /* Should only be one. */
-
-      childs[0] = 0;
+
       XtVaGetValues (w, XtNchildren, &childs, NULL);
-      if (childs && *childs) w = *childs;
+      if (*childs) w = *childs;
     }
 
   /* Only use system font if the default is used for the menu.  */