GNOME.org
 

[gnome-color-manager] Remove the GSettings schema as it's all moved to gnome-settings-daemon

commit 07e79147c7f2c17092cf7a87c4789cba1e8192ae
Author: Richard Hughes <richard hughsie com>
Date:   Sat May 21 14:48:16 2011 +0100

    Remove the GSettings schema as it's all moved to gnome-settings-daemon

 data/.gitignore                              |    6 ---
 data/Makefile.am                             |    7 ----
 data/org.gnome.color-manager.gschema.migrate |    3 --
 data/org.gnome.color-manager.gschema.xml     |   15 --------
 src/gcm-calibrate.c                          |   32 ++++--------------
 src/gcm-prefs.c                              |    6 ---
 src/gcm-session.c                            |   45 --------------------------
 src/gcm-utils.h                              |    3 --
 src/gcm-viewer.c                             |    6 ---
 src/org.gnome.ColorManager.xml               |   11 ------
 10 files changed, 7 insertions(+), 127 deletions(-)
---
diff --git a/data/.gitignore b/data/.gitignore
index d183873..ac164a4 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1,10 +1,4 @@
 Makefile
 Makefile.in
-*.schemas
 *.desktop
-*.glade.bak
-*.gladep
-*.gladep.bak
-*.valid
 org.gnome.ColorManager.service
-
diff --git a/data/Makefile.am b/data/Makefile.am
index d5253a0..f1d6f62 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,9 +4,6 @@ SUBDIRS = 						\
 	figures						\
 	icons
 
-migrationdir = $(datadir)/GConf/gsettings
-dist_migration_DATA = org.gnome.color-manager.gschema.migrate
-
 @INTLTOOL_DESKTOP_RULE@
 desktopdir = $(datadir)/applications
 desktop_in_files =					\
@@ -28,10 +25,6 @@ service_DATA     = $(service_in_files:.service.in=.service)
 $(service_DATA): $(service_in_files) Makefile
 	@sed -e "s|\ servicedir\@|$(bindir)|" $< > $@
 
- GSETTINGS_RULES@
-gsettings_SCHEMAS =					\
-	org.gnome.color-manager.gschema.xml
-
 pkgdata_DATA =						\
 	gcm-calibrate.ui				\
 	gcm-spawn.ui					\
diff --git a/src/gcm-calibrate.c b/src/gcm-calibrate.c
index 4b4dfcf..bb033dd 100644
--- a/src/gcm-calibrate.c
+++ b/src/gcm-calibrate.c
@@ -69,7 +69,6 @@ struct _GcmCalibratePrivate
 	gchar				*serial;
 	gchar				*device;
 	gchar				*working_path;
-	GSettings			*settings;
 };
 
 enum {
@@ -631,14 +630,7 @@ gcm_calibrate_display (GcmCalibrate *calibrate, GtkWindow *window, GError **erro
 	}
 
 	/* get default precision */
-	priv->precision = g_settings_get_enum (priv->settings, GCM_SETTINGS_CALIBRATION_LENGTH);
-	if (priv->precision == GCM_CALIBRATE_PRECISION_UNKNOWN) {
-		priv->precision = gcm_calibrate_get_precision (calibrate, error);
-		if (priv->precision == GCM_CALIBRATE_PRECISION_UNKNOWN) {
-			ret = FALSE;
-			goto out;
-		}
-	}
+	priv->precision = gcm_calibrate_get_precision (calibrate, error);
 
 	/* show a warning for external monitors */
 	ret = gcm_utils_output_is_lcd_internal (priv->output_name);
@@ -947,13 +939,10 @@ gcm_calibrate_printer (GcmCalibrate *calibrate, GtkWindow *window, GError **erro
 	}
 
 	/* get default precision */
-	priv->precision = g_settings_get_enum (priv->settings, GCM_SETTINGS_CALIBRATION_LENGTH);
+	priv->precision = gcm_calibrate_get_precision (calibrate, error);
 	if (priv->precision == GCM_CALIBRATE_PRECISION_UNKNOWN) {
-		priv->precision = gcm_calibrate_get_precision (calibrate, error);
-		if (priv->precision == GCM_CALIBRATE_PRECISION_UNKNOWN) {
-			ret = FALSE;
-			goto out;
-		}
+		ret = FALSE;
+		goto out;
 	}
 
 	/* copy */
@@ -1116,13 +1105,10 @@ gcm_calibrate_device (GcmCalibrate *calibrate, GtkWindow *window, GError **error
 	g_object_get (priv->calibrate_dialog, "reference-kind", &priv->reference_kind, NULL);
 
 	/* get default precision */
-	priv->precision = g_settings_get_enum (priv->settings, GCM_SETTINGS_CALIBRATION_LENGTH);
+	priv->precision = gcm_calibrate_get_precision (calibrate, error);
 	if (priv->precision == GCM_CALIBRATE_PRECISION_UNKNOWN) {
-		priv->precision = gcm_calibrate_get_precision (calibrate, error);
-		if (priv->precision == GCM_CALIBRATE_PRECISION_UNKNOWN) {
-			ret = FALSE;
-			goto out;
-		}
+		ret = FALSE;
+		goto out;
 	}
 
 	/* get scanned image */
@@ -1534,9 +1520,6 @@ gcm_calibrate_init (GcmCalibrate *calibrate)
 
 	// FIXME: this has to be per-run specific
 	calibrate->priv->working_path = g_strdup ("/tmp");
-
-	/* use GSettings to get defaults */
-	calibrate->priv->settings = g_settings_new (GCM_SETTINGS_SCHEMA);
 }
 
 /**
@@ -1561,7 +1544,6 @@ gcm_calibrate_finalize (GObject *object)
 	g_free (priv->working_path);
 	cd_color_xyz_free (priv->xyz);
 	g_object_unref (priv->calibrate_dialog);
-	g_object_unref (priv->settings);
 
 	G_OBJECT_CLASS (gcm_calibrate_parent_class)->finalize (object);
 }
diff --git a/src/gcm-prefs.c b/src/gcm-prefs.c
index 00ab215..f1fcffe 100644
--- a/src/gcm-prefs.c
+++ b/src/gcm-prefs.c
@@ -44,7 +44,6 @@ typedef struct {
 	CdSensor		*sensor;
 	gboolean		 setting_up_device;
 	GCancellable		*cancellable;
-	GSettings		*settings;
 	GtkApplication		*application;
 	GtkBuilder		*builder;
 	GtkListStore		*list_store_devices;
@@ -2384,9 +2383,6 @@ gcm_viewer_startup_cb (GApplication *application, GcmPrefsPriv *prefs)
 
 	prefs->cancellable = g_cancellable_new ();
 
-	/* setup defaults */
-	prefs->settings = g_settings_new (GCM_SETTINGS_SCHEMA);
-
 	/* get UI */
 	prefs->builder = gtk_builder_new ();
 	gtk_builder_set_translation_domain (prefs->builder, GETTEXT_PACKAGE);
@@ -2726,8 +2722,6 @@ main (int argc, char **argv)
 		g_object_unref (prefs->current_device);
 	if (prefs->sensor != NULL)
 		g_object_unref (prefs->sensor);
-	if (prefs->settings != NULL)
-		g_object_unref (prefs->settings);
 	if (prefs->builder != NULL)
 		g_object_unref (prefs->builder);
 	if (prefs->client != NULL)
diff --git a/src/gcm-session.c b/src/gcm-session.c
index 29c3412..a40c9bc 100644
--- a/src/gcm-session.c
+++ b/src/gcm-session.c
@@ -45,7 +45,6 @@ typedef struct {
 	GDBusConnection	*connection;
 	GDBusNodeInfo	*introspection;
 	GMainLoop	*loop;
-	GSettings	*settings;
 	guint		 watcher_id;
 } GcmSessionPrivate;
 
@@ -944,44 +943,6 @@ gcm_session_on_name_lost (GDBusConnection *connection,
 }
 
 /**
- * gcm_session_emit_changed:
- **/
-static void
-gcm_session_emit_changed (GcmSessionPrivate *priv)
-{
-	gboolean ret;
-	GError *error = NULL;
-
-	/* check we are connected */
-	if (priv->connection == NULL)
-		return;
-
-	/* just emit signal */
-	ret = g_dbus_connection_emit_signal (priv->connection,
-					     NULL,
-					     GCM_DBUS_PATH,
-					     GCM_DBUS_INTERFACE,
-					     "Changed",
-					     NULL,
-					     &error);
-	if (!ret) {
-		g_warning ("failed to emit signal: %s", error->message);
-		g_error_free (error);
-	}
-}
-
-/**
- * gcm_session_key_changed_cb:
- **/
-static void
-gcm_session_key_changed_cb (GSettings *settings,
-			    const gchar *key,
-			    GcmSessionPrivate *priv)
-{
-	gcm_session_emit_changed (priv);
-}
-
-/**
  * gcm_session_get_precooked_md5:
  **/
 static gchar *
@@ -1504,11 +1465,6 @@ main (int argc, char *argv[])
 
 	priv = g_new0 (GcmSessionPrivate, 1);
 
-	/* get the settings */
-	priv->settings = g_settings_new (GCM_SETTINGS_SCHEMA);
-	g_signal_connect (priv->settings, "changed",
-			  G_CALLBACK (gcm_session_key_changed_cb), priv);
-
 	/* use DMI data for internal panels */
 	priv->dmi = gcm_dmi_new ();
 
@@ -1595,7 +1551,6 @@ out:
 		if (priv->x11_screen != NULL)
 			g_object_unref (priv->x11_screen);
 		g_dbus_node_info_unref (priv->introspection);
-		g_object_unref (priv->settings);
 		g_object_unref (priv->client);
 		g_main_loop_unref (priv->loop);
 		g_free (priv);
diff --git a/src/gcm-utils.h b/src/gcm-utils.h
index 10076a5..9f678e5 100644
--- a/src/gcm-utils.h
+++ b/src/gcm-utils.h
@@ -32,9 +32,6 @@
 #define GCM_DBUS_INTERFACE				"org.gnome.ColorManager"
 #define GCM_DBUS_PATH					"/org/gnome/ColorManager"
 
-#define GCM_SETTINGS_SCHEMA				"org.gnome.color-manager"
-#define GCM_SETTINGS_CALIBRATION_LENGTH			"calibration-length"
-
 /* DISTROS: you will have to patch if you have changed the name of these packages */
 #define GCM_PREFS_PACKAGE_NAME_SHARED_COLOR_TARGETS	"shared-color-targets"
 #define GCM_PREFS_PACKAGE_NAME_ARGYLLCMS		"argyllcms"
diff --git a/src/gcm-viewer.c b/src/gcm-viewer.c
index b161abe..340bf94 100644
--- a/src/gcm-viewer.c
+++ b/src/gcm-viewer.c
@@ -59,7 +59,6 @@ typedef struct {
 	GtkWidget	*vcgt_widget;
 	GtkWidget	*preview_widget_input;
 	GtkWidget	*preview_widget_output;
-	GSettings	*settings;
 	guint		 example_index;
 	gchar		*profile_id;
 	guint		 xid;
@@ -1208,9 +1207,6 @@ gcm_viewer_startup_cb (GApplication *application, GcmViewerPrivate *viewer)
 	GtkWidget *main_window;
 	GtkWidget *widget;
 
-	/* setup defaults */
-	viewer->settings = g_settings_new (GCM_SETTINGS_SCHEMA);
-
 	/* get UI */
 	viewer->builder = gtk_builder_new ();
 	retval = gtk_builder_add_from_file (viewer->builder,
@@ -1513,8 +1509,6 @@ main (int argc, char **argv)
 	status = g_application_run (G_APPLICATION (viewer->application), argc, argv);
 
 	g_object_unref (viewer->application);
-	if (viewer->settings != NULL)
-		g_object_unref (viewer->settings);
 	if (viewer->builder != NULL)
 		g_object_unref (viewer->builder);
 	if (viewer->client != NULL)
diff --git a/src/org.gnome.ColorManager.xml b/src/org.gnome.ColorManager.xml
index 606996a..68c6994 100644
--- a/src/org.gnome.ColorManager.xml
+++ b/src/org.gnome.ColorManager.xml
@@ -122,17 +122,6 @@
       </arg>
     </method>
 
-    <!-- ************************************************************ -->
-    <signal name='Changed'>
-      <doc:doc>
-        <doc:description>
-          <doc:para>
-            Some value on the interface or the number of devices has changed.
-          </doc:para>
-        </doc:description>
-      </doc:doc>
-    </signal>
-
   </interface>
 </node>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]