2007-06-26 Murray Cumming <murrayc@murrayc.com>

[modest] / src / dbus_api / modest-dbus-api.h

diff --git a/src/dbus_api/modest-dbus-api.h b/src/dbus_api/modest-dbus-api.h
index 2a02242..278ba39 100644 (file)
--- a/src/dbus_api/modest-dbus-api.h
+++ b/src/dbus_api/modest-dbus-api.h
@@ -40,17 +40,6 @@
 #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
@@ -80,8 +69,6 @@ enum ModestDbusComposeMailArguments
        MODEST_DEBUS_COMPOSE_MAIL_ARGS_COUNT
 };
 
-#define MODEST_DBUS_METHOD_SEARCH "Search"
-
 #define MODEST_DBUS_METHOD_DELETE_MESSAGE "DeleteMessage"
 enum ModestDbusDeleteMessageArguments
 {
@@ -91,7 +78,9 @@ enum ModestDbusDeleteMessageArguments
 
 #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__ */