From: Jan Djärv Date: Tue, 16 Nov 2004 22:24:48 +0000 (+0000) Subject: * gtkutil.c (xg_get_file_name): Fix typo in X-Git-Tag: ttn-vms-21-2-B4~3877 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=724cde0d1d4e455b72a33689c56d86d3edf8faa6;p=emacs.git * gtkutil.c (xg_get_file_name): Fix typo in HAVE_GTK_FILE_SELECTION_NEW. --- diff --git a/src/ChangeLog b/src/ChangeLog index 4fa76aeb5da..3061c19bd06 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 --git a/src/gtkutil.c b/src/gtkutil.c index 79333782229..25dd88d544e 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1304,7 +1304,7 @@ xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p) 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 @@ xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p) #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