dbus-glib: added patch fix issues with NetworkManager.
This commit is contained in:
parent
52eb93bdd1
commit
923bf19b60
2 changed files with 41 additions and 0 deletions
40
srcpkgs/dbus-glib/patches/fix_network_manager.patch
Normal file
40
srcpkgs/dbus-glib/patches/fix_network_manager.patch
Normal file
|
@ -0,0 +1,40 @@
|
|||
From 3e0828f57c3925ea9b63d22ab82d991a0fea0536 Mon Sep 17 00:00:00 2001
|
||||
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
||||
Date: Thu, 02 Jun 2011 12:49:51 +0000
|
||||
Subject: Fix regression in marshalling objects as object paths
|
||||
|
||||
This regressed while fixing fd.o #36811. NetworkManager apparently uses
|
||||
this idiom.
|
||||
|
||||
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37852
|
||||
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628890
|
||||
Tested-by: Michael Biebl <biebl@debian.org>
|
||||
Reviewed-by: Colin Walters <walters@verbum.org>
|
||||
---
|
||||
diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
|
||||
index 3b0bd17..7ee0b4f 100644
|
||||
--- dbus/dbus-gobject.c
|
||||
+++ dbus/dbus-gobject.c
|
||||
@@ -3049,16 +3049,16 @@ out:
|
||||
const char *
|
||||
_dbus_gobject_get_path (GObject *obj)
|
||||
{
|
||||
- GSList *registrations;
|
||||
+ ObjectExport *oe;
|
||||
ObjectRegistration *o;
|
||||
|
||||
- registrations = g_object_get_data (obj, "dbus_glib_object_registrations");
|
||||
+ oe = g_object_get_data (obj, "dbus_glib_object_registrations");
|
||||
|
||||
- if (registrations == NULL)
|
||||
+ if (oe == NULL || oe->registrations == NULL)
|
||||
return NULL;
|
||||
|
||||
/* First one to have been registered wins */
|
||||
- o = registrations->data;
|
||||
+ o = oe->registrations->data;
|
||||
|
||||
return o->object_path;
|
||||
}
|
||||
--
|
||||
cgit v0.8.3-6-g21f6
|
|
@ -1,6 +1,7 @@
|
|||
# Template file for 'dbus-glib'
|
||||
pkgname=dbus-glib
|
||||
version=0.94
|
||||
revision=1
|
||||
distfiles="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
|
||||
build_style=gnu_configure
|
||||
configure_args="--disable-static --disable-bash-completion"
|
||||
|
|
Loading…
Reference in a new issue