From a4de3ad3f97f2087d4de9051b6ad98689d0be157 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Thu, 4 Dec 2008 21:23:05 +0000 Subject: [PATCH] Replaced references to MyDocs with environment variable pmo-drop-split-view-r6663 --- src/hildon2/modest-maemo-utils.c | 2 +- src/hildon2/modest-maemo-utils.h | 2 +- src/hildon2/modest-msg-view-window.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/hildon2/modest-maemo-utils.c b/src/hildon2/modest-maemo-utils.c index 5a2e524..0aa0c6c 100644 --- 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 --- 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 -#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 b478dec..714e883 100644 --- a/src/hildon2/modest-msg-view-window.c +++ b/src/hildon2/modest-msg-view-window.c @@ -66,7 +66,8 @@ #include #include -#define DEFAULT_FOLDER "MyDocs/.documents" +#define MYDOCS_ENV "MYDOCSDIR" +#define DOCS_FOLDER ".documents" typedef struct _ModestMsgViewWindowPrivate ModestMsgViewWindowPrivate; struct _ModestMsgViewWindowPrivate { @@ -2867,7 +2868,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); -- 1.7.9.5