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

diff --git a/src/dbus_api/modest-dbus-api.h b/src/dbus_api/modest-dbus-api.h
index c43cf50..278ba39 100644
--- 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,
-	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__ */