put in hack to keep Pango from mangling our server grab and locking up on

2002-02-19  Havoc Pennington  <hp@pobox.com>

	* src/ui.c (meta_ui_init): put in hack to keep Pango from mangling
	our server grab and locking up on startup. (hack doesn't work
	but I want to fix it on my real computer not this laptop)

	* src/window.c: Implement _NET_WM_STATE_FULLSCREEN

	* src/display.c (meta_display_open): add atoms for
	_NET_WM_STATE_FULLSCREEN

1 files changed, 9 insertions, 8 deletions

diff --git a/src/ui.c b/src/ui.c
index 11f78667..fdeb5c5b 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -29,6 +29,8 @@
 
 #include "inlinepixbufs.h"
 
+#include <pango/pangox.h>
+
 struct _MetaUI
 {
   Display *xdisplay;
@@ -42,14 +44,13 @@ meta_ui_init (int *argc, char ***argv)
   if (!gtk_init_check (argc, argv))
     meta_fatal ("Unable to open X display %s\n", XDisplayName (NULL));
 
-  {
-    /* FIXME this is a hackaround for a GTK bug with using menus without
-     * menubars. we have to use the get_type value since it's G_GNUC_CONST
-     */
-    volatile GType t;
-    t = gtk_menu_bar_get_type ();
-    t += 5;
-  }
+  /* FIXME hackaround for Pango opening a separate display
+   * connection and doing a server grab while we have a grab
+   * on the primary display connection. This forces Pango to
+   * go ahead and do its font cache before we try to grab
+   * the server.
+   */
+  pango_x_font_map_for_display (gdk_display);
 }
 
 Display*