[oe-commits] Sebastian Krzyszkowiak : packagekit: fix segfaults when ConsoleKit is missing

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: e123fc11385ac7fda038028b4d24c6bf36b3dfc1
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e123fc11385ac7fda038028b4d24c6bf36b3dfc1

Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Tue Aug 11 15:28:40 2009 +0000

packagekit: fix segfaults when ConsoleKit is missing

---

 .../fix-segfaults-when-consolekit-is-missing.patch |   27 ++++++++++++++++++++
 recipes/packagekit/packagekit_0.5.1.bb             |    6 +++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/recipes/packagekit/files/fix-segfaults-when-consolekit-is-missing.patch b/recipes/packagekit/files/fix-segfaults-when-consolekit-is-missing.patch
new file mode 100644
index 0000000..f70caa2
--- /dev/null
+++ b/recipes/packagekit/files/fix-segfaults-when-consolekit-is-missing.patch
@@ -0,0 +1,27 @@
+diff --git a/src/pk-dbus.c b/src/pk-dbus.c
+index 28ba20c..0f65783 100644
+--- a/src/pk-dbus.c
++++ b/src/pk-dbus.c
+@@ -171,6 +171,12 @@ pk_dbus_get_session (PkDbus *dbus, const gchar *sender)
+ 	g_return_val_if_fail (PK_IS_DBUS (dbus), NULL);
+ 	g_return_val_if_fail (sender != NULL, NULL);
+ 
++	/* no ConsoleKit? */
++	if (dbus->priv->proxy_session == NULL) {
++		egg_warning ("no ConsoleKit, so cannot get session");
++		goto out;
++	}
++
+ 	/* get pid */
+ 	pid = pk_dbus_get_pid (dbus, sender);
+ 	if (pid == G_MAXUINT) {
+@@ -208,7 +214,8 @@ pk_dbus_finalize (GObject *object)
+ 	dbus = PK_DBUS (object);
+ 
+ 	g_object_unref (dbus->priv->proxy_pid);
+-	g_object_unref (dbus->priv->proxy_session);
++	if (dbus->priv->proxy_session != NULL)
++		g_object_unref (dbus->priv->proxy_session);
+ 
+ 	G_OBJECT_CLASS (pk_dbus_parent_class)->finalize (object);
+ }
\ No newline at end of file
diff --git a/recipes/packagekit/packagekit_0.5.1.bb b/recipes/packagekit/packagekit_0.5.1.bb
index 51072e5..7a96a23 100644
--- a/recipes/packagekit/packagekit_0.5.1.bb
+++ b/recipes/packagekit/packagekit_0.5.1.bb
@@ -7,9 +7,11 @@ RDEPENDS_${PN} = "${IPKG_VARIANT}"
 
 inherit gnome autotools_stage
 
-SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz"
+SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz \
+           file://fix-segfaults-when-consolekit-is-missing.patch;patch=1 \
+           "
 
-PR = "r0"
+PR = "r1"
 PE = "2"
 
 S = "${WORKDIR}/PackageKit-${PV}"