Replaced references to MyDocs with environment variable

pmo-trunk-r6484

diff --git a/src/hildon2/modest-maemo-utils.c b/src/hildon2/modest-maemo-utils.c
index 5a2e524..0aa0c6c 100644 (file)
--- a/src/hildon2/modest-maemo-utils.c
+++ b/src/hildon2/modest-maemo-utils.c
@@ -204,7 +204,7 @@ modest_maemo_utils_setup_images_filechooser (GtkFileChooser *chooser)
 
        /* Set the default folder to images folder */
        images_folder = g_build_filename (g_get_home_dir (), 
-                                         MODEST_MAEMO_UTILS_MYDOCS_FOLDER,
+                                         g_getenv (MODEST_MAEMO_UTILS_MYDOCS_ENV),
                                          MODEST_MAEMO_UTILS_DEFAULT_IMAGE_FOLDER, NULL);
        gtk_file_chooser_set_current_folder (chooser, images_folder);
        g_free (images_folder);

diff --git a/src/hildon2/modest-maemo-utils.h b/src/hildon2/modest-maemo-utils.h
index 3bf1c5b..48a2139 100644 (file)
--- a/src/hildon2/modest-maemo-utils.h
+++ b/src/hildon2/modest-maemo-utils.h
@@ -39,7 +39,7 @@
 #include "widgets/modest-validating-entry.h"
 #include <hildon/hildon-gtk.h>
 
-#define MODEST_MAEMO_UTILS_MYDOCS_FOLDER "MyDocs"
+#define MODEST_MAEMO_UTILS_MYDOCS_ENV "MYDOCSDIR"
 #define MODEST_MAEMO_UTILS_DEFAULT_IMAGE_FOLDER ".images"
 
 

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index 547eff2..cf48dc7 100644 (file)
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -64,7 +64,8 @@
 #include <glib/gstdio.h>
 #include <modest-debug.h>
 
-#define DEFAULT_FOLDER "MyDocs/.documents"
+#define MYDOCS_ENV "MYDOCSDIR"
+#define DOCS_FOLDER ".documents"
 
 static void  modest_msg_view_window_class_init   (ModestMsgViewWindowClass *klass);
 static void  modest_msg_view_window_init         (ModestMsgViewWindow *obj);
@@ -2712,7 +2713,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m
                                                      GTK_FILE_CHOOSER_ACTION_SAVE);
 
        /* set folder */
-       folder = g_build_filename (g_get_home_dir (), DEFAULT_FOLDER, NULL);
+       folder = g_build_filename (g_get_home_dir (), g_getenv (MYDOCS_ENV), DOCS_FOLDER, NULL);
        gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (save_dialog), folder);
        g_free (folder);