# HG changeset patch # User Jan Dj¸«£rv # Date 1100643888 0 # Node ID 10efc827e15c421efc41b9c898843fcdce6b31ed # Parent c163562b2d595f12d4fd2787260cab9f5cbfb139 * gtkutil.c (xg_get_file_name): Fix typo in HAVE_GTK_FILE_SELECTION_NEW. diff -r c163562b2d59 -r 10efc827e15c src/ChangeLog --- a/src/ChangeLog Tue Nov 16 20:52:32 2004 +0000 +++ b/src/ChangeLog Tue Nov 16 22:24:48 2004 +0000 @@ -1,5 +1,8 @@ 2004-11-16 Jan Dj,Ad(Brv + * gtkutil.c (xg_get_file_name): Fix typo in + HAVE_GTK_FILE_SELECTION_NEW. + * xmenu.c (x_menu_in_use): Removed. (x_menu_set_in_use): Also set popup_activated_flag. diff -r c163562b2d59 -r 10efc827e15c src/gtkutil.c --- a/src/gtkutil.c Tue Nov 16 20:52:32 2004 +0000 +++ b/src/gtkutil.c Tue Nov 16 22:24:48 2004 +0000 @@ -1304,7 +1304,7 @@ char *default_filename; int mustmatch_p, only_dir_p; { - GtkWidget *w; + GtkWidget *w = 0; int count = SPECPDL_INDEX (); char *fn = 0; int filesel_done = 0; @@ -1320,7 +1320,7 @@ #else /* not HAVE_GTK_FILE_BOTH */ -#ifdef HAVE_GTK_FILE_SELECTION_DIALOG_NEW +#ifdef HAVE_GTK_FILE_SELECTION_NEW w = xg_get_file_with_selection (f, prompt, default_filename, mustmatch_p, only_dir_p, &func); #endif