/* 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
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__ */