* 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 105e2f296f28fc91de8098c894787d16cc84a8d4..3405cbac1f0f2c02fd12bcdacd69241094b86ce7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-21  Jan Dj\e,Ad\e(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 --git a/src/gtkutil.c b/src/gtkutil.c
index 39d5e768dda113b21597e6022848cf7010cef66f..aecc4e2eaea3f4737049dda13452dde2e9f60dbf 100644 (file)
--- 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