cpw.gillux.detachablepurple: d8c3dfb8: Dropped all the remainings of the glib-d...
gillux at soc.pidgin.im
gillux at soc.pidgin.im
Tue May 29 12:11:24 EDT 2012
----------------------------------------------------------------------
Revision: d8c3dfb86ffc0379543669508ff6d36321bf214d
Parent: f7a0f2c1d5127bed496bedfdedc4d7c64e0342a3
Author: gillux at soc.pidgin.im
Date: 05/29/12 12:05:01
Branch: im.pidgin.cpw.gillux.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/d8c3dfb86ffc0379543669508ff6d36321bf214d
Changelog:
Dropped all the remainings of the glib-dbus era code.
Goodbye, glib-dbus! I will not miss you.
Changes against parent f7a0f2c1d5127bed496bedfdedc4d7c64e0342a3
patched libpurple/account.c
patched libpurple/core.h
patched libpurple/dbus/account.c
patched libpurple/dbus/buddy.c
patched libpurple/dbus/callback.c
patched libpurple/dbus/chat.c
patched libpurple/dbus/connection.c
patched libpurple/dbus/constructor.c
patched libpurple/dbus/contact.c
patched libpurple/dbus/group.c
patched libpurple/dbus-maybe.h
patched libpurple/dbus-purple.h
patched libpurple/dbus-server.c
patched libpurple/dbus-server.h
patched libpurple/marshallers.list
patched libpurple/pobject.c
patched libpurple/pobject.h
-------------- next part --------------
============================================================
--- libpurple/core.h 9926413e3e365b722e0762497a7d6a71fbc6f1a4
+++ libpurple/core.h b8ebaa88c10f318981aa016b0f29827c56d1b09a
@@ -84,10 +84,6 @@ typedef struct
* PURPLE_RUN_DAEMON_MODE: used in detachable session context, for the daemon
* instance, which wraps libpurple and communicate with several UI clients
* through DBus.
- * PURPLE_RUN_MIRROR_MODE: a special mode used in detachable sessions context
- * by the UI clients. It is used to handle "mirror" objects, to temporarly
- * and locally set a property without triggering any of the usual hooks
- * not desired in remote mode.
* PURPLE_RUN_REMOTE_MODE: used in detachable session context, for UI client
* instance, which makes its libpurple to connects to the daemon a forward
* calls and events.
@@ -96,7 +92,6 @@ enum _PurpleRunningMode {
PURPLE_RUN_NORMAL_MODE,
PURPLE_RUN_DAEMON_MODE,
PURPLE_RUN_REMOTE_MODE,
- PURPLE_RUN_MIRROR_MODE,
PURPLE_RUN_MODE_LAST
};
@@ -114,14 +109,11 @@ extern "C" {
(purple_core_get_running_mode() == PURPLE_RUN_DAEMON_MODE)
# define purple_core_is_normal_mode() \
(purple_core_get_running_mode() == PURPLE_RUN_NORMAL_MODE)
-# define purple_core_is_mirror_mode() \
- (purple_core_get_running_mode() == PURPLE_RUN_MIRROR_MODE)
#else /* !HAVE_DBUS */
# define purple_core_is_remote_mode() (FALSE)
# define purple_core_is_daemon_mode() (FALSE)
# define purple_core_is_normal_mode() (TRUE )
-# define purple_core_is_mirror_mode() (FALSE)
#endif
/**
============================================================
--- libpurple/account.c 59ba53345ad0c4b6f8788217a2e15b4e7b84b537
+++ libpurple/account.c 69f7c736a62c4f47308f31a64753f76777896a6e
@@ -988,9 +988,6 @@ purple_account_connect(PurpleAccount *ac
/* Handle remote mode case */
if (purple_core_is_remote_mode())
return purple_account_connect_RPC(account);
- /* Handle mirror mode case */
- if (purple_core_is_mirror_mode())
- return;
purple_debug_info("account", "Connecting to account %s.\n", username);
============================================================
--- libpurple/dbus-purple.h fd2d262a0d83787a3914b15db02c86e6d13fa1db
+++ libpurple/dbus-purple.h 69d1bea0999227565c5a165822530a767e7a7a93
@@ -29,22 +29,5 @@
#define DBUS_INTERFACE_PURPLE "im.pidgin.purple.PurpleInterface"
#define DBUS_PURPLE_SERVICE "im.pidgin.purple"
-#define DBUS_ACCOUNT_INTERFACE "im.pidgin.purple.account"
-#define DBUS_BLIST_INTERFACE "im.pidgin.purple.blist"
-
-#define DBUS_BUDDY_INTERFACE "im.pidgin.purple.buddy"
-
-#define DBUS_CHAT_INTERFACE "im.pidgin.purple.chat"
-
-#define DBUS_CONNECTION_INTERFACE "im.pidgin.purple.connection"
-
-#define DBUS_CONTACT_INTERFACE "im.pidgin.purple.contact"
-
-#define DBUS_GROUP_INTERFACE "im.pidgin.purple.group"
-
-#define DBUS_CONSTRUCTOR_INTERFACE "im.pidgin.purple.constructor"
-
-#define DBUS_CALLBACK_INTERFACE "im.pidgin.purple.callback"
-
#endif /* _DBUS_PURPLE_H_ */
============================================================
--- libpurple/dbus-server.c ec5d9f2cea513f4c38e91a8ff6282d54dae3441b
+++ libpurple/dbus-server.c 8a59f36197d61ac71cfde9759f668514725a5ec4
@@ -49,7 +49,6 @@
#include "dbus-bindings.h"
#include "debug.h"
#include "core.h"
-#include "marshallers.h"
#include "savedstatuses.h"
#include "smiley.h"
#include "util.h"
@@ -435,29 +434,6 @@ error:
return NULL;
}
-gboolean
-purple_dbus_remotely_set_obj_prop(PurpleObject* pobj, const char* prop_name,
- GValue* prop_value)
-{
- DBusGProxy *proxy;
- GError *error = NULL;
-
- proxy = purple_object_get_dbus_props_proxy(pobj);
- if (!dbus_g_proxy_call(proxy, "Set", &error,
- /* input parameters */
- G_TYPE_STRING, purple_object_get_dbus_obj_interface(pobj),
- G_TYPE_STRING, prop_name,
- G_TYPE_VALUE, prop_value,
- G_TYPE_INVALID,
- /* output parameters */
- G_TYPE_INVALID)) {
- purple_debug_error("dbus", "Failed to remotely set the `%s' property of the dbus object %s: %s\n", prop_name, purple_object_get_dbus_path(pobj), error->message);
- return FALSE;
- } else {
- return TRUE;
- }
-}
-
gchar*
purple_dbus_sanitize_dbus_path(const gchar *str)
{
============================================================
--- libpurple/dbus-server.h cd219d1e8fee4807f640505938ff10a03736b475
+++ libpurple/dbus-server.h 3bd5975f7d9e34ba3592bf1f851b45863671f1d0
@@ -206,19 +206,6 @@ void purple_dbus_uninit(void);
void purple_dbus_uninit(void);
/**
- * A convenience function that remotely sets the given property of
- * a remote gobject.
- *
- * @param pobj The PURPLE_OBJECT(PurpleStuff) object you want to alter.
- * @param prop_name The property name.
- * @param prop_value The value you want to set.
- *
- * @return TRUE if the property as been succesfully set. FALSE if not, and in
- * this case an error message have been printed.
- */
-gboolean purple_dbus_remotely_set_obj_prop(PurpleObject* pobj, const char* prop_name, GValue* prop_value);
-
-/**
* Sanitize a given string so that it can be used as a valid dbus path.
* The dbus spec says it have to consist of [A-Za-z0-9_/] chars.
* http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-marshaling-object-path
============================================================
--- libpurple/dbus-maybe.h a64e03510f183b5bb4af041d792c4c8d3ed46fa3
+++ libpurple/dbus-maybe.h e3a602bf45102cc9791790446e79340045663ea9
@@ -16,26 +16,6 @@
#include "dbus-server.h"
#include "debug.h"
-#define PURPLE_RPC_FAILED(func, error) \
-G_STMT_START { \
- purple_debug_error("dbus", "Failed to remotely call %s: %s\n", \
- #func, error->message); \
- g_error_free(error); \
-} G_STMT_END
-
-#define PURPLE_DBUS_REMOTELY_SET_PROP(account, set_func, gtype, name, var) \
-G_STMT_START { \
- GValue prop = {0, }; \
- if (purple_core_is_remote_mode()) { \
- g_value_init(&prop, gtype); \
- set_func(&prop, var); \
- if (!purple_dbus_remotely_set_obj_prop(PURPLE_OBJECT(account), \
- name, &prop)) \
- return; \
- g_value_unset(&prop); \
- } \
-} G_STMT_END
-
/* this provides a type check */
#define PURPLE_DBUS_REGISTER_POINTER(ptr, type) { \
type *typed_ptr = ptr; \
@@ -49,10 +29,6 @@ G_STMT_START { \
if (ptr) {} \
}
-#define PURPLE_RPC_FAILED(func, error)
-
-#define PURPLE_DBUS_REMOTELY_SET_PROP(account, set_func, gtype, name, var)
-
#define PURPLE_DBUS_UNREGISTER_POINTER(ptr)
#define DBUS_EXPORT
============================================================
--- libpurple/pobject.c fbe3bd060ff0db82d0a24b604ff9f9705df4b192
+++ libpurple/pobject.c 68ed8b41594eeaf239812c993e0c50985312c377
@@ -23,18 +23,13 @@
#include "internal.h"
#include "core.h"
-#include "dbus-maybe.h"
-#include "marshallers.h"
#include "pobject.h"
#include "dbus/pobject.xml.h"
+#include "dbus-server.h"
+#include "debug.h"
#include "glib-2.30.h"
-#ifdef HAVE_DBUS
-/* Provides DBUS_SERVICE_DBUS etc. */
-# include <dbus/dbus-glib-bindings.h>
-#endif
-
#define PURPLE_OBJECT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_OBJECT, PurpleObjectPrivate))
typedef struct _PurpleObjectPrivate PurpleObjectPrivate;
@@ -48,13 +43,6 @@ struct _PurpleObjectPrivate
/* The dbus interface we use for purple related methods and signals,
* e.g. im.pidgin.purple.account.
*/
- char* dbus_purple_interface;
- /* This proxy is for the PurpleObject subclass object interface
- * set in the dbus_purple_interface field. */
- DBusGProxy *dbus_obj_proxy;
- /* Another proxy, this time for the dbus properties
- * interface org.freedesktop.DBus.Properties. */
- DBusGProxy *dbus_props_proxy;
char* dbus_path;
/* Whether this object is considered as synchronized or not.
* This flag is used to decide whether this object must act as a proxy,
@@ -108,14 +96,6 @@ purple_object_dispose(GObject *obj)
g_warning("Purple-Object: object destroyed without unsetting the ui data. This may lead to memory leak.\n");
}
- g_free(priv->dbus_purple_interface);
-
- if(priv->dbus_obj_proxy)
- g_object_unref(priv->dbus_obj_proxy);
-
- if(priv->dbus_props_proxy)
- g_object_unref(priv->dbus_props_proxy);
-
g_free(priv->dbus_path);
/* XXX: do _notify_close_with_handle etc here */
@@ -202,17 +182,6 @@ purple_object_class_init(PurpleObjectCla
0, 0, NULL, NULL,
g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
- if (purple_core_is_daemon_mode()) {
- /* Signals to propagate infos from the daemon to the clients */
- signals[SIG_DBUS_NOTIFY] =
- g_signal_new("d_bus_notify",
- G_OBJECT_CLASS_TYPE(klass),
- G_SIGNAL_RUN_LAST,
- 0, NULL, NULL,
- purple_smarshal_VOID__STRING_BOXED,
- G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_VALUE);
- }
-
/* Register our GValue transformation function */
g_value_register_transform_func(G_TYPE_STRING, G_TYPE_OBJECT,
g_value_dbus_path2gobject);
@@ -327,46 +296,6 @@ char*
}
char*
-purple_object_get_dbus_obj_interface(PurpleObject *pobj)
-{
- PurpleObjectPrivate *priv;
-
- g_return_val_if_fail(pobj, NULL);
- priv = PURPLE_OBJECT_GET_PRIVATE(pobj);
- return priv->dbus_purple_interface;
-}
-
-void
-purple_object_set_dbus_obj_interface(PurpleObject *pobj, char* interface)
-{
- PurpleObjectPrivate *priv;
-
- g_return_if_fail(pobj);
- priv = PURPLE_OBJECT_GET_PRIVATE(pobj);
- priv->dbus_purple_interface = g_strdup(interface);
-}
-
-DBusGProxy *
-purple_object_get_dbus_obj_proxy(PurpleObject *pobj)
-{
- PurpleObjectPrivate *priv;
-
- g_return_val_if_fail(pobj, NULL);
- priv = PURPLE_OBJECT_GET_PRIVATE(pobj);
- return priv->dbus_obj_proxy;
-}
-
-DBusGProxy *
-purple_object_get_dbus_props_proxy(PurpleObject *pobj)
-{
- PurpleObjectPrivate *priv;
-
- g_return_val_if_fail(pobj, NULL);
- priv = PURPLE_OBJECT_GET_PRIVATE(pobj);
- return priv->dbus_props_proxy;
-}
-
-char*
purple_object_get_dbus_path(PurpleObject *pobj)
{
PurpleObjectPrivate *priv;
@@ -549,65 +478,6 @@ purple_object_set_dbus_property(PurpleOb
return TRUE;
}
-gboolean /* DEPRECATED! */
-purple_object_have_dbus_property(PurpleObject *pobj, const gchar *interface, const gchar *prop_name)
-{
- GPtrArray *props;
- int i;
- gboolean exported_prop = FALSE;
-
- /* Let's see if we export this property on dbus */
- props = purple_object_get_dbus_props(G_OBJECT_TYPE(pobj), interface);
- for (i = 0; i < props->len; i++) {
- if (purple_strequal(prop_name, props->pdata[i])) {
- exported_prop = TRUE;
- break;
- }
- }
- g_ptr_array_foreach(props, (GFunc)g_free, NULL);
- g_ptr_array_free(props, TRUE);
-
- return exported_prop;
-}
-
-/**
- * Callback, called when we receive a dbus "DBusNotify" signal.
- */
-static void
-purple_object_notify_cb(DBusGProxy *proxy, const char *prop_name, const GValue *prop_val, gpointer data)
-{
- GObject *obj;
- PurpleRunningMode mode;
- GParamSpec *pspec;
- GValue prop_val2 = {0, };
-
- /* Retrieve the local gobject mirrored with the dbus path which sent
- * the signal */
- obj = purple_dbus_get_gobject_by_path(dbus_g_proxy_get_path(proxy));
- g_return_if_fail(obj != NULL);
-
- pspec = g_object_class_find_property(G_OBJECT_GET_CLASS(obj), prop_name);
- g_value_init(&prop_val2, G_PARAM_SPEC_VALUE_TYPE(pspec));
- if (G_TYPE_IS_OBJECT(G_PARAM_SPEC_VALUE_TYPE(pspec))
- && G_VALUE_HOLDS_STRING(prop_val)) {
- /* Convert dbus path names into gobjects. */
- g_value_transform(prop_val, &prop_val2);
- } else {
- /* Regular value. */
- g_value_copy(prop_val, &prop_val2);
- }
-
- /* Update the local state of this property */
- mode = purple_core_get_running_mode();
- purple_core_set_running_mode(PURPLE_RUN_MIRROR_MODE);
- purple_debug_info("dbus", "Recieved notify about property '%s' of a %s\n",
- prop_name, G_OBJECT_TYPE_NAME(obj));
-
- g_object_set_property(G_OBJECT(obj), prop_name, &prop_val2);
- purple_core_set_running_mode(mode);
- g_value_unset(&prop_val2);
-}
-
/* Forwards notify signals of exported properties over D-Bus
* using the PropertyChanged signal.
*/
@@ -638,71 +508,6 @@ purple_object_forward_notify_cb(GObject
g_variant_unref(prop);
}
-void
-purple_object_install_dbus_infos(PurpleObject *pobj, char *dbus_interface, char *dbus_path)
-{
- DBusGProxy* dbus_proxy;
- PurpleObjectPrivate *priv;
-
- g_return_if_fail(pobj);
- priv = PURPLE_OBJECT_GET_PRIVATE(pobj);
-
- /* Note that this is not an error since sometimes the client just can't
- * guess the path name when the object is first created. */
- if (!dbus_path)
- return;
-
- if (purple_core_is_remote_mode() || purple_core_is_mirror_mode()) {
- /* One for the org.freedesktop.DBus.Properties interface */
- dbus_proxy = dbus_g_proxy_new_for_name(
- purple_gdbus_get_connection(),
- DBUS_PURPLE_SERVICE, dbus_path,
- DBUS_INTERFACE_PROPERTIES);
- priv->dbus_props_proxy = dbus_proxy;
-
- /* One for the provided interface */
- dbus_proxy = dbus_g_proxy_new_for_name(
- purple_gdbus_get_connection(),
- DBUS_PURPLE_SERVICE, dbus_path,
- dbus_interface);
- priv->dbus_obj_proxy = dbus_proxy;
-
- /* Remember the purple interface */
- purple_object_set_dbus_obj_interface(pobj, dbus_interface);
-
- /* Watch for signals indicating updates from the daemon */
- dbus_g_proxy_add_signal(dbus_proxy, "DBusNotify",
- G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
- dbus_g_proxy_connect_signal(dbus_proxy, "DBusNotify",
- G_CALLBACK(purple_object_notify_cb),
- pobj, NULL);
-
- /* Remember what local gobject this object is a mirror of. */
- purple_dbus_assoc_gobject(dbus_path, G_OBJECT(pobj));
- }
- else if (purple_core_is_daemon_mode()) {
- /* Register our object as at dbus_path */
- dbus_g_connection_register_g_object(
- purple_gdbus_get_connection(),
- dbus_path, G_OBJECT(pobj));
-
- /* Remember the purple interface */
- purple_object_set_dbus_obj_interface(pobj, dbus_interface);
-
- /* Register the callback that forwards the "notify" signal
- * (a property changed) to the remote clients
- */
- g_signal_connect(pobj, "notify",
- G_CALLBACK(purple_object_forward_notify_cb),
- NULL);
- }
-
- /* Remember the dbus path we expose our object (daemon mode)
- * or we got our object from (remote mode) */
- purple_object_set_dbus_path(pobj, dbus_path);
-
-}
-
/* Handles receipt of PropertyChanged D-Bus signals. */
static void
purple_object_dbus_prop_changed(PurpleObject *pobj, const char *prop_name, GVariant *prop_value)
@@ -1180,64 +985,6 @@ purple_object_set_prop_on_dbus(PurpleObj
NULL);
}
-static GQuark
-purple_object_type_dbus_metadata_quark(void)
-{
- static GQuark quark;
-
- if (!quark)
- quark = g_quark_from_static_string("PurpleObjectTypeDBusMethods");
- return quark;
-}
-
-/**
- * A wrapper for dbus_g_object_type_install_info(), to let us catch these infos too.
- *
- * @param object_type GType for the object
- * @param infos A DBusGObjectInfo pointer, this data is generated by dbus-binding-tool.
- */
-void
-purple_object_type_install_dbus_infos(GType object_type, const DBusGObjectInfo *infos)
-{
- GQuark quark = purple_object_type_dbus_metadata_quark();
- const DBusGObjectInfo *dbus_infos = infos;
-
- dbus_g_object_type_install_info(object_type, dbus_infos);
-
- g_type_set_qdata(object_type, quark, (gpointer)infos);
-}
-
-GPtrArray*
-purple_object_get_dbus_props(GType object_type, const char *interface)
-{
- GPtrArray *props_a;
- char *props;
- DBusGObjectInfo* infos;
-
- props_a = g_ptr_array_new();
- infos = g_type_get_qdata(object_type,
- purple_object_type_dbus_metadata_quark());
- g_return_val_if_fail(infos != NULL, NULL);
-
- props = (char*)infos->exported_properties;
- while (*props) {
- /* Only read properties that belongs to the correct interface */
- if (!strcmp(interface, props)) {
- /* Skip the interface name */
- while (*(props++));
- /* Pick the property name */
- g_ptr_array_add(props_a, g_strdup(props));
- /* Skip the property name */
- while (*(props++));
- } else {
- /* Skip the interface and property name */
- while (*(props++));
- while (*(props++));
- }
- }
-
- return props_a;
-}
#endif /* HAVE_DBUS */
int purple_object_get_int(PurpleObject *pobj, const char *prop)
============================================================
--- libpurple/pobject.h 6d9662eac30d696f9058925e13f7d3c4381e7f9f
+++ libpurple/pobject.h ad07b70ffa6ba8c1594117358e8a14da36fa681b
@@ -25,7 +25,6 @@
#include <glib-object.h>
#ifdef HAVE_DBUS
-# include <dbus/dbus-glib-bindings.h>
# include <gio/gio.h>
#endif
@@ -106,79 +105,6 @@ void purple_object_add_dbus_reg_id(Purpl
void purple_object_add_dbus_reg_id(PurpleObject *pobj, guint registration_id);
/**
- * Gets the dbus proxy. This is used in detachable sessions context only.
- * When a client is in remote mode, the gobjects it creates are kind of mirrors
- * of the remote object. They hold 2 dbus proxies and the last know state of
- * the gobject properties. The proxy returned by this function is the one for
- * the PurpleStuff object, such as im.pidgin.purple.account for PurpleAccount.
- *
- * @param pobj The PurpleObject we want to get the DBusDProxy from.
- * @return The DBusDProxy.
- */
-DBusGProxy * purple_object_get_dbus_obj_proxy(PurpleObject *pobj);
-
-/**
- * The same for the org.freedesktop.DBus.Properties interface.
- */
-DBusGProxy * purple_object_get_dbus_props_proxy(PurpleObject *pobj);
-
-/**
- * Gets the dbus interface name we use for purple related methods and signals,
- * e.g. im.pidgin.purple.account.
- */
-char* purple_object_get_dbus_obj_interface(PurpleObject *pobj);
-
-/**
- * Sets the dbus interface name we use for purple related methods and signals,
- * e.g. im.pidgin.purple.account.
- */
-void purple_object_set_dbus_obj_interface(PurpleObject *pobj, char* interface);
-
-/**
- * Checks whether we export a given property on the given dbus interface.
- *
- * @param pobj The PurpleObject which may hold the property.
- * @param interface The interface the property belongs to.
- * @param prop_name The name of the property to check.
- *
- * @return TRUE if we export the property on dbus, FALSE otherwise.
- */
-gboolean purple_object_have_dbus_property(PurpleObject *pobj, const gchar *interface, const gchar *prop_name);
-
-/**
- * Convenience function to install the dbus proxies, the dbus path and the
- * interface name in a PurpleObject. Depending on the running state of purple
- * (given by purple_core_get_running_mode()), this function will install the
- * appropriate informations.
- */
-void purple_object_install_dbus_infos(PurpleObject *pobj, char *dbus_interface, char *dbus_path);
-
-/**
- * A wrapper for dbus_g_object_type_install_info(), to let us catch these infos too.
- * This is used to catch the properties we want to export through DBus.
- * DBusGObjectInfo structs are usually automatically generated by
- * dbus-binding-tool and held in the dbus-*-server.h files.
- *
- * @param object_type GType for the object
- * @param infos A DBusGObjectInfo pointer, this data is generated by dbus-binding-tool.
- */
-void purple_object_type_install_dbus_infos(GType object_type, const DBusGObjectInfo *infos);
-
-/**
- * Grabs the dbus properties of a gobject's that belong to the specified
- * interface. This should return what <property> tags were defined
- * in the dbus-prototype/<stuff>.xml, inside the matching <interface> block.
- * Caller must have previously called purple_object_type_install_dbus_infos()
- * for this to work.
- *
- * @param object_type The object type the properties belong to.
- * @param interface The interface the properties belong to.
- *
- * @return An array of strings, the properties names.
- */
-GPtrArray* purple_object_get_dbus_props(GType object_type, const char *interface);
-
-/**
* Gets the dbus path associated with this PurpleObject.
* Each gobjects that are published on DBus have a path name (something like
* /im/purple/pidgin/stuff). Remote applications can access this object using
============================================================
--- libpurple/marshallers.list ea434d8c14012a61306ab3746284ecaee5cfc5cf
+++ libpurple/marshallers.list c5a4cd7ed04de076d46c5bdc1484ae828e1c11bc
@@ -13,13 +13,3 @@ VOID:STRING,STRING,OBJECT,OBJECT
VOID:ENUM,STRING,STRING,BOOLEAN
VOID:FLAGS,FLAGS
VOID:STRING,STRING,OBJECT,OBJECT
-# Marshaller for the DBusNotify dbus signal
-VOID:STRING,BOXED
-# Marshaller for the RunCallback dbus signal
-VOID:UINT64,BOXED
-# Marshaller for the PurpleConnectionCreated dbus signal
-VOID:STRING,BOOLEAN,STRING
-# Marshaller for the NotifyAdded and RequestAdd dbus signal
-VOID:STRING,STRING,STRING,STRING
-# Marshaller for the RequestAuthorize dbus signal
-VOID:STRING,STRING,STRING,STRING,BOOLEAN,UINT
============================================================
--- libpurple/dbus/account.c f7851b71a9bf68a2227823f736901941441ab2c6
+++ libpurple/dbus/account.c cc65c147a0334e959ae62d445e7c8affbfe28fa6
@@ -21,11 +21,11 @@
#include "internal.h"
#include "account.h"
+#include "core.h"
#include "dbus/account.h"
#include "dbus/callback.h"
#include "dbus/constructor.h"
-#include "dbus-maybe.h"
-#include "marshallers.h"
+#include "dbus-server.h"
#include "nullmarshaller.h"
/* move this, later */
============================================================
--- libpurple/dbus/constructor.c 19c8314099055637092ab419a6d95cd334d05d2a
+++ libpurple/dbus/constructor.c 6191321821a511542ac88911c4bbae93371832b7
@@ -19,21 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include <dbus/dbus-glib-bindings.h>
-
-/* Hack to allow purple_connection_new() in connection.h */
-#define _PURPLE_CONNECTION_C_
-
#include "internal.h"
#include "account.h"
#include "accountlist.h"
#include "connection.h"
+#include "core.h"
#include "dbus/constructor.h"
#include "dbus/constructor.xml.h"
-#include "dbus-maybe.h"
#include "dbus-server.h"
#include "debug.h"
-#include "marshallers.h"
#include "glib-2.30.h" /* g_dbus_gvariant_to_gvalue() */
============================================================
--- libpurple/dbus/callback.c 8ed8383726cfc5cdab93308448357391a77418fc
+++ libpurple/dbus/callback.c 14eb029f5779c905b3be5c6220cf9bb557dc35b0
@@ -19,17 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include <gobject/gvaluecollector.h> /* G_VALUE_COLLECT macro */
-
#include "internal.h"
#include "core.h"
#include "dbus/callback.h"
#include "dbus/callback.xml.h"
-#include "dbus-maybe.h"
-#include "dbus-purple.h"
#include "dbus-server.h"
#include "debug.h"
-#include "marshallers.h"
/**
* PurpleDBusCallback, a singleteon class that aims to run handle application
============================================================
--- libpurple/dbus/connection.c 1a9101cdcde6cea30d009b14347d627940b675a2
+++ libpurple/dbus/connection.c 943ad93224424d661493d0111114b9cbece94829
@@ -25,7 +25,6 @@
#include "dbus/connection.xml.h"
#include "dbus/constructor.h"
#include "dbus-server.h"
-#include "dbus-purple.h"
#include "pobject.h"
#define DBUS_CONNECTION_BASEPATH "/im/pidgin/purple/connection"
============================================================
--- libpurple/dbus/group.c 3b71ec22a705e9e1ee2cafd3a43def3d07be7b4a
+++ libpurple/dbus/group.c 1b5dce5aefd4ad7e2b90c83faeb66cd0b6f6559a
@@ -24,7 +24,6 @@
#include "dbus/constructor.h"
#include "dbus/group.h"
#include "dbus/group.xml.h"
-#include "dbus-purple.h"
#include "dbus-server.h"
#include "pobject.h"
============================================================
--- libpurple/dbus/contact.c 7ab2f7a862d838c28052d8d74eb288c0915124ed
+++ libpurple/dbus/contact.c 15744115aeed7a7e67b076572289f4e02ec82c40
@@ -24,7 +24,6 @@
#include "dbus/constructor.h"
#include "dbus/contact.h"
#include "dbus/contact.xml.h"
-#include "dbus-purple.h"
#include "dbus-server.h"
#include "pobject.h"
============================================================
--- libpurple/dbus/buddy.c 52451bef5ae0f2923976428249599d02bc5f4676
+++ libpurple/dbus/buddy.c ad4fdccc63a06d20b2e508fb9924c51de1750593
@@ -24,7 +24,6 @@
#include "dbus/constructor.h"
#include "dbus/buddy.h"
#include "dbus/buddy.xml.h"
-#include "dbus-purple.h"
#include "dbus-server.h"
#include "pobject.h"
============================================================
--- libpurple/dbus/chat.c 48814453edc428d4265ca69f0d418cdb6701a639
+++ libpurple/dbus/chat.c 82b98880b8abafc52ebfcedfaf1e698f54fc3f60
@@ -25,7 +25,6 @@
#include "dbus/chat.h"
#include "dbus/chat.xml.h"
#include "dbus/constructor.h"
-#include "dbus-purple.h"
#include "dbus-server.h"
#include "pobject.h"
More information about the Commits
mailing list