gnome-mag r702 - in trunk: . magnifier magnifier/x11

[wwalker svn gnome org]

Author: wwalker
Date: Fri Aug 29 18:07:13 2008
New Revision: 702
URL: http://svn.gnome.org/viewvc/gnome-mag?rev=702&view=rev

Log:
Fix for bug #532918 - It's unable to launch magnifier of orca in gdm login window


Modified:
   trunk/ChangeLog
   trunk/magnifier/magnifier.c
   trunk/magnifier/x11/gmag-graphical-server.c

Modified: trunk/magnifier/magnifier.c
==============================================================================
--- trunk/magnifier/magnifier.c	(original)
+++ trunk/magnifier/magnifier.c	Fri Aug 29 18:07:13 2008
@@ -1680,7 +1680,8 @@
 magnifier_init_window (Magnifier *magnifier, GdkScreen *screen)
 {
 	GtkWindowType mag_win_type = GTK_WINDOW_TOPLEVEL;
-	if (_is_override_redirect) mag_win_type = GTK_WINDOW_POPUP;
+	if (_is_override_redirect || gmag_gs_use_compositor (magnifier))
+		mag_win_type = GTK_WINDOW_POPUP;
 
 	magnifier->priv->w =
 		g_object_connect (gtk_widget_new (gtk_window_get_type (),

Modified: trunk/magnifier/x11/gmag-graphical-server.c
==============================================================================
--- trunk/magnifier/x11/gmag-graphical-server.c	(original)
+++ trunk/magnifier/x11/gmag-graphical-server.c	Fri Aug 29 18:07:13 2008
@@ -460,6 +460,10 @@
 gboolean
 gmag_gs_use_compositor (Magnifier *magnifier)
 {
+	if (dpy == NULL) {
+		dpy = XOpenDisplay (magnifier->source_display_name); 
+	}
+
 	if (!gmag_gs_use_damage ()) {
 		return FALSE;
 	}