--- a/emailuis/nmailui/inc/nmattachmentpicker.h	Thu May 27 12:43:55 2010 +0300
+++ b/emailuis/nmailui/inc/nmattachmentpicker.h	Fri Jun 11 13:27:14 2010 +0300
@@ -20,12 +20,6 @@
 
 #include <QObject>
 
-#define IMAGE_FETCHER_INTERFACE "Image"
-#define AUDIO_FETCHER_INTERFACE "com.nokia.services.media.Music"
-
-#define IMAGE_FETCHER_OPERATION "fetch(QVariantMap,QVariant)"
-#define AUDIO_FETCHER_OPERATION "fetch(QString)"
-
 class XQAiwRequest;
 
 /**
@@ -44,14 +38,18 @@
     void fetchImage();
     void fetchAudio();    
     void fetchVideo();
-    void fetchOther();       
+    void fetchOther();  
+    void fetchCameraStill();
+    void fetchCameraVideo();
 
 signals:
     void attachmentsFetchOk(const QVariant& fileNames);
     void attachmentsFetchError(int errorCode, const QString& errorMessage);
     
 private:   
-    void fetch(const QString& interface, const QString& operation); 
+    void fetch(const QString& interface, const QString& operation, 
+        const QList<QVariant>* args = 0); 
+    void fetchFromCamera(int mode);
     
 private:
     XQAiwRequest *mRequest;