diff options
| author | Parabola <dev@list.parabolagnulinux.org> | 2011-10-17 14:16:38 +0000 |
|---|---|---|
| committer | Parabola <dev@list.parabolagnulinux.org> | 2011-10-17 14:16:38 +0000 |
| commit | e1b3d592f43a99f4ed7c91971deda6ce8414dd69 (patch) | |
| tree | 38fecdc19b201d4d28df13c22e9b3b45bb469e4b /extra/dbus-glib | |
| parent | d286d980d2ff42151e9bc81ec348c864c24f9cc4 (diff) | |
Mon Oct 17 14:16:38 UTC 2011
Diffstat (limited to 'extra/dbus-glib')
| -rw-r--r-- | extra/dbus-glib/fix_network_manager.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/extra/dbus-glib/fix_network_manager.patch b/extra/dbus-glib/fix_network_manager.patch deleted file mode 100644 index 246b85550..000000000 --- a/extra/dbus-glib/fix_network_manager.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 ---- a/dbus/dbus-gobject.c -+++ b/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 |