[Emacs-diffs] /srv/bzr/emacs/trunk r106532: Work around an Ubuntu 11.10 bug where Emacs loops forever when started.

[Jan D.]

------------------------------------------------------------
revno: 106532
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2011-11-27 19:33:17 +0100
message:
  Work around an Ubuntu 11.10 bug where Emacs loops forever when started.
  
  * configure.in: Check for gtk_window_set_has_resize_grip.
  
  * src/gtkutil.c (xg_create_frame_widgets): Call
  gtk_window_set_has_resize_grip (FALSE) if that function is
  present with Gtk+ 2.0.
modified:
  ChangeLog
  configure.in
  src/ChangeLog
  src/gtkutil.c

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-11-25 13:26:30 +0000
+++ b/ChangeLog 2011-11-27 18:33:17 +0000
@@ -1,3 +1,7 @@
+2011-11-27  Jan Djärv  <address@hidden>
+
+       * configure.in: Check for gtk_window_set_has_resize_grip.
+
 2011-11-24  Juanma Barranquero  <address@hidden>
 
        * configure.in (HAVE_XPM): Fix typo.

=== modified file 'configure.in'
--- a/configure.in      2011-11-24 01:58:14 +0000
+++ b/configure.in      2011-11-27 18:33:17 +0000
@@ -1990,8 +1990,8 @@
   AC_CHECK_FUNCS(gtk_widget_get_window gtk_widget_set_has_window \
                  gtk_dialog_get_action_area gtk_widget_get_sensitive \
                  gtk_widget_get_mapped gtk_adjustment_get_page_size \
-                 gtk_orientable_set_orientation)
-
+                 gtk_orientable_set_orientation \
+                gtk_window_set_has_resize_grip)
 fi
 
 dnl D-Bus has been tested under GNU/Linux only.  Must be adapted for

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-26 21:40:41 +0000
+++ b/src/ChangeLog     2011-11-27 18:33:17 +0000
@@ -1,3 +1,9 @@
+2011-11-27  Jan Djärv  <address@hidden>
+
+       * gtkutil.c (xg_create_frame_widgets): Call
+       gtk_window_set_has_resize_grip (FALSE) if that function is
+       present with Gtk+ 2.0.
+
 2011-11-26  Paul Eggert  <address@hidden>
 
        * fileio.c (Finsert_file_contents): Undo previous change; see

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2011-11-20 07:30:16 +0000
+++ b/src/gtkutil.c     2011-11-27 18:33:17 +0000
@@ -1100,6 +1100,14 @@
   else
     wtop = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
+  /* gtk_window_set_has_resize_grip is a Gtk+ 3.0 function but Ubuntu
+     has backported it to Gtk+ 2.0 and they add the resize grip for
+     Gtk+ 2.0 applications also.  But it has a bug that makes Emacs loop
+     forever, so disable the grip.  */
+#if GTK_MAJOR_VERSION < 3 && defined (HAVE_GTK_WINDOW_SET_HAS_RESIZE_GRIP)
+  gtk_window_set_has_resize_grip (GTK_WINDOW (wtop), FALSE);
+#endif
+
   xg_set_screen (wtop, f);
 
   wvbox = gtk_vbox_new (FALSE, 0);