Hey,
Here is a patch that tries to improve the e_dbus wrapper around dbus. It
is not perfect as there is still a problem: dbus declares DBusConnection
and e_dbus declares E_DBus_Connection. I'm a bit stick on how I can rename
DBusConnection.
So if someone has an idea...
Vincent
Index: e_dbus_signal.c
===================================================================
--- e_dbus_signal.c (revision 51312)
+++ e_dbus_signal.c (working copy)
@@ -19,7 +19,7 @@
unsigned char delete_me : 1;
};
-static void cb_signal_dispatcher(E_DBus_Connection *conn, DBusMessage *msg);
+static void cb_signal_dispatcher(E_DBus_Connection *conn, E_DBus_Message *msg);
/**
* Free a signal handler
@@ -39,7 +39,7 @@
};
static void
-cb_name_owner(void *data, DBusMessage *msg, DBusError *err)
+cb_name_owner(void *data, E_DBus_Message *msg, E_DBus_Error *err)
{
const char *unique_name = NULL;
struct cb_name_owner_data *d = data;
@@ -49,12 +49,12 @@
sh->get_name_owner_pending = NULL;
free(d);
- if (dbus_error_is_set(err))
+ if (dbus_error_is_set((DBusError *)err))
goto error;
- dbus_message_get_args(msg, err, DBUS_TYPE_STRING, &unique_name, DBUS_TYPE_INVALID);
+ dbus_message_get_args(msg, (DBusError *)err, DBUS_TYPE_STRING, &unique_name, DBUS_TYPE_INVALID);
- if (dbus_error_is_set(err))
+ if (dbus_error_is_set((DBusError *)err))
goto error;
// if (!unique_name)
@@ -74,7 +74,7 @@
conn->signal_handlers = eina_list_remove(conn->signal_handlers, sh);
e_dbus_signal_handler_free(sh);
*/
- dbus_error_free(err);
+ dbus_error_free((DBusError *)err);
}
static int
@@ -266,7 +266,7 @@
}
static void
-cb_signal_dispatcher(E_DBus_Connection *conn, DBusMessage *msg)
+cb_signal_dispatcher(E_DBus_Connection *conn, E_DBus_Message *msg)
{
E_DBus_Signal_Handler *sh;
Eina_List *l;
Index: e_dbus_util.c
===================================================================
--- e_dbus_util.c (revision 51312)
+++ e_dbus_util.c (working copy)
@@ -38,14 +38,14 @@
}
EAPI void
-e_dbus_callback_call(E_DBus_Callback *cb, void *data, DBusError *error)
+e_dbus_callback_call(E_DBus_Callback *cb, void *data, E_DBus_Error *error)
{
if (cb && cb->cb_func)
cb->cb_func(cb->user_data, data, error);
}
EAPI void *
-e_dbus_callback_unmarshal(E_DBus_Callback *cb, DBusMessage *msg, DBusError *err)
+e_dbus_callback_unmarshal(E_DBus_Callback *cb, E_DBus_Message *msg, E_DBus_Error *err)
{
if (cb && cb->unmarshal_func)
return cb->unmarshal_func(msg, err);
Index: e_dbus_private.h
===================================================================
--- e_dbus_private.h (revision 51312)
+++ e_dbus_private.h (working copy)
@@ -1,6 +1,8 @@
#ifndef E_DBUS_PRIVATE_H
#define E_DBUS_PRIVATE_H
+#include <dbus/dbus.h>
+
#include <Ecore.h>
#include "E_DBus.h"
@@ -17,14 +19,14 @@
struct E_DBus_Connection
{
- DBusBusType shared_type;
+ E_DBus_Bus_Type shared_type;
DBusConnection *conn;
char *conn_name;
Eina_List *fd_handlers;
Eina_List *timeouts;
Eina_List *signal_handlers;
- void (*signal_dispatcher)(E_DBus_Connection *conn, DBusMessage *msg);
+ void (*signal_dispatcher)(E_DBus_Connection *conn, E_DBus_Message *msg);
Ecore_Idler *idler;
Index: e_dbus.c
===================================================================
--- e_dbus.c (revision 51312)
+++ e_dbus.c (working copy)
@@ -445,7 +445,7 @@
* @param type the type of bus to connect to, e.g. DBUS_BUS_SYSTEM or DBUS_BUS_SESSION
*/
EAPI E_DBus_Connection *
-e_dbus_bus_get(DBusBusType type)
+e_dbus_bus_get(E_DBus_Bus_Type type)
{
DBusError err;
E_DBus_Connection *econn;
Index: e_dbus_interfaces.c
===================================================================
--- e_dbus_interfaces.c (revision 51312)
+++ e_dbus_interfaces.c (working copy)
@@ -44,7 +44,7 @@
* @param cb_return a callback for a successful return
* @param data data to pass to the callbacks
*/
-EAPI DBusPendingCall *
+EAPI E_DBus_Pending_Call *
e_dbus_peer_ping(E_DBus_Connection *conn, const char *destination, const char *path, E_DBus_Method_Return_Cb cb_return, const void *data)
{
return _dbus_peer_call(conn, "Ping", destination, path, cb_return, data);
@@ -59,7 +59,7 @@
* @param cb_return a callback for a successful return
* @param data data to pass to the callbacks
*/
-EAPI DBusPendingCall *
+EAPI E_DBus_Pending_Call *
e_dbus_peer_get_machine_id(E_DBus_Connection *conn, const char *destination, const char *path, E_DBus_Method_Return_Cb cb_return, const void *data)
{
return _dbus_peer_call(conn, "GetMachineId", destination, path, cb_return, data);
@@ -99,7 +99,7 @@
return msg;
}
-EAPI DBusPendingCall *
+EAPI E_DBus_Pending_Call *
e_dbus_properties_get_all(E_DBus_Connection *conn, const char *destination, const char *path, const char *interface, E_DBus_Method_Return_Cb cb_return, const void *data)
{
DBusMessage *msg;
@@ -130,7 +130,7 @@
* @param cb_return a callback for a successful return
* @param data data to pass to the callbacks
*/
-EAPI DBusPendingCall *
+EAPI E_DBus_Pending_Call *
e_dbus_properties_get(E_DBus_Connection *conn, const char *destination, const char *path, const char *interface, const char *property, E_DBus_Method_Return_Cb cb_return, const void *data)
{
DBusMessage *msg;
@@ -163,7 +163,7 @@
* @param cb_return a callback for a successful return
* @param data data to pass to the callbacks
*/
-EAPI DBusPendingCall *
+EAPI E_DBus_Pending_Call *
e_dbus_properties_set(E_DBus_Connection *conn, const char *destination, const char *path, const char *interface, const char *property, int value_type, const void *value, E_DBus_Method_Return_Cb cb_return, const void *data)
{
DBusMessage *msg;
@@ -178,7 +178,7 @@
{
dbus_error_init(&err);
dbus_set_error(&err, "org.enlightenment.DBus.InvalidType", "Only basic types may be set using e_dbus_properties_set()");
- cb_return((void *)data, NULL, &err);
+ cb_return((void *)data, NULL, (E_DBus_Error *)&err);
}
return NULL;
Index: e_dbus_methods.c
===================================================================
--- e_dbus_methods.c (revision 51312)
+++ e_dbus_methods.c (working copy)
@@ -76,7 +76,7 @@
* @param data The data to associate with the callback
* @return A pending dbus call
*/
-EAPI DBusPendingCall *
+EAPI E_DBus_Pending_Call *
e_dbus_introspect(E_DBus_Connection *conn, const char *bus, const char *object_path, E_DBus_Method_Return_Cb cb_return, const void *data)
{
DBusPendingCall *ret;
@@ -97,7 +97,7 @@
return ret;
}
-EAPI DBusPendingCall *
+EAPI E_DBus_Pending_Call *
e_dbus_request_name(E_DBus_Connection *conn, const char *name, unsigned int flags, E_DBus_Method_Return_Cb cb_return, const void *data)
{
DBusPendingCall *ret;
@@ -121,40 +121,40 @@
return ret;
}
-EAPI DBusPendingCall *
+EAPI E_DBus_Pending_Call *
e_dbus_release_name(E_DBus_Connection *conn, const char *name, E_DBus_Method_Return_Cb cb_return, const void *data)
{
return _dbus_call__str(conn, "ReleaseName", name, cb_return, data);
}
-EAPI DBusPendingCall *
+EAPI E_DBus_Pending_Call *
e_dbus_get_name_owner(E_DBus_Connection *conn, const char *name, E_DBus_Method_Return_Cb cb_return, const void *data)
{
return _dbus_call__str(conn, "GetNameOwner", name, cb_return, data);
}
-EAPI DBusPendingCall *
+EAPI E_DBus_Pending_Call *
e_dbus_list_names(E_DBus_Connection *conn, E_DBus_Method_Return_Cb cb_return, const void *data)
{
return _dbus_call__void(conn, "ListNames", cb_return, data);
}
-EAPI DBusPendingCall *
+EAPI E_DBus_Pending_Call *
e_dbus_list_activatable_names(E_DBus_Connection *conn, E_DBus_Method_Return_Cb cb_return, const void *data)
{
return _dbus_call__void(conn, "ListActivatableNames", cb_return, data);
}
-EAPI DBusPendingCall *
+EAPI E_DBus_Pending_Call *
e_dbus_name_has_owner(E_DBus_Connection *conn, const char *name, E_DBus_Method_Return_Cb cb_return, const void *data)
{
return _dbus_call__str(conn, "NameHasOwner", name, cb_return, data);
}
-EAPI DBusPendingCall *
+EAPI E_DBus_Pending_Call *
e_dbus_start_service_by_name(E_DBus_Connection *conn, const char *name, unsigned int flags, E_DBus_Method_Return_Cb cb_return, const void *data)
{
const char method_name[] = "StartServiceByName";
Index: e_dbus_message.c
===================================================================
--- e_dbus_message.c (revision 51312)
+++ e_dbus_message.c (working copy)
@@ -14,7 +14,7 @@
static void
cb_pending(DBusPendingCall *pending, void *user_data)
{
- DBusMessage *msg;
+ E_DBus_Message *msg;
DBusError err;
E_DBus_Pending_Call_Data *data = user_data;
@@ -33,7 +33,7 @@
if (data->cb_return)
{
dbus_set_error(&err, "org.enlightenment.DBus.NoReply", "There was no reply to this method call.");
- data->cb_return(data->data, NULL, &err);
+ data->cb_return(data->data, NULL, (E_DBus_Error *)&err);
dbus_error_free(&err);
}
return;
@@ -42,13 +42,13 @@
if (dbus_set_error_from_message(&err, msg))
{
if (data->cb_return)
- data->cb_return(data->data, NULL, &err);
+ data->cb_return(data->data, NULL, (E_DBus_Error *)&err);
dbus_error_free(&err);
}
else
{
if (data->cb_return)
- data->cb_return(data->data, msg, &err);
+ data->cb_return(data->data, msg, (E_DBus_Error *)&err);
}
dbus_message_unref(msg);
@@ -65,8 +65,8 @@
* @param data custom data to pass in to the callback
* @return a DBusPendingCall that can be used to cancel the current call
*/
-EAPI DBusPendingCall *
-e_dbus_message_send(E_DBus_Connection *conn, DBusMessage *msg, E_DBus_Method_Return_Cb cb_return, int timeout, void *data)
+EAPI E_DBus_Pending_Call *
+e_dbus_message_send(E_DBus_Connection *conn, E_DBus_Message *msg, E_DBus_Method_Return_Cb cb_return, int timeout, void *data)
{
DBusPendingCall *pending;
@@ -94,7 +94,7 @@
}
static void
-cb_method_call(void *data, DBusMessage *msg, DBusError *err)
+cb_method_call(void *data, E_DBus_Message *msg, E_DBus_Error *err)
{
E_DBus_Callback *cb = data;
void *method_return = NULL;
@@ -102,12 +102,12 @@
if (!cb) return;
dbus_error_init(&new_err);
- if (!dbus_error_is_set(err))
- method_return = e_dbus_callback_unmarshal(cb, msg, &new_err);
+ if (!dbus_error_is_set((DBusError *)err))
+ method_return = e_dbus_callback_unmarshal(cb, msg, (E_DBus_Error *)&new_err);
else
- dbus_move_error(err, &new_err);
+ dbus_move_error((DBusError *)err, &new_err);
- e_dbus_callback_call(cb, method_return, &new_err);
+ e_dbus_callback_call(cb, method_return, (E_DBus_Error *)&new_err);
e_dbus_callback_return_free(cb, method_return);
if (dbus_error_is_set(&new_err))
@@ -116,8 +116,8 @@
e_dbus_callback_free(cb);
}
-EAPI DBusPendingCall *
-e_dbus_method_call_send(E_DBus_Connection *conn, DBusMessage *msg, E_DBus_Unmarshal_Func unmarshal_func, E_DBus_Callback_Func cb_func, E_DBus_Free_Func free_func, int timeout, void *data)
+EAPI E_DBus_Pending_Call *
+e_dbus_method_call_send(E_DBus_Connection *conn, E_DBus_Message *msg, E_DBus_Unmarshal_Func unmarshal_func, E_DBus_Callback_Func cb_func, E_DBus_Free_Func free_func, int timeout, void *data)
{
E_DBus_Callback *cb;
cb = e_dbus_callback_new(cb_func, unmarshal_func, free_func, data);
Index: E_DBus.h
===================================================================
--- E_DBus.h (revision 51312)
+++ E_DBus.h (working copy)
@@ -16,7 +16,7 @@
# define DBUS_API_SUBJECT_TO_CHANGE
#endif
-#include <dbus/dbus.h>
+/* #include <dbus/dbus.h> */
#include <Eina.h>
#ifdef EAPI
@@ -102,7 +102,31 @@
#define E_DBUS_VERSION_MAJOR 1
#define E_DBUS_VERSION_MINOR 0
-
+
+ typedef enum _E_DBus_Bus_Type
+ {
+ EDBUS_BUS_SESSION, /**< The login session bus */
+ EDBUS_BUS_SYSTEM, /**< The systemwide bus */
+ EDBUS_BUS_STARTER /**< The bus that started us, if any */
+ } E_DBus_Bus_Type;
+
+ typedef void E_DBus_Message;
+ typedef void E_DBus_Pending_Call;
+
+ typedef struct _E_DBus_Error
+ {
+ const char *name; /**< public error name field */
+ const char *message; /**< public error message field */
+
+ unsigned int dummy1 : 1; /**< placeholder */
+ unsigned int dummy2 : 1; /**< placeholder */
+ unsigned int dummy3 : 1; /**< placeholder */
+ unsigned int dummy4 : 1; /**< placeholder */
+ unsigned int dummy5 : 1; /**< placeholder */
+
+ void *padding1; /**< placeholder */
+ } E_DBus_Error;
+
typedef struct _E_DBus_Version
{
int major;
@@ -121,9 +145,9 @@
typedef struct E_DBus_Interface E_DBus_Interface;
typedef struct E_DBus_Signal_Handler E_DBus_Signal_Handler;
- typedef DBusMessage *(* E_DBus_Method_Cb)(E_DBus_Object *obj, DBusMessage *message);
- typedef void (*E_DBus_Method_Return_Cb) (void *data, DBusMessage *msg, DBusError *error);
- typedef void (*E_DBus_Signal_Cb) (void *data, DBusMessage *msg);
+ typedef E_DBus_Message *(* E_DBus_Method_Cb)(E_DBus_Object *obj, E_DBus_Message *message);
+ typedef void (*E_DBus_Method_Return_Cb) (void *data, E_DBus_Message *msg, E_DBus_Error *error);
+ typedef void (*E_DBus_Signal_Cb) (void *data, E_DBus_Message *msg);
typedef void (*E_DBus_Object_Property_Get_Cb) (E_DBus_Object *obj, const char *property, int *type, void **value);
typedef int (*E_DBus_Object_Property_Set_Cb) (E_DBus_Object *obj, const char *property, int type, void *value);
@@ -133,8 +157,8 @@
* @param user_data the data passed in to the method call
* @param event_data a struct containing the return data.
*/
- typedef void (*E_DBus_Callback_Func) (void *user_data, void *method_return, DBusError *error);
- typedef void *(*E_DBus_Unmarshal_Func) (DBusMessage *msg, DBusError *err);
+ typedef void (*E_DBus_Callback_Func) (void *user_data, void *method_return, E_DBus_Error *error);
+ typedef void *(*E_DBus_Unmarshal_Func) (E_DBus_Message *msg, E_DBus_Error *err);
typedef void (*E_DBus_Free_Func) (void *data);
typedef struct E_DBus_Callback E_DBus_Callback;
@@ -145,7 +169,7 @@
/* setting up the connection */
- EAPI E_DBus_Connection *e_dbus_bus_get(DBusBusType type);
+ EAPI E_DBus_Connection *e_dbus_bus_get(E_DBus_Bus_Type type);
EAPI void e_dbus_connection_ref(E_DBus_Connection *conn);
@@ -176,9 +200,9 @@
/* sending method calls */
- EAPI DBusPendingCall *e_dbus_message_send(E_DBus_Connection *conn, DBusMessage *msg, E_DBus_Method_Return_Cb cb_return, int timeout, void *data);
+ EAPI E_DBus_Pending_Call *e_dbus_message_send(E_DBus_Connection *conn, E_DBus_Message *msg, E_DBus_Method_Return_Cb cb_return, int timeout, void *data);
- EAPI DBusPendingCall *e_dbus_method_call_send(E_DBus_Connection *conn, DBusMessage *msg, E_DBus_Unmarshal_Func unmarshal_func, E_DBus_Callback_Func cb_func, E_DBus_Free_Func free_func, int timeout, void *data);
+ EAPI E_DBus_Pending_Call *e_dbus_method_call_send(E_DBus_Connection *conn, E_DBus_Message *msg, E_DBus_Unmarshal_Func unmarshal_func, E_DBus_Callback_Func cb_func, E_DBus_Free_Func free_func, int timeout, void *data);
/* signal receiving */
@@ -188,50 +212,50 @@
/* standard dbus method calls */
- EAPI DBusPendingCall *e_dbus_request_name(E_DBus_Connection *conn, const char *name,
+ EAPI E_DBus_Pending_Call *e_dbus_request_name(E_DBus_Connection *conn, const char *name,
unsigned int flags,
E_DBus_Method_Return_Cb cb_return,
const void *data);
- EAPI DBusPendingCall *e_dbus_release_name(E_DBus_Connection *conn, const char *name,
+ EAPI E_DBus_Pending_Call *e_dbus_release_name(E_DBus_Connection *conn, const char *name,
E_DBus_Method_Return_Cb cb_return,
const void *data);
- EAPI DBusPendingCall *e_dbus_get_name_owner(E_DBus_Connection *conn, const char *name,
+ EAPI E_DBus_Pending_Call *e_dbus_get_name_owner(E_DBus_Connection *conn, const char *name,
E_DBus_Method_Return_Cb cb_return,
const void *data);
- EAPI DBusPendingCall *e_dbus_list_names(E_DBus_Connection *conn,
+ EAPI E_DBus_Pending_Call *e_dbus_list_names(E_DBus_Connection *conn,
E_DBus_Method_Return_Cb cb_return,
const void *data);
- EAPI DBusPendingCall *e_dbus_list_activatable_names(E_DBus_Connection *conn,
+ EAPI E_DBus_Pending_Call *e_dbus_list_activatable_names(E_DBus_Connection *conn,
E_DBus_Method_Return_Cb cb_return,
const void *data);
- EAPI DBusPendingCall *e_dbus_name_has_owner(E_DBus_Connection *conn, const char *name,
+ EAPI E_DBus_Pending_Call *e_dbus_name_has_owner(E_DBus_Connection *conn, const char *name,
E_DBus_Method_Return_Cb cb_return,
const void *data);
- EAPI DBusPendingCall *e_dbus_start_service_by_name(E_DBus_Connection *conn, const char *name, unsigned int flags,
+ EAPI E_DBus_Pending_Call *e_dbus_start_service_by_name(E_DBus_Connection *conn, const char *name, unsigned int flags,
E_DBus_Method_Return_Cb cb_return,
const void *data);
/* standard methods calls on objects */
- EAPI DBusPendingCall *e_dbus_introspect(E_DBus_Connection *conn, const char *bus,
+ EAPI E_DBus_Pending_Call *e_dbus_introspect(E_DBus_Connection *conn, const char *bus,
const char *object_path, E_DBus_Method_Return_Cb cb_return, const void *data);
- EAPI DBusPendingCall *e_dbus_peer_ping(E_DBus_Connection *conn, const char *destination,
+ EAPI E_DBus_Pending_Call *e_dbus_peer_ping(E_DBus_Connection *conn, const char *destination,
const char *path, E_DBus_Method_Return_Cb cb_return,
const void *data);
- EAPI DBusPendingCall *e_dbus_peer_get_machine_id(E_DBus_Connection *conn,
+ EAPI E_DBus_Pending_Call *e_dbus_peer_get_machine_id(E_DBus_Connection *conn,
const char *destination, const char *path,
E_DBus_Method_Return_Cb cb_return,
const void *data);
- EAPI DBusPendingCall *e_dbus_properties_get_all(E_DBus_Connection *conn, const char *destination,
+ EAPI E_DBus_Pending_Call *e_dbus_properties_get_all(E_DBus_Connection *conn, const char *destination,
const char *path, const char *interface,
E_DBus_Method_Return_Cb cb_return,
const void *data);
- EAPI DBusPendingCall *e_dbus_properties_get(E_DBus_Connection *conn, const char *destination,
+ EAPI E_DBus_Pending_Call *e_dbus_properties_get(E_DBus_Connection *conn, const char *destination,
const char *path, const char *interface,
const char *property,
E_DBus_Method_Return_Cb cb_return,
const void *data);
- EAPI DBusPendingCall *e_dbus_properties_set(E_DBus_Connection *conn, const char *destination,
+ EAPI E_DBus_Pending_Call *e_dbus_properties_set(E_DBus_Connection *conn, const char *destination,
const char *path, const char *interface,
const char *property, int value_type,
const void *value, E_DBus_Method_Return_Cb cb_return,
@@ -241,8 +265,8 @@
EAPI E_DBus_Callback *e_dbus_callback_new(E_DBus_Callback_Func cb_func, E_DBus_Unmarshal_Func unmarshal_func, E_DBus_Free_Func free_func, void *user_data);
EAPI void e_dbus_callback_free(E_DBus_Callback *callback);
- EAPI void e_dbus_callback_call(E_DBus_Callback *cb, void *data, DBusError *error);
- EAPI void *e_dbus_callback_unmarshal(E_DBus_Callback *cb, DBusMessage *msg, DBusError *err);
+ EAPI void e_dbus_callback_call(E_DBus_Callback *cb, void *data, E_DBus_Error *error);
+ EAPI void *e_dbus_callback_unmarshal(E_DBus_Callback *cb, E_DBus_Message *msg, E_DBus_Error *err);
EAPI void e_dbus_callback_return_free(E_DBus_Callback *callback, void *data);
#ifdef __cplusplus
Index: e_dbus_object.c
===================================================================
--- e_dbus_object.c (revision 51312)
+++ e_dbus_object.c (working copy)
@@ -15,7 +15,7 @@
Eina_Strbuf * e_dbus_object_introspect(E_DBus_Object *obj);
static void e_dbus_object_unregister(DBusConnection *conn, void *user_data);
-static DBusHandlerResult e_dbus_object_handler(DBusConnection *conn, DBusMessage *message, void *user_data);
+static DBusHandlerResult e_dbus_object_handler(DBusConnection *conn, E_DBus_Message *message, void *user_data);
static void e_dbus_interface_free(E_DBus_Interface *iface);
@@ -80,10 +80,10 @@
char *signature;
};
-static DBusMessage *
-cb_introspect(E_DBus_Object *obj, DBusMessage *msg)
+static E_DBus_Message *
+cb_introspect(E_DBus_Object *obj, E_DBus_Message *msg)
{
- DBusMessage *ret;
+ E_DBus_Message *ret;
Eina_Strbuf *buf;
if (obj->introspection_dirty || !obj->introspection_data)
@@ -106,10 +106,10 @@
return ret;
}
-static DBusMessage *
-cb_properties_get(E_DBus_Object *obj, DBusMessage *msg)
+static E_DBus_Message *
+cb_properties_get(E_DBus_Object *obj, E_DBus_Message *msg)
{
- DBusMessage *reply;
+ E_DBus_Message *reply;
DBusMessageIter iter, sub;
DBusError err;
int type;
@@ -145,8 +145,8 @@
}
}
-static DBusMessage *
-cb_properties_set(E_DBus_Object *obj, DBusMessage *msg)
+static E_DBus_Message *
+cb_properties_set(E_DBus_Object *obj, E_DBus_Message *msg)
{
DBusMessageIter iter, sub;
int type;
@@ -526,11 +526,11 @@
}
static DBusHandlerResult
-e_dbus_object_handler(DBusConnection *conn, DBusMessage *message, void *user_data)
+e_dbus_object_handler(DBusConnection *conn, E_DBus_Message *message, void *user_data)
{
E_DBus_Object *obj;
E_DBus_Method *m;
- DBusMessage *reply;
+ E_DBus_Message *reply;
dbus_uint32_t serial;
obj = user_data;
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
