[gnome-settings-daemon] common: Don't make test apps bail out if settings not installed



commit 80f3b72620ac1227b678ddc48b24707773dedbea
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Dec 17 12:21:23 2012 +0100

    common: Don't make test apps bail out if settings not installed

 plugins/common/test-plugin.h |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/plugins/common/test-plugin.h b/plugins/common/test-plugin.h
index b5a829e..b277a59 100644
--- a/plugins/common/test-plugin.h
+++ b/plugins/common/test-plugin.h
@@ -71,18 +71,17 @@ main (int argc, char **argv)
         }
 
 	if (has_settings () == FALSE) {
-		fprintf (stderr, "The schemas for plugin '%s' aren't available, check your installation.\n", SCHEMA_NAME);
-		exit (1);
+		fprintf (stderr, "The schemas for plugin '%s' isn't available, check your installation.\n", SCHEMA_NAME);
+	} else {
+		settings = g_settings_new ("org.gnome.settings-daemon.plugins." SCHEMA_NAME);
+		if (g_settings_get_boolean (settings, "active") != FALSE) {
+			fprintf (stderr, "Plugin '%s' is not disabled. You need to disable it before launching the test application.\n", SCHEMA_NAME);
+			print_enable_disable_help ();
+			exit (1);
+		}
+		print_enable_disable_help();
 	}
 
-        settings = g_settings_new ("org.gnome.settings-daemon.plugins." SCHEMA_NAME);
-        if (g_settings_get_boolean (settings, "active") != FALSE) {
-		fprintf (stderr, "Plugin '%s' is not disabled. You need to disable it before launching the test application.\n", SCHEMA_NAME);
-		print_enable_disable_help ();
-		exit (1);
-	}
-	print_enable_disable_help();
-
         manager = NEW ();
 
         error = NULL;



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