gdm r6056 - in trunk: . gui/simple-greeter

[mccann svn gnome org]

Author: mccann
Date: Mon Mar 24 04:37:06 2008
New Revision: 6056
URL: http://svn.gnome.org/viewvc/gdm?rev=6056&view=rev

Log:
2008-03-24  William Jon McCann  <jmccann redhat com>

	* gui/simple-greeter/gdm-greeter-login-window.c:
	(create_computer_info), (custom_widget_constructor), (load_theme):
	* gui/simple-greeter/gdm-greeter-session.c:
	(gdm_greeter_session_init):
	* gui/simple-greeter/greeter-main.c: (assistive_registry_launch),
	(assistive_registry_start), (at_set_gtk_modules):
	Add some more profile resolution.



Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-greeter-login-window.c
   trunk/gui/simple-greeter/gdm-greeter-session.c
   trunk/gui/simple-greeter/greeter-main.c

Modified: trunk/gui/simple-greeter/gdm-greeter-login-window.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-login-window.c	(original)
+++ trunk/gui/simple-greeter/gdm-greeter-login-window.c	Mon Mar 24 04:37:06 2008
@@ -1291,6 +1291,8 @@
 {
         GtkWidget *label;
 
+        gdm_profile_start (NULL);
+
         label = glade_xml_get_widget (login_window->priv->xml, "computer-info-name-label");
         if (label != NULL) {
                 gtk_label_set_text (GTK_LABEL (label), g_get_host_name ());
@@ -1303,6 +1305,8 @@
                 gtk_label_set_text (GTK_LABEL (label), version);
                 g_free (version);
         }
+
+        gdm_profile_end (NULL);
 }
 
 #define INVISIBLE_CHAR_DEFAULT       '*'
@@ -1327,12 +1331,16 @@
         g_assert (name != NULL);
         g_assert (GDM_IS_GREETER_LOGIN_WINDOW (login_window));
 
+        gdm_profile_start (NULL);
+
         widget = NULL;
 
         if (strcmp (name, "user-chooser") == 0) {
                widget = gdm_user_chooser_widget_new ();
         }
 
+        gdm_profile_end (NULL);
+
         return widget;
 }
 
@@ -1344,6 +1352,8 @@
         GtkWidget *box;
         GtkWidget *image;
 
+        gdm_profile_start (NULL);
+
         glade_set_custom_handler ((GladeXMLCustomWidgetHandler) custom_widget_constructor,
                                   login_window);
         login_window->priv->xml = glade_xml_new (GLADEDIR "/" GLADE_XML_FILE,
@@ -1430,6 +1440,8 @@
         g_signal_connect (box, "button-press-event", G_CALLBACK (on_computer_info_label_button_press), login_window);
 
         switch_mode (login_window, MODE_SELECTION);
+
+        gdm_profile_end (NULL);
 }
 
 static gboolean

Modified: trunk/gui/simple-greeter/gdm-greeter-session.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-session.c	(original)
+++ trunk/gui/simple-greeter/gdm-greeter-session.c	Mon Mar 24 04:37:06 2008
@@ -801,6 +801,7 @@
 static void
 gdm_greeter_session_init (GdmGreeterSession *session)
 {
+        gdm_profile_start (NULL);
 
         session->priv = GDM_GREETER_SESSION_GET_PRIVATE (session);
 
@@ -874,6 +875,8 @@
 
         /* FIXME: we should really do this in settings daemon */
         setup_at_tools (session);
+
+        gdm_profile_end (NULL);
 }
 
 static void

Modified: trunk/gui/simple-greeter/greeter-main.c
==============================================================================
--- trunk/gui/simple-greeter/greeter-main.c	(original)
+++ trunk/gui/simple-greeter/greeter-main.c	Mon Mar 24 04:37:06 2008
@@ -52,6 +52,11 @@
         const char *command;
         char      **argv;
         gboolean    res;
+        gboolean    ret;
+
+        ret = FALSE;
+
+        gdm_profile_start (NULL);
 
         command = AT_SPI_REGISTRYD_DIR "/at-spi-registryd";
 
@@ -60,7 +65,7 @@
         res = g_shell_parse_argv (command, NULL, &argv, &error);
         if (! res) {
                 g_warning ("Unable to parse command: %s", error->message);
-                return FALSE;
+                goto out;
         }
 
         error = NULL;
@@ -78,15 +83,19 @@
 
         if (! res) {
                 g_warning ("Unable to run command %s: %s", command, error->message);
-                return FALSE;
+                goto out;
         }
 
         if (kill (pid, 0) < 0) {
                 g_warning ("at-spi-registryd not running");
-                return FALSE;
+                goto out;
         }
 
-        return TRUE;
+        ret = TRUE;
+ out:
+        gdm_profile_end (NULL);
+
+        return ret;
 }
 
 static GdkFilterReturn
@@ -122,6 +131,8 @@
         GdkWindow *root;
         guint      tid;
 
+        gdm_profile_start (NULL);
+
         root = gdk_get_default_root_window ();
 
         if ( ! AT_SPI_IOR) {
@@ -142,6 +153,8 @@
 
         gdk_window_remove_filter (root, filter_watch, NULL);
         g_source_remove (tid);
+
+        gdm_profile_end (NULL);
 }
 
 static void
@@ -155,6 +168,8 @@
         gboolean    found_atk_bridge;
         int         n;
 
+        gdm_profile_start (NULL);
+
         n = 0;
         modules_list = NULL;
         found_gail = FALSE;
@@ -194,6 +209,8 @@
         g_setenv ("GTK_MODULES", g_strjoinv (":", modules), TRUE);
         g_strfreev (modules);
         g_slist_free (modules_list);
+
+        gdm_profile_end (NULL);
 }
 
 static void