[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/gtkutil.c,v
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] Changes to emacs/src/gtkutil.c,v |
Date: |
Sun, 10 Sep 2006 12:17:19 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Jan Djärv <jhd> 06/09/10 12:17:19
Index: gtkutil.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/gtkutil.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- gtkutil.c 4 Sep 2006 14:47:52 -0000 1.89
+++ gtkutil.c 10 Sep 2006 12:17:19 -0000 1.90
@@ -131,14 +131,8 @@
#ifdef HAVE_GTK_MULTIDISPLAY
GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (dpy);
- /* GTK 2.2 has a bug that makes gdk_display_close crash (bug
- http://bugzilla.gnome.org/show_bug.cgi?id=85715). This way
- we can continue running, but there will be memory leaks. */
-
-#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 4
-
/* If this is the default display, we must change it before calling
- dispose, otherwise it will crash. */
+ dispose, otherwise it will crash on some Gtk+ versions. */
if (gdk_display_get_default () == gdpy)
{
struct x_display_info *dpyinfo;
@@ -160,10 +154,14 @@
gdpy_new);
}
- g_object_run_dispose (G_OBJECT (gdpy));
+ /* GTK 2.2-2.8 has a bug that makes gdk_display_close crash (bug
+ http://bugzilla.gnome.org/show_bug.cgi?id=85715). This way
+ we can continue running, but there will be memory leaks. */
+#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 10
+ g_object_run_dispose (G_OBJECT (gdpy));
#else
- /* I hope this will be fixed in GTK 2.4. It is what bug 85715 says. */
+ /* This seems to be fixed in GTK 2.10. */
gdk_display_close (gdpy);
#endif
#endif /* HAVE_GTK_MULTIDISPLAY */
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v, Jan Djärv, 2006/09/02
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v, Jan Djärv, 2006/09/04
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v,
Jan Djärv <=
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v, Jan Djärv, 2006/09/16
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v, Jan Djärv, 2006/09/16
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v, Jan Djärv, 2006/09/18
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v, Jan Djärv, 2006/09/18
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v, Jan Djärv, 2006/09/22
- [Emacs-diffs] Changes to emacs/src/gtkutil.c,v, Richard M. Stallman, 2006/09/22