r29907 - in /desktop/experimental/yelp/debian: changelog patches/06_setup_error_on_missing_dbus.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Oct  1 05:02:40 2011
New Revision: 29907

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29907
Log:
* debian/patches/06_setup_error_on_missing_dbus.patch:
  - Fix crash in yelp_settings_constructed () when dbus session bus is not
    available.

Added:
    desktop/experimental/yelp/debian/patches/06_setup_error_on_missing_dbus.patch
Modified:
    desktop/experimental/yelp/debian/changelog
    desktop/experimental/yelp/debian/patches/series

Modified: desktop/experimental/yelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/changelog?rev=29907&op=diff
==============================================================================
--- desktop/experimental/yelp/debian/changelog [utf-8] (original)
+++ desktop/experimental/yelp/debian/changelog [utf-8] Sat Oct  1 05:02:40 2011
@@ -1,4 +1,4 @@
-yelp (3.2.0-1) experimental; urgency=low
+yelp (3.2.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump (Build-)Depends on yelp-xsl to (>= 3.1.2).
@@ -15,6 +15,9 @@
     libyelp.
   * Add a Breaks: yelp (<< 3.2.0) to avoid partial upgrades.
   * Add a strict dependency between yelp and libyelp0.
+  * debian/patches/06_setup_error_on_missing_dbus.patch:
+    - Fix crash in yelp_settings_constructed () when dbus session bus is not
+      available.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 30 Sep 2011 17:14:37 +0200
 

Added: desktop/experimental/yelp/debian/patches/06_setup_error_on_missing_dbus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/patches/06_setup_error_on_missing_dbus.patch?rev=29907&op=file
==============================================================================
--- desktop/experimental/yelp/debian/patches/06_setup_error_on_missing_dbus.patch (added)
+++ desktop/experimental/yelp/debian/patches/06_setup_error_on_missing_dbus.patch [utf-8] Sat Oct  1 05:02:40 2011
@@ -1,0 +1,27 @@
+From 51c8974020db33e680e7f55b9f49d60e4adff5ab Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Sat, 1 Oct 2011 06:47:36 +0200
+Subject: [PATCH] Pass &error to g_bus_get_sync () so it is set when used
+ later
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660579
+---
+ libyelp/yelp-settings.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libyelp/yelp-settings.c b/libyelp/yelp-settings.c
+index 8995e60..5d3bf59 100644
+--- a/libyelp/yelp-settings.c
++++ b/libyelp/yelp-settings.c
+@@ -250,7 +250,7 @@ yelp_settings_constructed (GObject *object)
+     gchar *name;
+     GError *error = NULL;
+ 
+-    connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
++    connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
+     if (connection == NULL) {
+         g_warning ("Unable to connect to dbus: %s", error->message);
+         g_error_free (error);
+-- 
+1.7.6.3
+

Modified: desktop/experimental/yelp/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/patches/series?rev=29907&op=diff
==============================================================================
--- desktop/experimental/yelp/debian/patches/series [utf-8] (original)
+++ desktop/experimental/yelp/debian/patches/series [utf-8] Sat Oct  1 05:02:40 2011
@@ -2,3 +2,4 @@
 03_info_crasher.patch
 #04_use_doc-base.patch
 05_fix-format-string.patch
+06_setup_error_on_missing_dbus.patch