[gnome-panel/wip/3.0-freeze-break] panel: Port launchers to GSettings

[Vincent Untz <vuntz src gnome org>]

commit e5800d532fd2fa8b099a2dd71b5b59e58f1b2e81
Author: Vincent Untz <vuntz gnome org>
Date:   Fri Mar 25 22:28:38 2011 +0100

    panel: Port launchers to GSettings

 data/org.gnome.gnome-panel.launcher.gschema.xml |    2 +-
 gnome-panel/launcher.c                          |   78 +++++++++++-----------
 gnome-panel/panel-schemas.h                     |    5 +-
 3 files changed, 44 insertions(+), 41 deletions(-)
---
diff --git a/data/org.gnome.gnome-panel.launcher.gschema.xml b/data/org.gnome.gnome-panel.launcher.gschema.xml
index 906eff9..9a705dc 100644
--- a/data/org.gnome.gnome-panel.launcher.gschema.xml
+++ b/data/org.gnome.gnome-panel.launcher.gschema.xml
@@ -1,6 +1,6 @@
 <schemalist gettext-domain="gnome-panel-3.0">
   <schema id="org.gnome.gnome-panel.launcher">
-    <key name="launcher-location" type="s">
+    <key name="location" type="s">
       <default>''</default>
       <summary>Launcher location</summary>
       <description>The location of the .desktop file describing the launcher. This key is only relevant if the object_type key is "launcher-object".</description>
diff --git a/gnome-panel/launcher.c b/gnome-panel/launcher.c
index 5598e74..9c22d42 100644
--- a/gnome-panel/launcher.c
+++ b/gnome-panel/launcher.c
@@ -32,16 +32,16 @@
 
 #include "button-widget.h"
 #include "panel-util.h"
-#include "panel-gconf.h"
-#include "panel-profile.h"
 #include "xstuff.h"
 #include "panel-toplevel.h"
 #include "panel-a11y.h"
 #include "panel-globals.h"
 #include "panel-multiscreen.h"
+#include "panel-layout.h"
 #include "panel-lockdown.h"
 #include "panel-ditem-editor.h"
 #include "panel-icon-names.h"
+#include "panel-schemas.h"
 
 static GdkScreen *
 launcher_get_screen (Launcher *launcher)
@@ -679,22 +679,19 @@ static void
 launcher_saved (GtkWidget *dialog,
 		Launcher  *launcher)
 {
-	const char  *uri;
-	GConfClient *client;
-	const char  *key;
+	const char *uri;
 
 	uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));
 	if (panel_launcher_get_filename (uri) != NULL)
 		uri = panel_launcher_get_filename (uri);
 
 	if (uri && launcher->location && strcmp (uri, launcher->location)) {
-		client = panel_gconf_get_client ();
-
-		key = panel_gconf_full_key (PANEL_GCONF_OBJECTS,
-					    launcher->info->id,
-					    "launcher_location");
+		GSettings *settings;
 
-		gconf_client_set_string (client, key, uri, NULL);
+		settings = panel_layout_get_instance_settings (launcher->info->settings,
+							       PANEL_LAUNCHER_SCHEMA);
+		g_settings_set_string (settings, PANEL_LOCATION_KEY, uri);
+		g_object_unref (settings);
 
 		if (launcher->location)
 			g_free (launcher->location);
@@ -813,22 +810,23 @@ launcher_load (PanelWidget *panel_widget,
 	       const char  *id,
 	       GSettings   *settings)
 {
-	GConfClient *client;
-	Launcher    *launcher;
-	const char  *key;
-	char        *launcher_location;
+	GSettings *settings_instance;
+	Launcher  *launcher;
+	char      *launcher_location;
 
 	g_return_if_fail (panel_widget != NULL);
 	g_return_if_fail (id != NULL);
 
-	client  = panel_gconf_get_client ();
+	settings_instance = panel_layout_get_instance_settings (settings,
+								PANEL_LAUNCHER_SCHEMA);
 
-	key = panel_gconf_full_key (PANEL_GCONF_OBJECTS, id, "launcher_location");
-	launcher_location = gconf_client_get_string (client, key, NULL);
+	launcher_location = g_settings_get_string (settings_instance,
+						   PANEL_LOCATION_KEY);
 
-	if (!launcher_location) {
-		g_printerr (_("Key %s is not set, cannot load launcher\n"),
-			    key);
+	if (PANEL_GLIB_STR_EMPTY (launcher_location)) {
+		g_printerr (_("Launcher location is not set, cannot load launcher\n"));
+		g_free (launcher_location);
+		g_object_unref (settings_instance);
 		return;
 	}
 
@@ -837,8 +835,8 @@ launcher_load (PanelWidget *panel_widget,
 					 id, settings);
 
 	if (launcher) {
-		key = panel_gconf_full_key (PANEL_GCONF_OBJECTS, id, "launcher_location");
-		if (!gconf_client_key_is_writable (client, key, NULL)) {
+		if (!g_settings_is_writable (settings_instance,
+					     PANEL_LOCATION_KEY)) {
 			AppletUserMenu *menu;
 
 			menu = panel_applet_get_callback (launcher->info->user_menu,
@@ -849,6 +847,7 @@ launcher_load (PanelWidget *panel_widget,
 	}
 
 	g_free (launcher_location);
+	g_object_unref (settings_instance);
 }
 
 static void
@@ -962,20 +961,18 @@ panel_launcher_create_with_id (const char    *toplevel_id,
 			       int            position,
 			       const char    *location)
 {
-	GConfClient *client;
-	const char  *key;
-	char        *id;
-	char        *no_uri;
-	const char  *new_location;
+	char       *id;
+	GSettings  *settings;
+	GSettings  *settings_instance;
+	char       *no_uri;
+	const char *new_location;
 
 	g_return_if_fail (location != NULL);
 
-	client = panel_gconf_get_client ();
-
-	id = panel_profile_prepare_object_with_id (PANEL_OBJECT_LAUNCHER,
-						   toplevel_id,
-						   position,
-						   FALSE);
+	id = panel_layout_object_create_start (PANEL_OBJECT_LAUNCHER,
+					       NULL,
+					       toplevel_id, position, FALSE,
+					       &settings);
 
 	no_uri = NULL;
 	/* if we have an URI, it might contain escaped characters (? : etc)
@@ -989,13 +986,16 @@ panel_launcher_create_with_id (const char    *toplevel_id,
 	if (new_location == NULL)
 		new_location = no_uri;
 
-	key = panel_gconf_full_key (PANEL_GCONF_OBJECTS,
-				    id,
-				    "launcher_location");
-	gconf_client_set_string (client, key, new_location, NULL);
+	settings_instance = panel_layout_get_instance_settings (settings,
+								PANEL_LAUNCHER_SCHEMA);
+
+	g_settings_set_string (settings_instance, PANEL_LOCATION_KEY,
+			       new_location);
 
-	panel_profile_add_to_list (PANEL_GCONF_OBJECTS, id);
+	panel_layout_object_create_finish (id);
 
+	g_object_unref (settings_instance);
+	g_object_unref (settings);
 	g_free (no_uri);
 	g_free (id);
 }
diff --git a/gnome-panel/panel-schemas.h b/gnome-panel/panel-schemas.h
index ae89c20..f0e45a7 100644
--- a/gnome-panel/panel-schemas.h
+++ b/gnome-panel/panel-schemas.h
@@ -29,7 +29,7 @@
 #define PANEL_LAYOUT_TOPLEVEL_DEFAULT_PREFIX "toplevel"
 #define PANEL_LAYOUT_OBJECT_PATH             "/org/gnome/gnome-panel/layout/objects/"
 #define PANEL_LAYOUT_OBJECT_DEFAULT_PREFIX   "object"
-#define PANEL_LAYOUT_OBJECT_CONFIG_SUFFIX    "/instance-config/"
+#define PANEL_LAYOUT_OBJECT_CONFIG_SUFFIX    "instance-config/"
 
 #define PANEL_TOPLEVEL_SCHEMA               "org.gnome.gnome-panel.toplevel"
 #define PANEL_TOPLEVEL_NAME_KEY             "name"
@@ -66,4 +66,7 @@
 #define PANEL_OBJECT_POSITION_KEY       "position"
 #define PANEL_OBJECT_PACK_END_KEY       "pack-end"
 
+#define PANEL_LAUNCHER_SCHEMA      "org.gnome.gnome-panel.launcher"
+#define PANEL_LOCATION_KEY         "location"
+
 #endif /* __PANEL_SCHEMAS_H__ */