X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-api.h;h=278ba3950f19cb8c3b2eba9882719c04d2dc95f9;hb=045b188038e81aebbc7fc4b899537cd8f61f80c8;hp=8381d71e9b5f5b49c22988e803b2e8d6734dd194;hpb=140b3a1e00f1d04e8fd2683e9b77aba8bf79c2d5;p=modest

diff --git a/src/dbus_api/modest-dbus-api.h b/src/dbus_api/modest-dbus-api.h
index 8381d71..278ba39 100644
--- a/src/dbus_api/modest-dbus-api.h
+++ b/src/dbus_api/modest-dbus-api.h
@@ -35,22 +35,11 @@
 /* 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_NAME    "modest"
 #define MODEST_DBUS_SERVICE "com.nokia."MODEST_DBUS_NAME
 #define MODEST_DBUS_OBJECT  "/com/nokia/"MODEST_DBUS_NAME
 #define MODEST_DBUS_IFACE   "com.nokia."MODEST_DBUS_NAME
 
-#define MODEST_DBUS_METHOD_SEND_MAIL "SendMail"
-enum ModestDbusSendMailArguments
-{
-	MODEST_DEBUS_SEND_MAIL_ARG_TO,
-	MODEST_DEBUS_SEND_MAIL_ARG_CC,
-	MODEST_DEBUS_SEND_MAIL_ARG_BCC,
-	MODEST_DEBUS_SEND_MAIL_ARG_SUBJECT,
-	MODEST_DEBUS_SEND_MAIL_ARG_BODY,
-	/* TODO: MODEST_DEBUS_SEND_MAIL_ARG_ATTACHMENTS, */
-	MODEST_DEBUS_SEND_MAIL_ARGS_COUNT
-};
 
 #define MODEST_DBUS_METHOD_MAIL_TO "MailTo"
 enum ModestDbusMailToArguments
@@ -66,5 +55,32 @@ enum ModestDbusOpenMessageArguments
 	MODEST_DEBUS_OPEN_MESSAGE_ARGS_COUNT
 };
 
-#endif /* __MODEST_DBUS_API__ */
+#define MODEST_DBUS_METHOD_SEND_RECEIVE "SendReceive"
 
+#define MODEST_DBUS_METHOD_COMPOSE_MAIL "ComposeMail"
+enum ModestDbusComposeMailArguments
+{
+	MODEST_DEBUS_COMPOSE_MAIL_ARG_TO,
+	MODEST_DEBUS_COMPOSE_MAIL_ARG_CC,
+	MODEST_DEBUS_COMPOSE_MAIL_ARG_BCC,
+	MODEST_DEBUS_COMPOSE_MAIL_ARG_SUBJECT,
+	MODEST_DEBUS_COMPOSE_MAIL_ARG_BODY,
+	MODEST_DEBUS_COMPOSE_MAIL_ARG_ATTACHMENTS,
+	MODEST_DEBUS_COMPOSE_MAIL_ARGS_COUNT
+};
+
+#define MODEST_DBUS_METHOD_DELETE_MESSAGE "DeleteMessage"
+enum ModestDbusDeleteMessageArguments
+{
+	MODEST_DEBUS_DELETE_MESSAGE_ARG_URI,
+	MODEST_DEBUS_DELETE_MESSAGE_ARGS_COUNT
+};
+
+#define MODEST_DBUS_METHOD_OPEN_DEFAULT_INBOX "OpenDefaultInbox"
+
+/* These are handle via normal D-Bus instead of osso-rpc: */
+#define MODEST_DBUS_METHOD_SEARCH "Search"
+#define MODEST_DBUS_METHOD_GET_FOLDERS "GetFolders"
+
+
+#endif /* __MODEST_DBUS_API__ */