diff src/gtkutil.c @ 90082:6d92d69fae33

Revision: [e-mail]--gnu-2005/emacs--unicode--0--patch-4 Merge from emacs--cvs-trunk--0 Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-41 - [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-46 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-47 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-4 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-5 Update from CVS: exi/gnus-faq.texi ([4.1]): Typo. * [e-mail]--gnu-2005/gnus--rel--5.10--patch-6 Update from CVS

--- a/src/gtkutil.c	Tue Jan 18 04:50:08 2005 +0000
+++ b/src/gtkutil.c	Sat Jan 22 21:39:38 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