Properly calculate the MyDocs folder paths.

pmo-trunk-r7113

diff --git a/src/hildon2/modest-maemo-utils.c b/src/hildon2/modest-maemo-utils.c
index aa6ecb5..0b5feee 100644 (file)
--- a/src/hildon2/modest-maemo-utils.c
+++ b/src/hildon2/modest-maemo-utils.c
@@ -203,8 +203,7 @@ modest_maemo_utils_setup_images_filechooser (GtkFileChooser *chooser)
        g_return_if_fail (GTK_IS_FILE_CHOOSER (chooser));
 
        /* Set the default folder to images folder */
        g_return_if_fail (GTK_IS_FILE_CHOOSER (chooser));
 
        /* Set the default folder to images folder */

-       images_folder = g_build_filename (g_get_home_dir (), 
-                                         g_getenv (MODEST_MAEMO_UTILS_MYDOCS_ENV),
+       images_folder = g_build_filename (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);
                                          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-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index b2da8d2..a40707d 100644 (file)
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -2785,7 +2785,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m
                                                      GTK_FILE_CHOOSER_ACTION_SAVE);
 
        /* set folder */
                                                      GTK_FILE_CHOOSER_ACTION_SAVE);
 
        /* set folder */

-       folder = g_build_filename (g_get_home_dir (), g_getenv (MYDOCS_ENV), DOCS_FOLDER, NULL);
+       folder = g_build_filename (g_getenv (MYDOCS_ENV), DOCS_FOLDER, NULL);

        gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (save_dialog), folder);
        g_free (folder);
 
        gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (save_dialog), folder);
        g_free (folder);