# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1106287161 0
# Node ID 77c91b49b4039546de8e995ab3317bb269b8c797
# Parent  10818a4142f1548b41e3ee16bbfda1e6129745c3
* 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 -r 10818a4142f1 -r 77c91b49b403 src/ChangeLog
--- a/src/ChangeLog	Fri Jan 21 05:52:26 2005 +0000
+++ b/src/ChangeLog	Fri Jan 21 05:59:21 2005 +0000
@@ -1,3 +1,9 @@
+2005-01-21  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* 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  <rms@gnu.org>
 
 	* editfns.c (Fmessage): If arg is "", return "" (as before).
diff -r 10818a4142f1 -r 77c91b49b403 src/gtkutil.c
--- a/src/gtkutil.c	Fri Jan 21 05:52:26 2005 +0000
+++ b/src/gtkutil.c	Fri Jan 21 05:59:21 2005 +0000
@@ -1312,6 +1312,7 @@
   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 @@
 #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 @@
       /* 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