Mercurial > emacs

changeset 107879:65450964c877

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* xmenu.c (apply_systemfont_to_menu): *childs was incorrectly used.
author Jan D <jan.h.d@swipnet.se>
date Fri, 16 Apr 2010 19:06:41 +0200
parents 8bb4965be790 (current diff) faaa7a6517a8 (diff)
children 43aef96c6073
files
diffstat 2 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Fri Apr 16 00:41:19 2010 -0700
+++ b/src/ChangeLog	Fri Apr 16 19:06:41 2010 +0200
@@ -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.
--- a/src/xmenu.c	Fri Apr 16 00:41:19 2010 -0700
+++ b/src/xmenu.c	Fri Apr 16 19:06:41 2010 +0200
@@ -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.  */