r28938 - /desktop/experimental/gnome-utils/debian/patches/03-don-t-abort-if-nautilus-schema-is-not-installed.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Jul 19 19:50:34 2011
New Revision: 28938

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28938
Log:
Somehow managed to commit a buggy version of the patch, fixed now.

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

Modified: 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=28938&op=diff
==============================================================================
--- desktop/experimental/gnome-utils/debian/patches/03-don-t-abort-if-nautilus-schema-is-not-installed.patch [utf-8] (original)
+++ desktop/experimental/gnome-utils/debian/patches/03-don-t-abort-if-nautilus-schema-is-not-installed.patch [utf-8] Tue Jul 19 19:50:34 2011
@@ -4,14 +4,14 @@
 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(-)
+ gnome-screenshot/gnome-screenshot.c |   22 +++++++++++++++++++---
+ 1 files changed, 19 insertions(+), 3 deletions(-)
 
 diff --git a/gnome-screenshot/gnome-screenshot.c b/gnome-screenshot/gnome-screenshot.c
-index 2ab66bd..c19da50 100644
+index 2ab66bd..1b2a85f 100644
 --- a/gnome-screenshot/gnome-screenshot.c
 +++ b/gnome-screenshot/gnome-screenshot.c
-@@ -1208,6 +1208,19 @@ prepare_screenshot_timeout (gpointer data)
+@@ -1208,16 +1208,32 @@ prepare_screenshot_timeout (gpointer data)
    return FALSE;
  }
  
@@ -31,17 +31,22 @@
  
  static gchar *
  get_desktop_dir (void)
-@@ -1216,7 +1229,9 @@ get_desktop_dir (void)
+ {
+-  GSettings *nautilus_prefs;
++  GSettings *nautilus_prefs = NULL;
    gboolean desktop_is_home_dir = FALSE;
    gchar *desktop_dir;
  
 -  nautilus_prefs = g_settings_new ("org.gnome.nautilus.preferences");
+-  desktop_is_home_dir = g_settings_get_boolean (nautilus_prefs, "desktop-is-home-dir");
 +  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 (nautilus_prefs)
++    desktop_is_home_dir = g_settings_get_boolean (nautilus_prefs, "desktop-is-home-dir");
  
    if (desktop_is_home_dir)
+     desktop_dir = g_strconcat ("file://", g_get_home_dir (), NULL);
 -- 
 1.7.5.4