Mercurial > pidgin
comparison libpurple/dbus-bindings.h @ 32384:3ed4800c5e17
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 051fd526bf8c89add8c1960afd9d0c7ee77b091a)
to branch 'im.pidgin.pidgin' (head 11e7ee045ef2505f4215dd05ca8d6c8735e81ab6)
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Fri, 09 Dec 2011 18:35:12 +0000 |
parents | 8b7c7c6bf985 |
children | 98520ee78f12 |
comparison
equal
deleted
inserted
replaced
32383:7967bb7db191 | 32384:3ed4800c5e17 |
---|---|
82 purple_dbus_message_iter_get_args_valist (DBusMessageIter *iter, | 82 purple_dbus_message_iter_get_args_valist (DBusMessageIter *iter, |
83 DBusError *error, | 83 DBusError *error, |
84 int first_arg_type, | 84 int first_arg_type, |
85 va_list var_args); | 85 va_list var_args); |
86 | 86 |
87 dbus_int32_t* purple_dbusify_GList(GList *list, gboolean free_memory, | 87 dbus_int32_t* purple_dbusify_GList(GList *list, dbus_int32_t *len); |
88 dbus_int32_t *len); | 88 dbus_int32_t* purple_dbusify_GSList(GSList *list, dbus_int32_t *len); |
89 dbus_int32_t* purple_dbusify_GSList(GSList *list, gboolean free_memory, | 89 gpointer* purple_GList_to_array(GList *list, dbus_int32_t *len); |
90 dbus_int32_t *len); | 90 gpointer* purple_GSList_to_array(GSList *list, dbus_int32_t *len); |
91 gpointer* purple_GList_to_array(GList *list, gboolean free_memory, | |
92 dbus_int32_t *len); | |
93 gpointer* purple_GSList_to_array(GSList *list, gboolean free_memory, | |
94 dbus_int32_t *len); | |
95 GHashTable *purple_dbus_iter_hash_table(DBusMessageIter *iter, DBusError *error); | 91 GHashTable *purple_dbus_iter_hash_table(DBusMessageIter *iter, DBusError *error); |
96 | 92 |
97 const char* empty_to_null(const char *str); | 93 const char* empty_to_null(const char *str); |
98 const char* null_to_empty(const char *s); | 94 const char* null_to_empty(const char *s); |
99 | 95 |