Merge lp:~dobey/ubuntuone-client-gnome/migrate-launcher into lp:ubuntuone-client-gnome

[dobey]

Replace control-panel .desktop in unity favs with installer's .desktop

[Roman Yepishev (rye)]

Blocking on:

Didier Roche (didrocks) wrote 2 hours ago:

I guess that changing the gsettings key won't work. The unity launcher doesn't support pick update gsettings string and it can be overwritten then if you move or pin a new launcher icon.

review: Needs Information

Unmerged revisions

7. By dobey on 2011-10-03

Replace control-panel .desktop in unity favs with installer's .desktop

=== modified file 'gsd/gsd-ubuntuone.c'
--- gsd/gsd-ubuntuone.c	2011-09-23 15:31:01 +0000
+++ gsd/gsd-ubuntuone.c	2011-10-03 20:39:28 +0000
@@ -185,6 +185,23 @@
 gsd_ubuntuone_activate (GnomeSettingsPlugin *gsp_object)
 {
 	GsdUbuntuOne *plugin = GSD_UBUNTUONE (gsp_object);
+#ifdef HAVE_GSD_30
+        GSettings *settings;
+        gchar ** launchers;
+        int iter;
+
+        settings = g_settings_new ("com.canonical.Unity.Launcher");
+        launchers = g_settings_get_strv (settings, "favorites");
+        for (iter = 0; launchers[iter] != NULL; iter++) {
+                if (!g_strcmp0 (launchers[iter], "ubuntuone-control-panel-gtk.desktop")) {
+                        g_free (launchers[iter]);
+                        launchers[iter] = g_strdup ("ubuntuone-installer.desktop");
+                }
+        }
+        g_settings_set_strv (settings, "favorites", (const gchar * const *) launchers);
+        g_strfreev (launchers);
+        g_object_unref (settings);
+#endif
 
 	g_timeout_add (DELAYED_START_TIMEOUT, delayed_syncdaemon_start, plugin);
 }