* xmenu.c (apply_systemfont_to_menu): *childs was incorrectly used.

diff --git a/src/ChangeLog b/src/ChangeLog
index 789f7dc8c56a3931881fa2f328991dc3f3c92d3c..99d41c6ca6cc783e2328c929122e54ded712f7f8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-16  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * xmenu.c (apply_systemfont_to_menu): *childs was incorrectly used.
+
 2010-04-16  Ken Brown  <kbrown@cornell.edu>  (tiny change)
 
        * s/cygwin.h: Avoid linking against static libgcc.

diff --git a/src/xmenu.c b/src/xmenu.c
index c8067a47deb99e475e32b96e43bd61a980274735..796dd3093e8ba68e029c396afa74f4c498bf80bb 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -978,14 +978,9 @@ apply_systemfont_to_menu (w)
   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.  */