From: Jan Djärv Date: Fri, 21 Jan 2005 05:59:21 +0000 (+0000) Subject: * gtkutil.c (xg_tool_bar_detach_callback): Remove unused variable bw. X-Git-Tag: ttn-vms-21-2-B4~2645 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eee141ce6922778f818abd153b728c7b15832b5c;p=emacs.git * gtkutil.c (xg_tool_bar_detach_callback): Remove unused variable bw. (xg_get_file_name): Move declaration ofx_use_old_gtk_file_dialog to start of function for older compilers. --- diff --git a/src/ChangeLog b/src/ChangeLog index 105e2f296f2..3405cbac1f0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2005-01-21 Jan Dj,Ad(Brv + + * gtkutil.c (xg_tool_bar_detach_callback): Remove unused variable bw. + (xg_get_file_name): Move declaration ofx_use_old_gtk_file_dialog to + start of function for older compilers. + 2005-01-20 Richard M. Stallman * editfns.c (Fmessage): If arg is "", return "" (as before). diff --git a/src/gtkutil.c b/src/gtkutil.c index 39d5e768dda..aecc4e2eaea 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1312,6 +1312,7 @@ xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p) char *fn = 0; int filesel_done = 0; xg_get_file_func func; + extern int x_use_old_gtk_file_dialog; #if defined (HAVE_GTK_AND_PTHREAD) && defined (__SIGRTMIN) /* I really don't know why this is needed, but without this the GLIBC add on @@ -1321,7 +1322,6 @@ xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p) #endif /* HAVE_GTK_AND_PTHREAD */ #ifdef HAVE_GTK_FILE_BOTH - extern int x_use_old_gtk_file_dialog; if (x_use_old_gtk_file_dialog) w = xg_get_file_with_selection (f, prompt, default_filename, @@ -3161,7 +3161,6 @@ xg_tool_bar_detach_callback (wbox, w, client_data) /* When detaching a tool bar, not everything dissapear. There are a few pixels left that are used to drop the tool bar back into place. */ - int bw = gtk_container_get_border_width (GTK_CONTAINER (wbox)); FRAME_TOOLBAR_HEIGHT (f) = 2; /* The height has changed, resize outer widget and set columns