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

svn path=/trunk/; revision=702

3 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 5990a47..f0faf82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-29  Willie Walker <william.walker@sun.com>
+
+        * magnifier/magnifier.c, magnifier/x11/gmag-graphical-server.c:
+          Fix for bug #532918 - It's unable to launch magnifier of orca 
+          in gdm login window.
+
 2007-08-03  Carlos Eduardo Rodrigues Diógenes  <cerdiogenes@gmail.com>
 
 	* configure.in: Post-release increment to 0.15.3.
diff --git a/magnifier/magnifier.c b/magnifier/magnifier.c
index c8d846d..d89bb06 100644
--- a/magnifier/magnifier.c
+++ b/magnifier/magnifier.c
@@ -1680,7 +1680,8 @@ static void
 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 (),
diff --git a/magnifier/x11/gmag-graphical-server.c b/magnifier/x11/gmag-graphical-server.c
index a8eb56c..50e98be 100644
--- a/magnifier/x11/gmag-graphical-server.c
+++ b/magnifier/x11/gmag-graphical-server.c
@@ -460,6 +460,10 @@ gmag_gs_use_damage ()
 gboolean
 gmag_gs_use_compositor (Magnifier *magnifier)
 {
+	if (dpy == NULL) {
+		dpy = XOpenDisplay (magnifier->source_display_name); 
+	}
+
 	if (!gmag_gs_use_damage ()) {
 		return FALSE;
 	}