Merge lp:~fboucault/unity-2d/dconf_migration_favorites into lp:unity-2d/3.0

[Florian Boucault]

[launcher] Migrated GConf key /desktop/unity-2d/launcher/favorites to dconf

[lp:~fboucault/unity-2d/dconf_migration_favorites]

636. By Florian Boucault on 2011-07-23

Removed useless include.

[Didier Roche-Tolomelli (didrocks)]

Looks good, compile fine and even works well!

Just for my curiousity, you are calling blockSignals() for blocking gsettings/dconf signals on writing new values. However, I couldn't find that you are listening to them on the same file at all. (picking/reloading on value changing). Is this a leftover or just to prepare it in case you change it to listen at some later point?

Just a note:
we should at some point adds the dconf-qt build-dep in debian/control, but that will be just one branch, I can push it

All looks good, approved!

review: Approve

[Florian Boucault (fboucault)]

Thanks for the review Didier!

"Is this a leftover or just to prepare it in case you change it to listen at some later point?"

It is a leftover and I was unsure of it so I left it.

"we should at some point adds the dconf-qt build-dep in debian/control, but that will be just one branch, I can push it"

We did that already in the previous merge request :) (otherwise it would have broken the daily build)

=== modified file 'data/unity-2d.convert'
--- data/unity-2d.convert	2011-07-14 14:36:53 +0000
+++ data/unity-2d.convert	2011-07-23 12:49:28 +0000
@@ -1,2 +1,5 @@
 [com.canonical.Unity2d.Launcher]
 super-key-enable = /desktop/unity-2d/launcher/super_key_enable
+
+[com.canonical.Unity.Launcher]
+favorites = /desktop/unity-2d/launcher/favorites

=== modified file 'debian/20_unity-2d-gconf-default'
--- debian/20_unity-2d-gconf-default	2011-07-22 14:42:56 +0000
+++ debian/20_unity-2d-gconf-default	2011-07-23 12:49:28 +0000
@@ -1,6 +1,5 @@
 /apps/gnome-power-manager/lock/use_screensaver_settings true
 /apps/gnome-power-manager/general/use_time_for_policy false
-/desktop/unity-2d/launcher/favorites [ubiquity-gtkui.desktop,nautilus-home.desktop,firefox.desktop,libreoffice-writer.desktop,libreoffice-calc.desktop,libreoffice-impress.desktop,ubuntu-software-center.desktop,ubuntuone-control-panel-gtk.desktop]
 /desktop/unity-2d/launcher/hide_mode 2
 /desktop/unity-2d/launcher/use_strut false
 /desktop/gnome/applications/window_manager/default /usr/bin/metacity

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-22 14:44:57 +0000
+++ debian/changelog	2011-07-23 12:49:28 +0000
@@ -9,8 +9,10 @@
     - install GConf to GSettings conversion into usr/share/GConf/gsettings
   * debian/gconf/schemas/unity-2d.schemas:
     - remove GConf schema for /desktop/unity-2d/launcher/super_key_enable
+    - remove GConf schema for /desktop/unity-2d/launcher/favorites
   * debian/20_unity-2d-gconf-default:
     - remove default value for /desktop/unity-2d/launcher/super_key_enable
+    - remove default value for /desktop/unity-2d/launcher/favorites
   * debian/control:
     - add dependency on libdconf-qt-dev
 
@@ -19,7 +21,7 @@
   * Install the apport hook in the right directory so that it's not launched
     unconditionally (LP: #712343)
 
- -- Florian Boucault <[e-mail]>  Fri, 22 Jul 2011 16:44:37 +0200
+ -- Florian Boucault <[e-mail]>  Fri, 22 Jul 2011 18:56:33 +0200
 
 unity-2d (3.8.10-0ubuntu1) natty; urgency=low
 

=== modified file 'debian/gconf/schemas/unity-2d.schemas'
--- debian/gconf/schemas/unity-2d.schemas	2011-07-14 14:36:53 +0000
+++ debian/gconf/schemas/unity-2d.schemas	2011-07-23 12:49:28 +0000
@@ -1,19 +1,6 @@
 <gconfschemafile>
 <schemalist>
 	<schema>
-		<key>/schemas/desktop/unity-2d/launcher/favorites</key>
-		<applyto>/desktop/unity-2d/launcher/favorites</applyto>
-		<owner>unity-2d</owner>
-		<type>list</type>
-		<list_type>string</list_type>
-		<default>[ubiquity-gtkui.desktop,nautilus-home.desktop,firefox.desktop,libreoffice-writer.desktop,libreoffice-calc.desktop,libreoffice-impress.desktop,ubuntu-software-center.desktop,ubuntuone-control-panel-gtk.desktop]</default>
-		<locale name="C">
-		   <short>Favorite applications</short>
-		   <long>List of desktop files of applications that have been marked as favorites by the user in the launcher</long>
-		</locale>
-	</schema>
-
-	<schema>
 		<key>/schemas/desktop/unity-2d/launcher/hide_mode</key>
 		<applyto>/desktop/unity-2d/launcher/hide_mode</applyto>
 		<owner>unity-2d</owner>

=== modified file 'libunity-2d-private/Unity2d/CMakeLists.txt'
--- libunity-2d-private/Unity2d/CMakeLists.txt	2011-06-22 08:54:52 +0000
+++ libunity-2d-private/Unity2d/CMakeLists.txt	2011-07-23 12:49:28 +0000
@@ -9,6 +9,7 @@
 pkg_check_modules(GIO REQUIRED gio-2.0)
 pkg_check_modules(STARTUPNOTIFICATION REQUIRED libstartup-notification-1.0)
 pkg_check_modules(INDICATOR REQUIRED indicator)
+pkg_check_modules(DCONFQT REQUIRED dconf-qt)
 
 find_package(X11 REQUIRED)
 
@@ -100,6 +101,7 @@
     ${STARTUPNOTIFICATION_INCLUDE_DIRS}
     ${INDICATOR_INCLUDE_DIRS}
     ${X11_INCLUDE_DIR}
+    ${DCONFQT_INCLUDE_DIRS}
     ${libunity-2d-private_SOURCE_DIR}/src
     )
 
@@ -119,6 +121,7 @@
     ${GIO_LDFLAGS}
     ${STARTUPNOTIFICATION_LDFLAGS}
     ${INDICATOR_LDFLAGS}
+    ${DCONFQT_LDFLAGS}
     ${X11_Xcomposite_LIB}
     unity-2d-private
     )

=== modified file 'libunity-2d-private/Unity2d/launcherapplicationslist.cpp'
--- libunity-2d-private/Unity2d/launcherapplicationslist.cpp	2011-07-13 16:04:50 +0000
+++ libunity-2d-private/Unity2d/launcherapplicationslist.cpp	2011-07-23 12:49:28 +0000
@@ -23,6 +23,9 @@
 #include "bamf-application.h"
 #include "gconfitem-qml-wrapper.h"
 
+// libdconf-qt
+#include "qconf.h"
+
 // unity-2d
 #include <debug_p.h>
 
@@ -40,7 +43,8 @@
 }
 
 
-#define FAVORITES_KEY QString("/desktop/unity-2d/launcher/favorites")
+#define LAUNCHER_DCONF_SCHEMA QString("com.canonical.Unity.Launcher")
+#define LAUNCHER_DCONF_PATH QString("/desktop/unity/launcher")
 #define DBUS_SERVICE_UNITY "com.canonical.Unity"
 #define DBUS_SERVICE_LAUNCHER_ENTRY "com.canonical.Unity.LauncherEntry"
 #define DBUS_SERVICE_LAUNCHER "com.canonical.Unity.Launcher"
@@ -52,8 +56,7 @@
 LauncherApplicationsList::LauncherApplicationsList(QObject *parent) :
     QAbstractListModel(parent)
 {
-    m_favorites_list = new GConfItemQmlWrapper();
-    m_favorites_list->setKey(FAVORITES_KEY);
+    m_dconf_launcher = new QConf(LAUNCHER_DCONF_SCHEMA);
 
     QDBusConnection session = QDBusConnection::sessionBus();
     /* FIXME: libunity will send out the Update signal for LauncherEntries
@@ -171,7 +174,7 @@
     sn_display_unref(m_snDisplay);
 
     qDeleteAll(m_applications);
-    delete m_favorites_list;
+    delete m_dconf_launcher;
 }
 
 QString
@@ -366,9 +369,8 @@
 LauncherApplicationsList::load()
 {
     /* Insert favorites */
-    /* FIXME: migrate to GSettings, like unity. */
     QString desktop_file;
-    QStringList favorites = m_favorites_list->getValue().toStringList();
+    QStringList favorites = m_dconf_launcher->property("favorites").toStringList();
 
     Q_FOREACH(QString favorite, favorites) {
        insertFavoriteApplication(favorite);
@@ -453,9 +455,9 @@
         }
     }
 
-    m_favorites_list->blockSignals(true);
-    m_favorites_list->setValue(QVariant(favorites));
-    m_favorites_list->blockSignals(false);
+    m_dconf_launcher->blockSignals(true);
+    m_dconf_launcher->setProperty("favorites", QVariant(favorites));
+    m_dconf_launcher->blockSignals(false);
 }
 
 int

=== modified file 'libunity-2d-private/Unity2d/launcherapplicationslist.h'
--- libunity-2d-private/Unity2d/launcherapplicationslist.h	2011-07-13 16:04:50 +0000
+++ libunity-2d-private/Unity2d/launcherapplicationslist.h	2011-07-23 12:49:28 +0000
@@ -37,6 +37,7 @@
 class BamfApplication;
 class BamfView;
 class GConfItemQmlWrapper;
+class QConf;
 
 class LauncherApplicationsList : public QAbstractListModel, protected AbstractX11EventFilter, protected QDBusContext
 {
@@ -88,7 +89,7 @@
        displayed (m_applications).
     */
     QHash<QString, LauncherApplication*> m_applicationForExecutable;
-    GConfItemQmlWrapper* m_favorites_list;
+    QConf* m_dconf_launcher;
 
     /* Startup notification support */
     SnDisplay *m_snDisplay;

=== modified file 'libunity-2d-private/Unity2d/workspacesinfo.cpp'
--- libunity-2d-private/Unity2d/workspacesinfo.cpp	2011-06-27 13:43:05 +0000
+++ libunity-2d-private/Unity2d/workspacesinfo.cpp	2011-07-23 12:49:28 +0000
@@ -9,8 +9,6 @@
 #include <libwnck/workspace.h>
 }
 
-#include "gconfitem-qml-wrapper.h"
-
 #include <QAbstractEventDispatcher>
 #include <QX11Info>