From 5442ba4d63b8f9548e140a47f63046c11819a972 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 8 May 2008 17:58:33 +0000 Subject: Add skeleton for libgdbus support --- gdbus/gdbus.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 gdbus/gdbus.h (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h new file mode 100644 index 00000000..71377516 --- /dev/null +++ b/gdbus/gdbus.h @@ -0,0 +1,22 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2004-2008 Marcel Holtmann + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ -- cgit From 33191e6275ab82aa4161cdf75b45597e4d1568ec Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 8 May 2008 19:12:44 +0000 Subject: Move D-Bus mainloop integration into libgdbus --- gdbus/gdbus.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 71377516..d749d5e2 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -20,3 +20,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#ifndef __GDBUS_H +#define __GDBUS_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +void setup_dbus_with_main_loop(DBusConnection *conn); + +DBusConnection *dbus_bus_system_setup_with_main_loop(const char *name, + void (*disconnect_cb)(void *), void *user_data); + +#ifdef __cplusplus +} +#endif + +#endif /* __GDBUS_H */ -- cgit From aa215d6fa551a3edbd129d4a163210e98357bdd1 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 8 May 2008 19:39:12 +0000 Subject: Emulate libgdbus API for mainloop integration --- gdbus/gdbus.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index d749d5e2..a9f2aa51 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -31,10 +31,14 @@ extern "C" { #include #include -void setup_dbus_with_main_loop(DBusConnection *conn); +typedef void (* GDBusDisconnectFunction) (void *user_data); -DBusConnection *dbus_bus_system_setup_with_main_loop(const char *name, - void (*disconnect_cb)(void *), void *user_data); +DBusConnection *g_dbus_setup_bus(DBusBusType type, const char *name, + DBusError *error); + +gboolean g_dbus_set_disconnect_function(DBusConnection *connection, + GDBusDisconnectFunction function, + void *user_data, DBusFreeFunction destroy); #ifdef __cplusplus } -- cgit From e7d668ac9e813bc9922ee7d771848bd8822d5d1f Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 8 May 2008 20:23:45 +0000 Subject: Move D-Bus watch functions into libgdbus --- gdbus/gdbus.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index a9f2aa51..d1902a52 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -40,6 +40,15 @@ gboolean g_dbus_set_disconnect_function(DBusConnection *connection, GDBusDisconnectFunction function, void *user_data, DBusFreeFunction destroy); +typedef void (*name_cb_t)(const char *name, void *user_data); + +guint name_listener_add(DBusConnection *connection, const char *name, + name_cb_t func, void *user_data); +int name_listener_remove(DBusConnection *connection, const char *name, + name_cb_t func, void *user_data); +gboolean name_listener_id_remove(guint id); +int name_listener_indicate_disconnect(DBusConnection *connection); + #ifdef __cplusplus } #endif -- cgit From 15ea15b3a752f0487bc50d0ea04925f1b9d33dcb Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 8 May 2008 22:19:14 +0000 Subject: Move D-Bus object and interface helpers into libgdbus --- gdbus/gdbus.h | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index d1902a52..d8382306 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -40,6 +40,88 @@ gboolean g_dbus_set_disconnect_function(DBusConnection *connection, GDBusDisconnectFunction function, void *user_data, DBusFreeFunction destroy); +#define DBUS_TYPE_STRING_ARRAY_AS_STRING (DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING) +#define DBUS_TYPE_BYTE_ARRAY_AS_STRING (DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING) + +DBusHandlerResult dbus_connection_send_and_unref(DBusConnection *connection, + DBusMessage *message); + +dbus_bool_t dbus_connection_create_object_path(DBusConnection *connection, + const char *path, void *user_data, + DBusObjectPathUnregisterFunction function); + +dbus_bool_t dbus_connection_destroy_object_path(DBusConnection *connection, + const char *path); + +dbus_bool_t dbus_connection_get_object_user_data(DBusConnection *connection, + const char *path, + void **data_p); + +typedef struct DBusMethodVTable DBusMethodVTable; + +struct DBusMethodVTable { + const char *name; + DBusObjectPathMessageFunction message_function; + const char *signature; + const char *reply; +}; + +typedef struct DBusSignalVTable DBusSignalVTable; + +struct DBusSignalVTable { + const char *name; + const char *signature; +}; + +typedef struct DBusPropertyVTable DBusPropertyVTable; + +struct DBusPropertyVTable { + const char *name; +}; + +dbus_bool_t dbus_connection_register_interface(DBusConnection *connection, + const char *path, const char *name, + DBusMethodVTable *methods, + DBusSignalVTable *signals, + DBusPropertyVTable *properties); + +dbus_bool_t dbus_connection_unregister_interface(DBusConnection *connection, + const char *path, const char *name); +void dbus_message_iter_append_variant(DBusMessageIter *iter, int type, void *val); +void dbus_message_iter_append_dict_entry(DBusMessageIter *dict, + const char *key, int type, void *val); +void dbus_message_iter_append_dict_valist(DBusMessageIter *iter, + const char *first_key, + va_list var_args); +void dbus_message_iter_append_dict(DBusMessageIter *iter, + const char *first_key, ...); +dbus_bool_t dbus_connection_emit_signal(DBusConnection *conn, const char *path, + const char *interface, const char *name, + int first, ...); + +dbus_bool_t dbus_connection_emit_signal_valist(DBusConnection *conn, + const char *path, + const char *interface, + const char *name, + int first, + va_list var_args); +dbus_bool_t dbus_connection_emit_property_changed(DBusConnection *conn, + const char *path, + const char *interface, + const char *name, + int type, void *value); + +static inline DBusHandlerResult send_message_and_unref(DBusConnection *conn, + DBusMessage *msg) +{ + if (msg) { + dbus_connection_send(conn, msg, NULL); + dbus_message_unref(msg); + } + + return DBUS_HANDLER_RESULT_HANDLED; +} + typedef void (*name_cb_t)(const char *name, void *user_data); guint name_listener_add(DBusConnection *connection, const char *name, -- cgit From 9e9f9adde3085582f81da3b681e6fe5bb62679d3 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 27 May 2008 06:59:19 +0000 Subject: Add real libgdbus types for interface definitions --- gdbus/gdbus.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index d8382306..48f7fceb 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -122,6 +122,43 @@ static inline DBusHandlerResult send_message_and_unref(DBusConnection *conn, return DBUS_HANDLER_RESULT_HANDLED; } +typedef DBusMessage * (* GDBusMethodFunction) (DBusConnection *connection, + DBusMessage *message, void *user_data); + +typedef enum { + G_DBUS_METHOD_FLAG_DEPRECATED = (1 << 0), + G_DBUS_METHOD_FLAG_NOREPLY = (1 << 1), + G_DBUS_METHOD_FLAG_ASYNC = (1 << 2), +} GDBusMethodFlags; + +typedef enum { + G_DBUS_SIGNAL_FLAG_DEPRECATED = (1 << 0), +} GDBusSignalFlags; + +typedef enum { + G_DBUS_PROPERTY_FLAG_DEPRECATED = (1 << 0), +} GDBusPropertyFlags; + +typedef struct { + const char *name; + const char *signature; + const char *reply; + GDBusMethodFunction function; + GDBusMethodFlags flags; +} GDBusMethodTable; + +typedef struct { + const char *name; + const char *signature; + GDBusSignalFlags flags; +} GDBusSignalTable; + +typedef struct { + const char *name; + const char *type; + GDBusPropertyFlags flags; +} GDBusPropertyTable; + typedef void (*name_cb_t)(const char *name, void *user_data); guint name_listener_add(DBusConnection *connection, const char *name, -- cgit From 5567809ce0381ebfc22d77e5df31624d23c591dc Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 27 May 2008 07:06:07 +0000 Subject: Add prototypes for interface registration --- gdbus/gdbus.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 48f7fceb..f5087b15 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -122,6 +122,8 @@ static inline DBusHandlerResult send_message_and_unref(DBusConnection *conn, return DBUS_HANDLER_RESULT_HANDLED; } +typedef void (* GDBusDestroyFunction) (void *user_data); + typedef DBusMessage * (* GDBusMethodFunction) (DBusConnection *connection, DBusMessage *message, void *user_data); @@ -159,6 +161,16 @@ typedef struct { GDBusPropertyFlags flags; } GDBusPropertyTable; +gboolean g_dbus_register_interface(DBusConnection *connection, + const char *path, const char *name, + GDBusMethodTable *methods, + GDBusSignalTable *signals, + GDBusPropertyTable *properties, + void *user_data, + GDBusDestroyFunction destroy); +gboolean g_dbus_unregister_interface(DBusConnection *connection, + const char *path, const char *name); + typedef void (*name_cb_t)(const char *name, void *user_data); guint name_listener_add(DBusConnection *connection, const char *name, -- cgit From d0b06ea8fd1a8642c99d6b2c7661d562acf3c43e Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 27 May 2008 11:42:46 +0000 Subject: Add helpers for error creation --- gdbus/gdbus.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index f5087b15..66baa852 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -171,6 +171,11 @@ gboolean g_dbus_register_interface(DBusConnection *connection, gboolean g_dbus_unregister_interface(DBusConnection *connection, const char *path, const char *name); +DBusMessage *g_dbus_create_error_valist(DBusMessage *message, const char *name, + const char *format, va_list args); +DBusMessage *g_dbus_create_error(DBusMessage *message, const char *name, + const char *format, ...); + typedef void (*name_cb_t)(const char *name, void *user_data); guint name_listener_add(DBusConnection *connection, const char *name, -- cgit From 671e8bc7340909da8b0fe750176423113e9ea8c1 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 27 May 2008 17:48:01 +0000 Subject: Add helpers for creating replies --- gdbus/gdbus.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 66baa852..dc337954 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -175,6 +175,9 @@ DBusMessage *g_dbus_create_error_valist(DBusMessage *message, const char *name, const char *format, va_list args); DBusMessage *g_dbus_create_error(DBusMessage *message, const char *name, const char *format, ...); +DBusMessage *g_dbus_create_reply(DBusMessage *message, int type, ...); +DBusMessage *g_dbus_create_reply_valist(DBusMessage *message, + int type, va_list args); typedef void (*name_cb_t)(const char *name, void *user_data); -- cgit From 80d6914d167a731d97aff4e25497f84e96e09fe3 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 27 May 2008 18:02:23 +0000 Subject: Add helpers for sending async replies --- gdbus/gdbus.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index dc337954..6f3ddb79 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -179,6 +179,12 @@ DBusMessage *g_dbus_create_reply(DBusMessage *message, int type, ...); DBusMessage *g_dbus_create_reply_valist(DBusMessage *message, int type, va_list args); +gboolean g_dbus_send_message(DBusConnection *connection, DBusMessage *message); +gboolean g_dbus_send_reply(DBusConnection *connection, + DBusMessage *message, int type, ...); +gboolean g_dbus_send_reply_valist(DBusConnection *connection, + DBusMessage *message, int type, va_list args); + typedef void (*name_cb_t)(const char *name, void *user_data); guint name_listener_add(DBusConnection *connection, const char *name, -- cgit From cc0f97ec2cb298bde87cd3753fd96f11ce41ff64 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Thu, 29 May 2008 14:43:27 +0000 Subject: Change name_listener API to libgdbus watch API --- gdbus/gdbus.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 6f3ddb79..22c10569 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -185,14 +185,14 @@ gboolean g_dbus_send_reply(DBusConnection *connection, gboolean g_dbus_send_reply_valist(DBusConnection *connection, DBusMessage *message, int type, va_list args); -typedef void (*name_cb_t)(const char *name, void *user_data); - -guint name_listener_add(DBusConnection *connection, const char *name, - name_cb_t func, void *user_data); -int name_listener_remove(DBusConnection *connection, const char *name, - name_cb_t func, void *user_data); -gboolean name_listener_id_remove(guint id); -int name_listener_indicate_disconnect(DBusConnection *connection); +typedef void (* GDBusWatchFunction) (void *user_data); + +guint g_dbus_add_disconnect_watch(DBusConnection *connection, + const char *name, + GDBusWatchFunction function, + void *user_data, GDBusDestroyFunction destroy); +gboolean g_dbus_remove_watch(DBusConnection *connection, guint tag); +void g_dbus_remove_all_watches(DBusConnection *connection); #ifdef __cplusplus } -- cgit From 7d1a9d56719aea39ecd38c8dafffee9de898e68b Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 29 May 2008 21:12:03 +0000 Subject: Remove GDBusDisconnectFunction type --- gdbus/gdbus.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 22c10569..68c6fe80 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -31,13 +31,13 @@ extern "C" { #include #include -typedef void (* GDBusDisconnectFunction) (void *user_data); +typedef void (* GDBusWatchFunction) (void *user_data); DBusConnection *g_dbus_setup_bus(DBusBusType type, const char *name, DBusError *error); gboolean g_dbus_set_disconnect_function(DBusConnection *connection, - GDBusDisconnectFunction function, + GDBusWatchFunction function, void *user_data, DBusFreeFunction destroy); #define DBUS_TYPE_STRING_ARRAY_AS_STRING (DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING) @@ -185,8 +185,6 @@ gboolean g_dbus_send_reply(DBusConnection *connection, gboolean g_dbus_send_reply_valist(DBusConnection *connection, DBusMessage *message, int type, va_list args); -typedef void (* GDBusWatchFunction) (void *user_data); - guint g_dbus_add_disconnect_watch(DBusConnection *connection, const char *name, GDBusWatchFunction function, -- cgit From 21e5707fba726c379ed6a260f6efb4dab9d7c44b Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 3 Jun 2008 14:51:51 +0000 Subject: Add skeleton for g_dbus_unregister_all_interfaces --- gdbus/gdbus.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 68c6fe80..f7187f22 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -170,6 +170,8 @@ gboolean g_dbus_register_interface(DBusConnection *connection, GDBusDestroyFunction destroy); gboolean g_dbus_unregister_interface(DBusConnection *connection, const char *path, const char *name); +gboolean g_dbus_unregister_all_interfaces(DBusConnection *connection, + const char *path); DBusMessage *g_dbus_create_error_valist(DBusMessage *message, const char *name, const char *format, va_list args); -- cgit From 38b422bbfe271a79b098acb99551812b0b9bde43 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 6 Jun 2008 10:42:15 +0000 Subject: Remove obsolete D-Bus sending helpers --- gdbus/gdbus.h | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index f7187f22..8bce2ee5 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -43,9 +43,6 @@ gboolean g_dbus_set_disconnect_function(DBusConnection *connection, #define DBUS_TYPE_STRING_ARRAY_AS_STRING (DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING) #define DBUS_TYPE_BYTE_ARRAY_AS_STRING (DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING) -DBusHandlerResult dbus_connection_send_and_unref(DBusConnection *connection, - DBusMessage *message); - dbus_bool_t dbus_connection_create_object_path(DBusConnection *connection, const char *path, void *user_data, DBusObjectPathUnregisterFunction function); @@ -111,17 +108,6 @@ dbus_bool_t dbus_connection_emit_property_changed(DBusConnection *conn, const char *name, int type, void *value); -static inline DBusHandlerResult send_message_and_unref(DBusConnection *conn, - DBusMessage *msg) -{ - if (msg) { - dbus_connection_send(conn, msg, NULL); - dbus_message_unref(msg); - } - - return DBUS_HANDLER_RESULT_HANDLED; -} - typedef void (* GDBusDestroyFunction) (void *user_data); typedef DBusMessage * (* GDBusMethodFunction) (DBusConnection *connection, -- cgit From 30877999b61e655ff7f4e804240098c4cd31831e Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 6 Jun 2008 10:45:39 +0000 Subject: Remove obsolete D-Bus interface helpers --- gdbus/gdbus.h | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 8bce2ee5..9b95e2e5 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -54,37 +54,8 @@ dbus_bool_t dbus_connection_get_object_user_data(DBusConnection *connection, const char *path, void **data_p); -typedef struct DBusMethodVTable DBusMethodVTable; - -struct DBusMethodVTable { - const char *name; - DBusObjectPathMessageFunction message_function; - const char *signature; - const char *reply; -}; - -typedef struct DBusSignalVTable DBusSignalVTable; - -struct DBusSignalVTable { - const char *name; - const char *signature; -}; - -typedef struct DBusPropertyVTable DBusPropertyVTable; - -struct DBusPropertyVTable { - const char *name; -}; - -dbus_bool_t dbus_connection_register_interface(DBusConnection *connection, - const char *path, const char *name, - DBusMethodVTable *methods, - DBusSignalVTable *signals, - DBusPropertyVTable *properties); - -dbus_bool_t dbus_connection_unregister_interface(DBusConnection *connection, - const char *path, const char *name); -void dbus_message_iter_append_variant(DBusMessageIter *iter, int type, void *val); +void dbus_message_iter_append_variant(DBusMessageIter *iter, + int type, void *val); void dbus_message_iter_append_dict_entry(DBusMessageIter *dict, const char *key, int type, void *val); void dbus_message_iter_append_dict_valist(DBusMessageIter *iter, -- cgit From dd368f19884b9751a0f99ffebcd2c5520069f5db Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 6 Jun 2008 13:52:43 +0000 Subject: Remove object path creation and destroy helpers --- gdbus/gdbus.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 9b95e2e5..5ddc4058 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -43,13 +43,6 @@ gboolean g_dbus_set_disconnect_function(DBusConnection *connection, #define DBUS_TYPE_STRING_ARRAY_AS_STRING (DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING) #define DBUS_TYPE_BYTE_ARRAY_AS_STRING (DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING) -dbus_bool_t dbus_connection_create_object_path(DBusConnection *connection, - const char *path, void *user_data, - DBusObjectPathUnregisterFunction function); - -dbus_bool_t dbus_connection_destroy_object_path(DBusConnection *connection, - const char *path); - dbus_bool_t dbus_connection_get_object_user_data(DBusConnection *connection, const char *path, void **data_p); -- cgit From c910fb98d032261cc27c462d481d77674f13bded Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 7 Jun 2008 16:14:31 +0000 Subject: Remove obsolete dbus_connection_get_object_user_data function --- gdbus/gdbus.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 5ddc4058..99f34a84 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -43,10 +43,6 @@ gboolean g_dbus_set_disconnect_function(DBusConnection *connection, #define DBUS_TYPE_STRING_ARRAY_AS_STRING (DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING) #define DBUS_TYPE_BYTE_ARRAY_AS_STRING (DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING) -dbus_bool_t dbus_connection_get_object_user_data(DBusConnection *connection, - const char *path, - void **data_p); - void dbus_message_iter_append_variant(DBusMessageIter *iter, int type, void *val); void dbus_message_iter_append_dict_entry(DBusMessageIter *dict, -- cgit From f06919f22999bd132ae6d84191245387eae9d733 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 7 Jun 2008 16:22:47 +0000 Subject: Add proper signal sending helpers --- gdbus/gdbus.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 99f34a84..0ec90dcb 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -56,12 +56,6 @@ dbus_bool_t dbus_connection_emit_signal(DBusConnection *conn, const char *path, const char *interface, const char *name, int first, ...); -dbus_bool_t dbus_connection_emit_signal_valist(DBusConnection *conn, - const char *path, - const char *interface, - const char *name, - int first, - va_list var_args); dbus_bool_t dbus_connection_emit_property_changed(DBusConnection *conn, const char *path, const char *interface, @@ -133,6 +127,13 @@ gboolean g_dbus_send_reply(DBusConnection *connection, gboolean g_dbus_send_reply_valist(DBusConnection *connection, DBusMessage *message, int type, va_list args); +gboolean g_dbus_emit_signal(DBusConnection *connection, + const char *path, const char *interface, + const char *name, int type, ...); +gboolean g_dbus_emit_signal_valist(DBusConnection *connection, + const char *path, const char *interface, + const char *name, int type, va_list args); + guint g_dbus_add_disconnect_watch(DBusConnection *connection, const char *name, GDBusWatchFunction function, -- cgit From e26cc82994acb2b8acfe24f29825b7f5326f9673 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 7 Jun 2008 19:32:20 +0000 Subject: Remove another obsolete function --- gdbus/gdbus.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 0ec90dcb..c2c75ec5 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -52,9 +52,6 @@ void dbus_message_iter_append_dict_valist(DBusMessageIter *iter, va_list var_args); void dbus_message_iter_append_dict(DBusMessageIter *iter, const char *first_key, ...); -dbus_bool_t dbus_connection_emit_signal(DBusConnection *conn, const char *path, - const char *interface, const char *name, - int first, ...); dbus_bool_t dbus_connection_emit_property_changed(DBusConnection *conn, const char *path, -- cgit From a80ddb03c8b75d36cf26c639c12f1f6ed693ab69 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 7 Jun 2008 19:42:42 +0000 Subject: Remove unused defines --- gdbus/gdbus.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index c2c75ec5..969cb66f 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -40,9 +40,6 @@ gboolean g_dbus_set_disconnect_function(DBusConnection *connection, GDBusWatchFunction function, void *user_data, DBusFreeFunction destroy); -#define DBUS_TYPE_STRING_ARRAY_AS_STRING (DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING) -#define DBUS_TYPE_BYTE_ARRAY_AS_STRING (DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING) - void dbus_message_iter_append_variant(DBusMessageIter *iter, int type, void *val); void dbus_message_iter_append_dict_entry(DBusMessageIter *dict, -- cgit From 7abfb49cae784002c5a2326a3a1ab5cb8076a1f0 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 7 Jun 2008 19:44:44 +0000 Subject: Make helper function static and local --- gdbus/gdbus.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 969cb66f..efa045e1 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -40,8 +40,6 @@ gboolean g_dbus_set_disconnect_function(DBusConnection *connection, GDBusWatchFunction function, void *user_data, DBusFreeFunction destroy); -void dbus_message_iter_append_variant(DBusMessageIter *iter, - int type, void *val); void dbus_message_iter_append_dict_entry(DBusMessageIter *dict, const char *key, int type, void *val); void dbus_message_iter_append_dict_valist(DBusMessageIter *iter, -- cgit From 012cac6d32c56eac1d4f8dbc6051b2450e809efc Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 7 Jun 2008 19:48:45 +0000 Subject: Remove another unused function --- gdbus/gdbus.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index efa045e1..84e7e1ae 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -45,8 +45,6 @@ void dbus_message_iter_append_dict_entry(DBusMessageIter *dict, void dbus_message_iter_append_dict_valist(DBusMessageIter *iter, const char *first_key, va_list var_args); -void dbus_message_iter_append_dict(DBusMessageIter *iter, - const char *first_key, ...); dbus_bool_t dbus_connection_emit_property_changed(DBusConnection *conn, const char *path, -- cgit From a1a65a6821bddc4d3e076b8600e4bd497a64d162 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 7 Jun 2008 19:53:51 +0000 Subject: Don't abstract functions that are only used once --- gdbus/gdbus.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 84e7e1ae..ffa5cf19 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -42,9 +42,6 @@ gboolean g_dbus_set_disconnect_function(DBusConnection *connection, void dbus_message_iter_append_dict_entry(DBusMessageIter *dict, const char *key, int type, void *val); -void dbus_message_iter_append_dict_valist(DBusMessageIter *iter, - const char *first_key, - va_list var_args); dbus_bool_t dbus_connection_emit_property_changed(DBusConnection *conn, const char *path, -- cgit From 22ec945f109d9d1e21a8cfbc6e2dec3dd4b88c8e Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 7 Jun 2008 20:09:25 +0000 Subject: Move some D-Bus helpers around --- gdbus/gdbus.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'gdbus/gdbus.h') diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index ffa5cf19..eefd3734 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -40,15 +40,6 @@ gboolean g_dbus_set_disconnect_function(DBusConnection *connection, GDBusWatchFunction function, void *user_data, DBusFreeFunction destroy); -void dbus_message_iter_append_dict_entry(DBusMessageIter *dict, - const char *key, int type, void *val); - -dbus_bool_t dbus_connection_emit_property_changed(DBusConnection *conn, - const char *path, - const char *interface, - const char *name, - int type, void *value); - typedef void (* GDBusDestroyFunction) (void *user_data); typedef DBusMessage * (* GDBusMethodFunction) (DBusConnection *connection, @@ -100,10 +91,10 @@ gboolean g_dbus_unregister_interface(DBusConnection *connection, gboolean g_dbus_unregister_all_interfaces(DBusConnection *connection, const char *path); -DBusMessage *g_dbus_create_error_valist(DBusMessage *message, const char *name, - const char *format, va_list args); DBusMessage *g_dbus_create_error(DBusMessage *message, const char *name, const char *format, ...); +DBusMessage *g_dbus_create_error_valist(DBusMessage *message, const char *name, + const char *format, va_list args); DBusMessage *g_dbus_create_reply(DBusMessage *message, int type, ...); DBusMessage *g_dbus_create_reply_valist(DBusMessage *message, int type, va_list args); -- cgit