Merge lp:~unity-team/unity/favorite-store-update into lp:unity

[Neil J. Patel]

- Makes the FavoritesStore GSettings implementation aware of /path/to/desktop/files as well as normal desktop ids
- Converts paths to desktop ids unless they fall out of the standard XDG_DATA_DIRS
- Fixes AddFavorite
- Fixes RemoveFavorite
- Adds MoveFavorite
- Adds tests for the above

The main thing missing here is all the signalling if someone else changes dconf outside of Unity, but this should cover at least what Unity needs to do right now.

[Jason Smith (jassmith)]

CMakeLists.txt has merge cruft left in it

review: Needs Fixing

[Mikkel Kamstrup Erlandsen (kamstrup)]

Apart from the conflict mentioned by Jason this looks good to me. So
approved modulo that :-)

[lp:~unity-team/unity/favorite-store-update]

627. By Neil J. Patel on 2010-11-24

[merge] trunk

[Neil J. Patel (njpatel)]

Thanks guys, fixed, merged and pushed :)

[Didier Roche (didrocks)]

"fixed, merged" -> maybe
"pushed" -> definitively not. I'm sooooooooo disappointed :)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2010-11-24 15:25:33 +0000
+++ CMakeLists.txt	2010-11-24 21:47:12 +0000
@@ -1,4 +1,4 @@
-project (unity)
+  project (unity)
 cmake_minimum_required(VERSION 2.8)
 
 subdirs (libunity services tests)
@@ -74,7 +74,7 @@
 #
 # src (Compiz Plugin)
 #
-set (UNITY_PLUGIN_DEPS "nux-0.9;libbamf;dbus-glib-1;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib;x11;libstartup-notification-1.0")
+set (UNITY_PLUGIN_DEPS "nux-0.9;libbamf;dbus-glib-1;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib;x11;libstartup-notification-1.0;gthread-2.0")
 
 find_package (Compiz REQUIRED)
 include (CompizPlugin)

=== modified file 'src/FavoriteStore.h'
--- src/FavoriteStore.h	2010-11-03 11:44:21 +0000
+++ src/FavoriteStore.h	2010-11-24 21:47:12 +0000
@@ -46,12 +46,18 @@
   // DO NOT RELY ON THE CHAR *, STRDUP THEM
   virtual GSList * GetFavorites () = 0;
   
-  // These will emit the relevant signals, so bare that in mind
-  virtual void AddFavorite    (const char *desktop_path, guint32 position) = 0;
+  // These will NOT emit the relevant signals, so bare that in mind
+  // i.e. don't hope that you can add stuff and hook the view up to
+  // favorite_added events to update the view. The signals only emit if
+  // there has been a change on the GSettings object from an external
+  // source
+  virtual void AddFavorite    (const char *desktop_path, gint position) = 0;
   virtual void RemoveFavorite (const char *desktop_path) = 0;
-  virtual void MoveFavorite   (const char *desktop_path, guint32 position) = 0;
+  virtual void MoveFavorite   (const char *desktop_path, gint position) = 0;
 
   // Signals
+  // Therse only emit if something has changed the GSettings object externally
+
   //desktop_path, position
   sigc::signal<void, const char *, guint32> favorite_added;
 

=== modified file 'src/FavoriteStoreGSettings.cpp'
--- src/FavoriteStoreGSettings.cpp	2010-11-04 12:48:48 +0000
+++ src/FavoriteStoreGSettings.cpp	2010-11-24 21:47:12 +0000
@@ -20,9 +20,11 @@
 
 #include "FavoriteStoreGSettings.h"
 
+#define SETTINGS_NAME "com.canonical.Unity.Launcher"
+
 FavoriteStoreGSettings::FavoriteStoreGSettings ()
 {
-  m_settings = g_settings_new ("com.canonical.Unity.Launcher");
+  m_settings = g_settings_new (SETTINGS_NAME);
   m_favorites = NULL;
 
   Refresh ();
@@ -30,7 +32,7 @@
 
 FavoriteStoreGSettings::FavoriteStoreGSettings (GSettingsBackend *backend)
 {
-  m_settings = g_settings_new_with_backend ("com.canonical.Unity.Launcher", backend);
+  m_settings = g_settings_new_with_backend (SETTINGS_NAME, backend);
   m_favorites = NULL;
 
   Refresh ();
@@ -52,27 +54,46 @@
 
   g_slist_foreach (m_favorites, (GFunc)g_free, NULL);
   g_slist_free (m_favorites);
+  m_favorites = NULL;
 
   favs = g_settings_get_strv (m_settings, "favorites");
 
   while (favs[i] != NULL)
     {
-      GDesktopAppInfo *info;
-
-      info = g_desktop_app_info_new (favs[i]);
-      
-      if (info == NULL || g_desktop_app_info_get_filename (info) == NULL)
-        {
-          g_warning ("Unable to load GDesktopAppInfo for '%s'", favs[i]);
-
-          i++;
-          continue;
-        }
-
-      m_favorites = g_slist_append (m_favorites, g_strdup (g_desktop_app_info_get_filename (info)));
+      /*
+       * We will be storing either full /path/to/desktop/files or foo.desktop id's
+       */
+      if (favs[i][0] == '/')
+        {
+          if (g_file_test (favs[i], G_FILE_TEST_EXISTS))
+            {
+              m_favorites = g_slist_append (m_favorites, g_strdup (favs[i]));
+            }
+          else
+            {
+              g_warning ("Unable to load desktop file: %s", favs[i]);
+            }
+        }
+      else
+        {
+          GDesktopAppInfo *info;
+
+          info = g_desktop_app_info_new (favs[i]);
+          
+          if (info == NULL || g_desktop_app_info_get_filename (info) == NULL)
+            {
+              g_warning ("Unable to load GDesktopAppInfo for '%s'", favs[i]);
+
+              i++;
+              continue;
+            }
+
+          m_favorites = g_slist_append (m_favorites, g_strdup (g_desktop_app_info_get_filename (info)));
+
+          g_object_unref (info);
+        }
+
       i++;
-
-      g_object_unref (info);
     }
 
   g_strfreev (favs);
@@ -84,16 +105,42 @@
   return m_favorites;
 }
 
+static gchar *
+get_basename_or_path (const gchar *desktop_path)
+{
+  const gchar * const * dirs;
+  const gchar * dir;
+  gint          i = 0;
+
+  dirs = g_get_system_data_dirs ();
+
+  /* We check to see if the desktop file belongs to one of the system data
+   * directories. If so, then we store it's desktop id, otherwise we store
+   * it's full path. We're clever like that.
+   */
+  while ((dir = dirs[i]))
+    {
+      if (g_str_has_prefix (desktop_path, dir))
+        {
+          return g_path_get_basename (desktop_path);
+        }
+      i++;
+    }
+
+  return g_strdup (desktop_path);
+}
+
 void
 FavoriteStoreGSettings::AddFavorite (const char *desktop_path,
-                                     guint32     position)
+                                     gint        position)
 {
   int     n_total_favs;
   GSList *f;
-  guint32 i = 0;
+  gint    i = 0;
 
   g_return_if_fail (desktop_path);
-
+  g_return_if_fail (position < (gint)g_slist_length (m_favorites));
+  
   n_total_favs = g_slist_length (m_favorites) + 1;
   
   char *favs[n_total_favs + 1];
@@ -103,17 +150,23 @@
     {
       if (i == position)
         {
-          favs[i] = g_path_get_basename (desktop_path);
+          favs[i] = get_basename_or_path (desktop_path);
           i++;
         }
       
-      favs[i] = g_path_get_basename ((char *)f->data);
+      favs[i] = get_basename_or_path ((char *)f->data);
 
       i++;
     }
 
+  /* Add it to the end of the list */
+  if (position == -1)
+    {
+      favs[i] = get_basename_or_path (desktop_path);
+    }
+
   if (!g_settings_set_strv (m_settings, "favorites", favs))
-    g_warning ("Unable to add a new favorite");
+    g_warning ("Unable to add a new favorite '%s' at position '%u'", desktop_path, position);
 
   i = 0;
   while (favs[i] != NULL)
@@ -132,8 +185,10 @@
   int     n_total_favs;
   GSList *f;
   int     i = 0;
+  bool    found = false;
 
   g_return_if_fail (desktop_path);
+  g_return_if_fail (desktop_path[0] == '/');
 
   n_total_favs = g_slist_length (m_favorites) - 1;
   
@@ -142,15 +197,25 @@
 
   for (f = m_favorites; f; f = f->next)
     {
-      if (g_strcmp0 ((char *)f->data, desktop_path))
+      if (g_strcmp0 ((char *)f->data, desktop_path) != 0)
         {
-          favs[i] = g_path_get_basename ((char *)f->data);
+          favs[i] = get_basename_or_path ((char *)f->data);
           i++;
         }
+      else
+        {
+          found = true;
+        }
+    }
+
+  if (!found)
+    {
+      g_warning ("Unable to remove favorite '%s': Does not exist in favorites",
+                 desktop_path);
     }
 
   if (!g_settings_set_strv (m_settings, "favorites", favs))
-    g_warning ("Unable to add a new favorite");
+    g_warning ("Unable to remove favorite '%s'", desktop_path);
 
   i = 0;
   while (favs[i] != NULL)
@@ -165,6 +230,53 @@
 
 void
 FavoriteStoreGSettings::MoveFavorite (const char *desktop_path,
-                                      guint32     position)
+                                      gint        position)
 {
+  int     n_total_favs;
+  GSList *f;
+  gint    i = 0;
+
+  g_return_if_fail (desktop_path);
+  g_return_if_fail (position < (gint)g_slist_length (m_favorites));
+  
+  n_total_favs = g_slist_length (m_favorites);
+  
+  char *favs[n_total_favs + 1];
+  favs[n_total_favs] = NULL;
+
+  for (f = m_favorites; f; f = f->next)
+    {
+      if (i == position)
+        {
+          favs[i] = get_basename_or_path (desktop_path);
+          i++;
+        }
+
+      if (g_strcmp0 (desktop_path, (char *)f->data) != 0)
+        {
+          favs[i] = get_basename_or_path ((char *)f->data);
+          i++;
+        }
+    }
+
+  /* Add it to the end of the list */
+  if (position == -1)
+    {
+      favs[i] = get_basename_or_path (desktop_path);
+      i++;
+    }
+  favs[i] = NULL;
+
+  if (!g_settings_set_strv (m_settings, "favorites", favs))
+    g_warning ("Unable to add a new favorite '%s' at position '%u'", desktop_path, position);
+
+  i = 0;
+  while (favs[i] != NULL)
+    {
+      g_free (favs[i]);
+      favs[i] = NULL;
+      i++;
+    }
+
+  Refresh ();
 }

=== modified file 'src/FavoriteStoreGSettings.h'
--- src/FavoriteStoreGSettings.h	2010-11-04 12:48:48 +0000
+++ src/FavoriteStoreGSettings.h	2010-11-24 21:47:12 +0000
@@ -36,9 +36,9 @@
 
   //Methods
   virtual GSList * GetFavorites ();
-  virtual void     AddFavorite    (const char *desktop_path, guint32 position);
+  virtual void     AddFavorite    (const char *desktop_path, gint    position);
   virtual void     RemoveFavorite (const char *desktop_path);
-  virtual void     MoveFavorite   (const char *desktop_path, guint32 position);
+  virtual void     MoveFavorite   (const char *desktop_path, gint position);
 
 private:
   void Refresh ();

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2010-11-18 16:25:14 +0000
+++ tests/CMakeLists.txt	2010-11-24 21:47:12 +0000
@@ -1,4 +1,10 @@
 #
+# Data
+#
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/update-manager.desktop
+                ${CMAKE_BINARY_DIR}/tests/data/update-manager.desktop)
+
+#
 # Unit tests
 #
 find_package (PkgConfig)

=== added directory 'tests/data'
=== added file 'tests/data/update-manager.desktop'
--- tests/data/update-manager.desktop	1970-01-01 00:00:00 +0000
+++ tests/data/update-manager.desktop	2010-11-24 21:47:12 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Update Manager
+GenericName=Software Updates
+Comment=Show and install available updates
+Exec=/usr/bin/update-manager
+Icon=update-manager
+Terminal=false
+Type=Application
+Categories=System;Settings;
+X-Ubuntu-Gettext-Domain=update-manager

=== modified file 'tests/unit/TestFavoriteStoreGSettings.cpp'
--- tests/unit/TestFavoriteStoreGSettings.cpp	2010-11-05 14:43:07 +0000
+++ tests/unit/TestFavoriteStoreGSettings.cpp	2010-11-24 21:47:12 +0000
@@ -28,23 +28,51 @@
 #include "FavoriteStore.h"
 #include "FavoriteStoreGSettings.h"
 
+#define CUSTOM_DESKTOP BUILDDIR"/tests/data/update-manager.desktop"
+
 #define BASE_STORE_FILE BUILDDIR"/settings/test-favorite-store-gsettings.store"
 #define BASE_STORE_CONTENTS "[desktop/unity/launcher]\n" \
-                            "favorites=['evolution.desktop', 'firefox.desktop']"
+                            "favorites=['evolution.desktop', 'firefox.desktop', '%s']"
 
-static const char *base_store_favs[] = { "evolution.desktop", "firefox.desktop", NULL };
-static int         n_base_store_favs = 2;
+static const char *base_store_favs[] = { "evolution.desktop",
+                                          "firefox.desktop",
+                                          CUSTOM_DESKTOP,
+                                          NULL };
+static int         n_base_store_favs = G_N_ELEMENTS (base_store_favs) - 1; /* NULL */
 
 static void TestAllocation   (void);
 static void TestGetFavorites (void);
 
+static void TestAddFavorite  (void);
+static void TestAddFavoritePosition (void);
+static void TestAddFavoriteLast (void);
+static void TestAddFavoriteOutOfRange (void);
+
+static void TestRemoveFavorite (void);
+static void TestRemoveFavoriteBad (void);
+
+static void TestMoveFavorite (void);
+static void TestMoveFavoriteBad (void);
+
 void
 TestFavoriteStoreGSettingsCreateSuite ()
 {
 #define _DOMAIN "/Unit/FavoriteStoreGSettings"
 
   g_test_add_func (_DOMAIN"/Allocation", TestAllocation);
+  
   g_test_add_func (_DOMAIN"/GetFavorites", TestGetFavorites);
+  
+  g_test_add_func (_DOMAIN"/AddFavorite", TestAddFavorite);
+  g_test_add_func (_DOMAIN"/AddFavoritePosition", TestAddFavoritePosition);
+  g_test_add_func (_DOMAIN"/AddFavoriteLast", TestAddFavoriteLast);
+  g_test_add_func (_DOMAIN"/AddFavoriteOutOfRange", TestAddFavoriteOutOfRange);
+
+  g_test_add_func (_DOMAIN"/RemoveFavorite", TestRemoveFavorite);
+  g_test_add_func (_DOMAIN"/RemoveFavoriteBad", TestRemoveFavoriteBad);
+
+  g_test_add_func (_DOMAIN"/MoveFavorite", TestMoveFavorite);
+  g_test_add_func (_DOMAIN"/MoveFavoriteBad", TestMoveFavoriteBad);
 }
 
 static GSettingsBackend *
@@ -52,23 +80,34 @@
 {
   GSettingsBackend *b;
   GError *error = NULL;
+  gchar  *contents = NULL;
+
+  contents = g_strdup_printf (BASE_STORE_CONTENTS, CUSTOM_DESKTOP);
 
   g_file_set_contents (BASE_STORE_FILE,
-                       BASE_STORE_CONTENTS,
+                       contents,
                        -1,
                        &error);
   g_assert (error == NULL);
 
   b = g_keyfile_settings_backend_new (BASE_STORE_FILE, "/", "root");
 
+  g_free (contents);
   return b;
 }
 
 static void
 TestAllocation ()
 {
-  FavoriteStoreGSettings *settings = new FavoriteStoreGSettings ();
+  GSettingsBackend       *backend;
+  FavoriteStoreGSettings *settings;
+
+  backend = CreateDefaultKeyFileBackend ();
+  g_assert (G_IS_SETTINGS_BACKEND (backend));
+
+  settings = new FavoriteStoreGSettings (backend);
   g_assert (settings != NULL);
+  g_object_unref (backend);
 
   settings->UnReference ();
 }
@@ -97,10 +136,221 @@
       gchar *basename;
       
       basename = g_path_get_basename ((char*)f->data);
-      g_assert_cmpstr (basename, ==, base_store_favs[i]);
+      if (g_strcmp0 (basename, "update-manager.desktop") == 0)
+        g_assert_cmpstr (CUSTOM_DESKTOP, ==, base_store_favs[i]);
+      else
+        g_assert_cmpstr (basename, ==, base_store_favs[i]);
 
       g_free (basename);
     }
 
   settings->UnReference ();
 }
+
+static void
+TestAddFavorite ()
+{
+#define OTHER_DESKTOP "/usr/share/applications/nautilus.desktop"
+  GSettingsBackend       *backend;
+  FavoriteStoreGSettings *settings;
+  GSList                 *favs;
+ 
+  backend = CreateDefaultKeyFileBackend ();
+  g_assert (G_IS_SETTINGS_BACKEND (backend));
+
+  settings = new FavoriteStoreGSettings (backend);
+  g_assert (settings != NULL);
+  g_object_unref (backend);
+
+  settings->AddFavorite (OTHER_DESKTOP, 0);
+
+  favs = settings->GetFavorites ();
+  g_assert_cmpstr ((const gchar *)g_slist_nth_data (favs, 0), ==, OTHER_DESKTOP);
+
+  settings->UnReference ();
+}
+
+static void
+TestAddFavoritePosition ()
+{
+#define OTHER_DESKTOP "/usr/share/applications/nautilus.desktop"
+  GSettingsBackend       *backend;
+  FavoriteStoreGSettings *settings;
+  GSList                 *favs;
+ 
+  backend = CreateDefaultKeyFileBackend ();
+  g_assert (G_IS_SETTINGS_BACKEND (backend));
+
+  settings = new FavoriteStoreGSettings (backend);
+  g_assert (settings != NULL);
+  g_object_unref (backend);
+
+  settings->AddFavorite (OTHER_DESKTOP, 2);
+
+  favs = settings->GetFavorites ();
+  g_assert_cmpstr ((const gchar *)g_slist_nth_data (favs, 2), ==, OTHER_DESKTOP);
+
+  settings->UnReference ();
+}
+
+static void
+TestAddFavoriteLast ()
+{
+#define OTHER_DESKTOP "/usr/share/applications/nautilus.desktop"
+  GSettingsBackend       *backend;
+  FavoriteStoreGSettings *settings;
+  GSList                 *favs;
+ 
+  backend = CreateDefaultKeyFileBackend ();
+  g_assert (G_IS_SETTINGS_BACKEND (backend));
+
+  settings = new FavoriteStoreGSettings (backend);
+  g_assert (settings != NULL);
+  g_object_unref (backend);
+
+  settings->AddFavorite (OTHER_DESKTOP, -1);
+
+  favs = settings->GetFavorites ();
+  g_assert_cmpstr ((const gchar *)g_slist_nth_data (favs, n_base_store_favs), ==, OTHER_DESKTOP);
+
+  settings->UnReference ();
+}
+
+static void
+TestAddFavoriteOutOfRange ()
+{
+#define OTHER_DESKTOP "/usr/share/applications/nautilus.desktop"
+  GSettingsBackend       *backend;
+  FavoriteStoreGSettings *settings;
+   
+  backend = CreateDefaultKeyFileBackend ();
+  g_assert (G_IS_SETTINGS_BACKEND (backend));
+
+  settings = new FavoriteStoreGSettings (backend);
+  g_assert (settings != NULL);
+  g_object_unref (backend);
+
+  if (g_test_trap_fork (0, (GTestTrapFlags)(G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)))
+    {
+      settings->AddFavorite (OTHER_DESKTOP, n_base_store_favs + 1);
+    }
+  g_test_trap_assert_stderr ("*g_slist_length*");
+
+  settings->UnReference ();
+}
+
+
+static void
+TestRemoveFavorite ()
+{
+  GSettingsBackend       *backend;
+  FavoriteStoreGSettings *settings;
+  GSList                 *favs;
+ 
+  backend = CreateDefaultKeyFileBackend ();
+  g_assert (G_IS_SETTINGS_BACKEND (backend));
+
+  settings = new FavoriteStoreGSettings (backend);
+  g_assert (settings != NULL);
+  g_object_unref (backend);
+
+  favs = settings->GetFavorites ();
+
+  settings->RemoveFavorite ((const gchar *)g_slist_nth_data (favs, 0));
+  favs = settings->GetFavorites ();
+  g_assert_cmpint (g_slist_length (favs), ==, n_base_store_favs - 1);
+  g_assert (g_str_has_suffix ((const gchar *)g_slist_nth_data (favs, 0), base_store_favs[1]));
+
+  settings->RemoveFavorite ((const char *)g_slist_nth_data (favs, 1));
+  favs = settings->GetFavorites ();
+  g_assert_cmpint (g_slist_length (favs), ==, n_base_store_favs - 2);
+  g_assert (g_str_has_suffix ((const gchar *)g_slist_nth_data (favs, 0), base_store_favs[1]));
+
+  settings->UnReference ();
+}
+
+static void
+TestRemoveFavoriteBad ()
+{
+  GSettingsBackend       *backend;
+  FavoriteStoreGSettings *settings;
+ 
+  backend = CreateDefaultKeyFileBackend ();
+  g_assert (G_IS_SETTINGS_BACKEND (backend));
+
+  settings = new FavoriteStoreGSettings (backend);
+  g_assert (settings != NULL);
+  g_object_unref (backend);
+
+  if (g_test_trap_fork (0, (GTestTrapFlags)(G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)))
+    {
+      settings->RemoveFavorite (NULL);
+    }
+  g_test_trap_assert_stderr ("*");
+
+  if (g_test_trap_fork (0, (GTestTrapFlags)(G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)))
+    {
+      settings->RemoveFavorite ("foo.desktop");
+    }
+  g_test_trap_assert_stderr ("*[0]*");
+
+  if (g_test_trap_fork (0, (GTestTrapFlags)(G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)))
+    {
+      settings->RemoveFavorite ("/this/desktop/doesnt/exist/hopefully.desktop");
+    }
+  g_test_trap_assert_stderr ("*Unable to remove favorite*");
+  
+  settings->UnReference ();
+}
+
+static void
+TestMoveFavorite ()
+{
+  GSettingsBackend       *backend;
+  FavoriteStoreGSettings *settings;
+  GSList                 *favs;
+ 
+  backend = CreateDefaultKeyFileBackend ();
+  g_assert (G_IS_SETTINGS_BACKEND (backend));
+
+  settings = new FavoriteStoreGSettings (backend);
+  g_assert (settings != NULL);
+  g_object_unref (backend);
+
+  settings->MoveFavorite (base_store_favs[2], 0);
+
+  favs = settings->GetFavorites ();
+  g_assert_cmpstr ((const gchar *)favs->data, ==, base_store_favs[2]);
+  g_assert (g_str_has_suffix ((const gchar *)g_slist_nth_data (favs, 1), base_store_favs[0]));
+  g_assert (g_str_has_suffix ((const gchar *)g_slist_nth_data (favs, 2), base_store_favs[1]));
+
+  settings->UnReference ();
+}
+
+static void
+TestMoveFavoriteBad ()
+{
+  GSettingsBackend       *backend;
+  FavoriteStoreGSettings *settings;
+ 
+  backend = CreateDefaultKeyFileBackend ();
+  g_assert (G_IS_SETTINGS_BACKEND (backend));
+
+  settings = new FavoriteStoreGSettings (backend);
+  g_assert (settings != NULL);
+  g_object_unref (backend);
+
+  if (g_test_trap_fork (0, (GTestTrapFlags)(G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)))
+    {
+      settings->MoveFavorite (NULL, 0);
+    }
+  g_test_trap_assert_stderr ("*desktop_path*");
+
+  if (g_test_trap_fork (0, (GTestTrapFlags)(G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)))
+    {
+      settings->MoveFavorite (CUSTOM_DESKTOP, 100);
+    }
+  g_test_trap_assert_stderr ("*g_slist_length*");
+
+  settings->UnReference ();
+}