[gdm/gnome-2-30] Add option to monitor changes



commit ce6760a68e0a54bcdfbca48e5c4d9c1986d8270e
Author: William Jon McCann <jmccann redhat com>
Date:   Tue Jun 8 15:12:53 2010 -0400

    Add option to monitor changes
    
    and exit by default on is-loaded.

 gui/simple-greeter/test-user-manager.c |   47 +++++++++++++++++++++++++++++---
 1 files changed, 43 insertions(+), 4 deletions(-)
---
diff --git a/gui/simple-greeter/test-user-manager.c b/gui/simple-greeter/test-user-manager.c
index 9891bb8..30c407b 100644
--- a/gui/simple-greeter/test-user-manager.c
+++ b/gui/simple-greeter/test-user-manager.c
@@ -34,6 +34,15 @@
 #include "gdm-settings-client.h"
 
 static GdmUserManager *manager = NULL;
+static GMainLoop      *main_loop = NULL;
+
+static gboolean     do_monitor       = FALSE;
+static gboolean     fatal_warnings   = FALSE;
+static GOptionEntry entries []   = {
+        { "fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &fatal_warnings, "Make all warnings fatal", NULL },
+        { "monitor", 0, 0, G_OPTION_ARG_NONE, &do_monitor, "Monitor changes", NULL },
+        { NULL }
+};
 
 static void
 on_is_loaded_changed (GdmUserManager *manager,
@@ -50,6 +59,9 @@ on_is_loaded_changed (GdmUserManager *manager,
                 users = g_slist_delete_link (users, users);
         }
 
+        if (! do_monitor) {
+                g_main_loop_quit (main_loop);
+        }
 }
 
 static void
@@ -71,8 +83,9 @@ on_user_removed (GdmUserManager *manager,
 int
 main (int argc, char *argv[])
 {
-
-	GMainLoop *loop;
+        GOptionContext *context;
+        GError         *error;
+        gboolean        res;
 
         bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
         bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -82,6 +95,29 @@ main (int argc, char *argv[])
 
         g_type_init ();
 
+        g_type_init ();
+
+        context = g_option_context_new (_("GNOME Display Manager"));
+        g_option_context_add_main_entries (context, entries, NULL);
+        g_option_context_set_ignore_unknown_options (context, TRUE);
+
+        error = NULL;
+        res = g_option_context_parse (context, &argc, &argv, &error);
+        g_option_context_free (context);
+        if (! res) {
+                g_warning ("%s", error->message);
+                g_error_free (error);
+                return 0;
+        }
+
+        if (fatal_warnings) {
+                GLogLevelFlags fatal_mask;
+
+                fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
+                fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
+                g_log_set_always_fatal (fatal_mask);
+        }
+
         if (! gdm_settings_client_init (GDMCONFDIR "/gdm.schemas", "/")) {
                 g_critical ("Unable to initialize settings client");
                 exit (1);
@@ -100,9 +136,12 @@ main (int argc, char *argv[])
                           "user-removed",
                           G_CALLBACK (on_user_removed),
                           NULL);
-        loop = g_main_loop_new (NULL, FALSE);
+        main_loop = g_main_loop_new (NULL, FALSE);
 
-        g_main_loop_run (loop);
+        g_main_loop_run (main_loop);
+        if (main_loop != NULL) {
+                g_main_loop_unref (main_loop);
+        }
 
         return 0;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]