diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-12 18:49:28 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-13 16:41:50 +0100 |
| commit | 8caae1a2a176ee27ba627efbbe4f5a7db659ad91 (patch) | |
| tree | 572bdee7097c97a97236db4aa09ba6eea9c16b41 /tests | |
| parent | fa5c747f4ca64c819ff7b0c35e81861fa41666c2 (diff) | |
| download | telepathy-glib-8caae1a2a176ee27ba627efbbe4f5a7db659ad91.tar.gz | |
tp_dbus_properties_mixin_dup_all: make public
There's no real reason not to - anything that implements D-Bus
properties is clearly going to have this method in some form.
Also, my next commit needs it.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69283
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dbus/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/lib/simple-conn.c | 13 |
2 files changed, 2 insertions, 16 deletions
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am index 4d02d23d8..e446645e6 100644 --- a/tests/dbus/Makefile.am +++ b/tests/dbus/Makefile.am @@ -215,11 +215,6 @@ test_protocol_objects_LDADD = \ test_protocol_objects_SOURCES = protocol-objects.c test_self_handle_SOURCES = self-handle.c -test_self_handle_LDADD = \ - $(top_builddir)/tests/lib/libtp-glib-tests-internal.la \ - $(top_builddir)/telepathy-glib/libtelepathy-glib-internal.la \ - $(GLIB_LIBS) \ - $(NULL) test_self_presence_SOURCES = self-presence.c diff --git a/tests/lib/simple-conn.c b/tests/lib/simple-conn.c index b466231fb..c78e1278a 100644 --- a/tests/lib/simple-conn.c +++ b/tests/lib/simple-conn.c @@ -18,16 +18,13 @@ #include <dbus/dbus-glib.h> #include <telepathy-glib/dbus.h> +#include <telepathy-glib/dbus-properties-mixin.h> #include <telepathy-glib/errors.h> #include <telepathy-glib/gtypes.h> #include <telepathy-glib/handle-repo-dynamic.h> #include <telepathy-glib/interfaces.h> #include <telepathy-glib/util.h> -#ifdef TP_GLIB_TESTS_INTERNAL -# include "telepathy-glib/dbus-properties-mixin-internal.h" -#endif - #include "textchan-null.h" #include "room-list-chan.h" #include "util.h" @@ -522,13 +519,12 @@ conn_iface_init (TpSvcConnectionClass *iface) #undef IMPLEMENT } -#ifdef TP_GLIB_TESTS_INTERNAL static void get_all (TpSvcDBusProperties *iface, const gchar *interface_name, DBusGMethodInvocation *context) { - GHashTable *values = _tp_dbus_properties_mixin_get_all (G_OBJECT (iface), + GHashTable *values = tp_dbus_properties_mixin_dup_all (G_OBJECT (iface), interface_name); tp_svc_dbus_properties_return_from_get_all (context, values); @@ -536,17 +532,12 @@ get_all (TpSvcDBusProperties *iface, g_signal_emit (iface, signals[SIGNAL_GOT_ALL], g_quark_from_string (interface_name)); } -#endif /* TP_GLIB_TESTS_INTERNAL */ static void props_iface_init (TpSvcDBusPropertiesClass *iface) { -#ifdef TP_GLIB_TESTS_INTERNAL - #define IMPLEMENT(x) \ tp_svc_dbus_properties_implement_##x (iface, x) IMPLEMENT (get_all); #undef IMPLEMENT - -#endif /* TP_GLIB_TESTS_INTERNAL */ } |