[patch] upstream patch

0001-my_object_unsafe_disable_legacy_property_access-have.patch (text/plain), 1.65 KB, created by Michael Palimaka (kensington) on 2012-06-30 16:21:08 UTC

From a846a7aa5a0ff9e1af07b3627298808f0c896d03 Mon Sep 17 00:00:00 2001
From: Simon McVittie <[e-mail]>
Date: Thu, 28 Jun 2012 12:54:02 +0100
Subject: [PATCH] my_object_unsafe_disable_legacy_property_access: have the
 right signature

I'm amazed this ever worked.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=51511
Signed-off-by: Simon McVittie <[e-mail]>
---
 test/core/my-object.c |    6 ++++--
 test/core/my-object.h |    3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/core/my-object.c b/test/core/my-object.c
index 82b6322..e31dca3 100644
--- a/test/core/my-object.c
+++ b/test/core/my-object.c
@@ -859,10 +859,12 @@ my_object_async_throw_error (MyObject *obj, DBusGMethodInvocation *context)
   g_idle_add ((GSourceFunc) do_async_error,  data);
 }
 
-void
-my_object_unsafe_disable_legacy_property_access (MyObject *obj)
+gboolean
+my_object_unsafe_disable_legacy_property_access (MyObject *obj,
+    GError **error)
 {
   dbus_glib_global_set_disable_legacy_property_access ();
+  return TRUE;
 }
 
 extern GMainLoop *loop;
diff --git a/test/core/my-object.h b/test/core/my-object.h
index d50d0b4..779efac 100644
--- a/test/core/my-object.h
+++ b/test/core/my-object.h
@@ -116,7 +116,8 @@ void my_object_async_increment (MyObject *obj, gint32 x, DBusGMethodInvocation *
 
 void my_object_async_throw_error (MyObject *obj, DBusGMethodInvocation *context);
 
-void my_object_unsafe_disable_legacy_property_access (MyObject *obj);
+gboolean my_object_unsafe_disable_legacy_property_access (MyObject *obj,
+    GError **error);
 
 void my_object_emit_objectified (MyObject *obj, GObject *other);
 
-- 
1.7.10