X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.h;h=2aeb7469326305e83d99640562056509ed8b929a;hp=a4db5668305b4e2438b220b2819a7cce3f3d832f;hb=12a672c559d983c4e49a7e4054ee14c0177ecb1c;hpb=fa8cfc5abf9fd542fe3fa058f7e2eef294b8121a

diff --git a/src/dbus_api/modest-dbus-callbacks.h b/src/dbus_api/modest-dbus-callbacks.h
index a4db566..2aeb746 100644
--- a/src/dbus_api/modest-dbus-callbacks.h
+++ b/src/dbus_api/modest-dbus-callbacks.h
@@ -33,18 +33,15 @@
 
 #include <glib.h>
 #include <libosso.h>
-
-/* Note that the com.nokia service name and /com/nokia object name 
- * are what is assumed by the, bizarrely named, osso_rpc_run_with_defaults() function, 
- * so they are probably a good choice. */
-#define MODEST_DBUS_NAME    "modestemail"
-#define MODEST_DBUS_EXAMPLE_SERVICE "com.nokia."MODEST_DBUS_NAME
-#define MODEST_DBUS_EXAMPLE_OBJECT  "/com/nokia/"MODEST_DBUS_NAME
-#define MODEST_DBUS_EXAMPLE_IFACE   "com.nokia."MODEST_DBUS_NAME
-#define MODEST_DBUS_EXAMPLE_MESSAGE "HelloWorld"
+#include <libmodest-dbus-client/libmodest-dbus-api.h>
 
 gint modest_dbus_req_handler(const gchar * interface, const gchar * method,
                       GArray * arguments, gpointer data,
                       osso_rpc_t * retval);
-                      
+
+void modest_osso_cb_hw_state_handler(osso_hw_state_t *state, gpointer data);
+
+DBusHandlerResult modest_dbus_req_filter (DBusConnection *con,
+			DBusMessage    *message,
+			void           *user_data);
 #endif /* __MODEST_DBUS_CALLBACKS_H__ */