r28935 - in /desktop/experimental/gnome-utils/debian: changelog patches/03-don-t-abort-if-nautilus-schema-is-not-installed.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Jul 19 19:05:02 2011
New Revision: 28935

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28935
Log:
* debian/patches/03-don-t-abort-if-nautilus-schema-is-not-installed.patch
  - Don't abort in gnome-screenshot if the nautilus settings schema
    'org.gnome.nautilus.preferences' is not installed. Closes: #631413

Added:
    desktop/experimental/gnome-utils/debian/patches/03-don-t-abort-if-nautilus-schema-is-not-installed.patch
Modified:
    desktop/experimental/gnome-utils/debian/changelog
    desktop/experimental/gnome-utils/debian/patches/series

Modified: desktop/experimental/gnome-utils/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-utils/debian/changelog?rev=28935&op=diff
==============================================================================
--- desktop/experimental/gnome-utils/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-utils/debian/changelog [utf-8] Tue Jul 19 19:05:02 2011
@@ -1,3 +1,11 @@
+gnome-utils (3.0.1-3) UNRELEASED; urgency=low
+
+  * debian/patches/03-don-t-abort-if-nautilus-schema-is-not-installed.patch
+    - Don't abort in gnome-screenshot if the nautilus settings schema
+      'org.gnome.nautilus.preferences' is not installed. Closes: #631413
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 19 Jul 2011 20:52:38 +0200
+
 gnome-utils (3.0.1-2) experimental; urgency=low
 
   * 02_gdict-1.0_pc_requires.patch: Make gdict-1.0's pkg-config file

Added: desktop/experimental/gnome-utils/debian/patches/03-don-t-abort-if-nautilus-schema-is-not-installed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-utils/debian/patches/03-don-t-abort-if-nautilus-schema-is-not-installed.patch?rev=28935&op=file
==============================================================================
--- desktop/experimental/gnome-utils/debian/patches/03-don-t-abort-if-nautilus-schema-is-not-installed.patch (added)
+++ desktop/experimental/gnome-utils/debian/patches/03-don-t-abort-if-nautilus-schema-is-not-installed.patch [utf-8] Tue Jul 19 19:05:02 2011
@@ -1,0 +1,47 @@
+Description: Don't abort if nautilus schema is not installed.
+Author: Michael Biebl <biebl at debian.org>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=654920
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=631413
+
+---
+ gnome-screenshot/gnome-screenshot.c |   17 ++++++++++++++++-
+ 1 files changed, 16 insertions(+), 1 deletions(-)
+
+diff --git a/gnome-screenshot/gnome-screenshot.c b/gnome-screenshot/gnome-screenshot.c
+index 2ab66bd..c19da50 100644
+--- a/gnome-screenshot/gnome-screenshot.c
++++ b/gnome-screenshot/gnome-screenshot.c
+@@ -1208,6 +1208,19 @@ prepare_screenshot_timeout (gpointer data)
+   return FALSE;
+ }
+ 
++static gboolean
++schema_exists (const gchar *name)
++{
++  const gchar * const *schemas;
++  gint i;
++
++  schemas = g_settings_list_schemas ();
++  for (i = 0; schemas[i]; i++)
++    if (g_strcmp0 (name, schemas[i]) == 0)
++      return TRUE;
++
++  return FALSE;
++}
+ 
+ static gchar *
+ get_desktop_dir (void)
+@@ -1216,7 +1229,9 @@ get_desktop_dir (void)
+   gboolean desktop_is_home_dir = FALSE;
+   gchar *desktop_dir;
+ 
+-  nautilus_prefs = g_settings_new ("org.gnome.nautilus.preferences");
++  if (schema_exists ("org.gnome.nautilus.preferences"))
++    nautilus_prefs = g_settings_new ("org.gnome.nautilus.preferences");
++
+   desktop_is_home_dir = g_settings_get_boolean (nautilus_prefs, "desktop-is-home-dir");
+ 
+   if (desktop_is_home_dir)
+-- 
+1.7.5.4
+

Modified: desktop/experimental/gnome-utils/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-utils/debian/patches/series?rev=28935&op=diff
==============================================================================
--- desktop/experimental/gnome-utils/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-utils/debian/patches/series [utf-8] Tue Jul 19 19:05:02 2011
@@ -1,2 +1,3 @@
 01_logview_gksu.patch
 02_gdict-1.0_pc_requires.patch
+03-don-t-abort-if-nautilus-schema-is-not-installed.patch