gdm r5806 - in trunk: . gui/simple-chooser gui/simple-greeter

[mccann svn gnome org]

Author: mccann
Date: Tue Feb 19 21:28:26 2008
New Revision: 5806
URL: http://svn.gnome.org/viewvc/gdm?rev=5806&view=rev

Log:
2008-02-19  William Jon McCann  <jmccann redhat com>

	* gui/simple-chooser/Makefile.am:
	* gui/simple-chooser/test-host-chooser.c:
	* gui/simple-greeter/gdm-remote-login-window.c: (start_xephyr),
	(start_xdmx), (gdm_remote_login_window_connect),
	(gdm_remote_login_window_init):
	* gui/simple-greeter/test-remote-login-window.c: (main):
	Install the test program as gdm-host-chooser.  Add a
	stub for Xdmx support.



Added:
   trunk/gui/simple-chooser/gdm-host-chooser.c
      - copied unchanged from r5805, /trunk/gui/simple-chooser/test-host-chooser.c
Removed:
   trunk/gui/simple-chooser/test-host-chooser.c
Modified:
   trunk/ChangeLog
   trunk/gui/simple-chooser/Makefile.am
   trunk/gui/simple-greeter/gdm-remote-login-window.c
   trunk/gui/simple-greeter/test-remote-login-window.c

Modified: trunk/gui/simple-chooser/Makefile.am
==============================================================================
--- trunk/gui/simple-chooser/Makefile.am	(original)
+++ trunk/gui/simple-chooser/Makefile.am	Tue Feb 19 21:28:26 2008
@@ -20,10 +20,7 @@
 
 libexec_PROGRAMS =			\
 	gdm-simple-chooser		\
-	$(NULL)
-
-noinst_PROGRAMS = 			\
-	test-host-chooser		\
+	gdm-host-chooser		\
 	$(NULL)
 
 gdm_simple_chooser_SOURCES =  		\
@@ -46,15 +43,15 @@
 	$(XDMCP_LIBS)			\
 	$(NULL)
 
-test_host_chooser_SOURCES = 		\
-	test-host-chooser.c 		\
+gdm_host_chooser_SOURCES = 		\
+	gdm-host-chooser.c 		\
 	gdm-host-chooser-widget.c	\
 	gdm-host-chooser-widget.h	\
 	gdm-host-chooser-dialog.c	\
 	gdm-host-chooser-dialog.h	\
 	$(NULL)
 
-test_host_chooser_LDADD =		\
+gdm_host_chooser_LDADD =		\
 	$(top_builddir)/common/libgdmcommon.la	\
 	$(GTK_LIBS)			\
 	$(EXTRA_CHOOSER_LIBS)   	\

Modified: trunk/gui/simple-greeter/gdm-remote-login-window.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-remote-login-window.c	(original)
+++ trunk/gui/simple-greeter/gdm-remote-login-window.c	Tue Feb 19 21:28:26 2008
@@ -67,7 +67,7 @@
         gboolean res;
         GError  *error;
 
-        cmd = g_strdup_printf ("Xephyr -query %s -parent 0x%x %s",
+        cmd = g_strdup_printf ("Xephyr -query %s -parent 0x%x -br -once %s",
                                login_window->priv->hostname,
                                (unsigned int)GDK_WINDOW_XID (GTK_WIDGET (login_window)->window),
                                login_window->priv->display);
@@ -87,6 +87,32 @@
         return TRUE;
 }
 
+static gboolean
+start_xdmx (GdmRemoteLoginWindow *login_window)
+{
+        char    *cmd;
+        gboolean res;
+        GError  *error;
+
+        cmd = g_strdup_printf ("Xdmx -query %s -br -once %s",
+                               login_window->priv->hostname,
+                               login_window->priv->display);
+        g_debug ("Running: %s", cmd);
+
+        error = NULL;
+        res = g_spawn_command_line_async (cmd, &error);
+
+        g_free (cmd);
+
+        if (! res) {
+                g_warning ("Could not start Xdmx X server: %s", error->message);
+                g_error_free (error);
+                return FALSE;
+        }
+
+        return TRUE;
+}
+
 gboolean
 gdm_remote_login_window_connect (GdmRemoteLoginWindow *login_window,
                                  const char           *hostname)
@@ -101,7 +127,12 @@
         login_window->priv->hostname = g_strdup (hostname);
         login_window->priv->display = g_strdup (":300");
 
-        res = start_xephyr (login_window);
+        if (0) {
+                res = start_xdmx (login_window);
+        } else {
+                res = start_xephyr (login_window);
+        }
+
         if (res) {
                 title = g_strdup_printf (_("Remote Login (Connected to %s)"), hostname);
                 gtk_window_set_title (GTK_WINDOW (login_window), title);
@@ -188,6 +219,7 @@
         gtk_window_set_skip_pager_hint (GTK_WINDOW (login_window), TRUE);
         gtk_window_stick (GTK_WINDOW (login_window));
         gtk_window_maximize (GTK_WINDOW (login_window));
+        gtk_window_set_icon_name (GTK_WINDOW (login_window), "computer");
 }
 
 static void

Modified: trunk/gui/simple-greeter/test-remote-login-window.c
==============================================================================
--- trunk/gui/simple-greeter/test-remote-login-window.c	(original)
+++ trunk/gui/simple-greeter/test-remote-login-window.c	Tue Feb 19 21:28:26 2008
@@ -48,7 +48,7 @@
         textdomain (GETTEXT_PACKAGE);
 
         std_out = NULL;
-        g_spawn_command_line_sync (LIBEXECDIR "/gdm-simple-chooser",
+        g_spawn_command_line_sync (LIBEXECDIR "/gdm-host-chooser",
                                    &std_out,
                                    NULL, NULL, NULL);
         if (std_out == NULL) {