Use assertions for criticals everywhere for unstable builds.

2007-10-26  William Jon McCann  <mccann@jhu.edu>

	* common/gdm-common.c: (gdm_set_fatal_warnings_if_unstable):
	* common/gdm-common.h:
	* daemon/factory-slave-main.c: (main):
	* daemon/main.c: (main):
	* daemon/product-slave-main.c: (main):
	* daemon/simple-slave-main.c: (main):
	* gui/simple-greeter/greeter-main.c: (main):
	Use assertions for criticals everywhere for unstable
	builds.


svn path=/trunk/; revision=5427

8 files changed, 45 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 9d35b54a..06ef2266 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2007-10-26  William Jon McCann  <mccann@jhu.edu>
 
+	* common/gdm-common.c: (gdm_set_fatal_warnings_if_unstable):
+	* common/gdm-common.h:
+	* daemon/factory-slave-main.c: (main):
+	* daemon/main.c: (main):
+	* daemon/product-slave-main.c: (main):
+	* daemon/simple-slave-main.c: (main):
+	* gui/simple-greeter/greeter-main.c: (main):
+	Use assertions for criticals everywhere for unstable
+	builds.
+
+2007-10-26  William Jon McCann  <mccann@jhu.edu>
+
 	* gui/simple-greeter/gdm-greeter-login-window.c: (switch_mode):
 	Hide shutdown/restart/suspend buttons on remote displays.
 	Can't see ever allowing this.
diff --git a/common/gdm-common.c b/common/gdm-common.c
index 3bb6de88..59545039 100644
--- a/common/gdm-common.c
+++ b/common/gdm-common.c
@@ -34,6 +34,23 @@
 #include "gdm-common.h"
 #include "gdm-md5.h"
 
+void
+gdm_set_fatal_warnings_if_unstable (void)
+{
+        char **versions;
+
+        versions = g_strsplit (VERSION, ".", 3);
+        if (versions && versions [0] && versions [1]) {
+                int major;
+                major = atoi (versions [1]);
+                if ((major % 2) != 0) {
+                        g_setenv ("G_DEBUG", "fatal_criticals", FALSE);
+                        g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
+                }
+        }
+        g_strfreev (versions);
+}
+
 int
 gdm_signal_pid (int pid,
                 int signal)
diff --git a/common/gdm-common.h b/common/gdm-common.h
index 0628e1ea..36d2407e 100644
--- a/common/gdm-common.h
+++ b/common/gdm-common.h
@@ -27,6 +27,8 @@
 
 G_BEGIN_DECLS
 
+void           gdm_set_fatal_warnings_if_unstable (void);
+
 int            gdm_signal_pid            (int pid,
                                           int signal);
 
diff --git a/daemon/factory-slave-main.c b/daemon/factory-slave-main.c
index f798ed52..986e568c 100644
--- a/daemon/factory-slave-main.c
+++ b/daemon/factory-slave-main.c
@@ -41,6 +41,7 @@
 
 #include "gdm-signal-handler.h"
 #include "gdm-log.h"
+#include "gdm-common.h"
 #include "gdm-factory-slave.h"
 
 static int gdm_return_code = 0;
@@ -160,6 +161,8 @@ main (int    argc,
         textdomain (GETTEXT_PACKAGE);
         setlocale (LC_ALL, "");
 
+        gdm_set_fatal_warnings_if_unstable ();
+
         g_type_init ();
 
         context = g_option_context_new (_("GNOME Display Manager Slave"));
diff --git a/daemon/main.c b/daemon/main.c
index bbc61e1e..d44d4303 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -44,6 +44,7 @@
 
 #include "gdm-manager.h"
 #include "gdm-log.h"
+#include "gdm-common.h"
 #include "gdm-signal-handler.h"
 
 #include "gdm-settings.h"
@@ -541,6 +542,8 @@ main (int    argc,
 
         ret = 1;
 
+        gdm_set_fatal_warnings_if_unstable ();
+
         g_type_init ();
 
         context = g_option_context_new (_("GNOME Display Manager"));
diff --git a/daemon/product-slave-main.c b/daemon/product-slave-main.c
index 4f5a0651..b079587c 100644
--- a/daemon/product-slave-main.c
+++ b/daemon/product-slave-main.c
@@ -41,6 +41,7 @@
 
 #include "gdm-signal-handler.h"
 #include "gdm-log.h"
+#include "gdm-common.h"
 #include "gdm-product-slave.h"
 
 static int gdm_return_code = 0;
@@ -160,6 +161,8 @@ main (int    argc,
         textdomain (GETTEXT_PACKAGE);
         setlocale (LC_ALL, "");
 
+        gdm_set_fatal_warnings_if_unstable ();
+
         g_type_init ();
 
         context = g_option_context_new (_("GNOME Display Manager Slave"));
diff --git a/daemon/simple-slave-main.c b/daemon/simple-slave-main.c
index f020be42..ffd7dcd7 100644
--- a/daemon/simple-slave-main.c
+++ b/daemon/simple-slave-main.c
@@ -41,6 +41,7 @@
 
 #include "gdm-signal-handler.h"
 #include "gdm-log.h"
+#include "gdm-common.h"
 #include "gdm-simple-slave.h"
 
 static int gdm_return_code = 0;
@@ -160,6 +161,8 @@ main (int    argc,
         textdomain (GETTEXT_PACKAGE);
         setlocale (LC_ALL, "");
 
+        gdm_set_fatal_warnings_if_unstable ();
+
         g_type_init ();
 
         context = g_option_context_new (_("GNOME Display Manager Slave"));
diff --git a/gui/simple-greeter/greeter-main.c b/gui/simple-greeter/greeter-main.c
index 91b11db1..dc9891e9 100644
--- a/gui/simple-greeter/greeter-main.c
+++ b/gui/simple-greeter/greeter-main.c
@@ -32,6 +32,7 @@
 #include <gconf/gconf-client.h>
 
 #include "gdm-log.h"
+#include "gdm-common.h"
 #include "gdm-settings-client.h"
 #include "gdm-settings-keys.h"
 
@@ -41,23 +42,6 @@
 
 static Atom AT_SPI_IOR;
 
-static void
-set_fatal_warnings (void)
-{
-        char **versions;
-
-        versions = g_strsplit (VERSION, ".", 3);
-        if (versions && versions [0] && versions [1]) {
-                int major;
-                major = atoi (versions [1]);
-                if ((major % 2) != 0) {
-                        g_setenv ("G_DEBUG", "fatal_criticals", FALSE);
-                        g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
-                }
-        }
-        g_strfreev (versions);
-}
-
 static gboolean
 assistive_registry_launch (void)
 {
@@ -226,7 +210,7 @@ main (int argc, char *argv[])
 
         setlocale (LC_ALL, "");
 
-        set_fatal_warnings ();
+        gdm_set_fatal_warnings_if_unstable ();
 
         g_type_init ();