Add mailbox id storage in modest window.

[modest] / src / hildon2 / modest-maemo-utils.c

diff --git a/src/hildon2/modest-maemo-utils.c b/src/hildon2/modest-maemo-utils.c
index c2248af..a0bad06 100644 (file)
--- a/src/hildon2/modest-maemo-utils.c
+++ b/src/hildon2/modest-maemo-utils.c
@@ -107,18 +107,25 @@ modest_maemo_utils_get_device_name (void)
 void
 modest_maemo_utils_setup_images_filechooser (GtkFileChooser *chooser)
 {
-       gchar *images_folder;
        GtkFileFilter *file_filter;
        GList *image_mimetypes_list;
        GList *node;
+       gchar *conf_folder;
 
        g_return_if_fail (GTK_IS_FILE_CHOOSER (chooser));
 
-       /* Set the default folder to images folder */
-       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);
+       conf_folder = modest_conf_get_string (modest_runtime_get_conf (), MODEST_CONF_LATEST_INSERT_IMAGE_PATH, NULL);
+       if (conf_folder && conf_folder[0] != '\0') {
+               gtk_file_chooser_set_current_folder_uri (chooser, conf_folder);
+       } else {
+               gchar *images_folder;
+               /* Set the default folder to images folder */
+               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);
+       }
+       g_free (conf_folder);
 
        /* Set the images mime filter */
        file_filter = gtk_file_filter_new ();
@@ -260,6 +267,7 @@ modest_maemo_utils_create_captioned_with_size_type    (GtkSizeGroup *title_size_
                                                       HildonSizeType size_type)
 {
        GtkWidget *label;
+       GtkWidget *align;
        GtkWidget *box;
   
        if (use_markup) {
@@ -268,14 +276,18 @@ modest_maemo_utils_create_captioned_with_size_type    (GtkSizeGroup *title_size_
        } else {
                label = gtk_label_new (title);
        }
+       align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_TRIPLE);
 
        gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
        hildon_gtk_widget_set_theme_size (label, HILDON_SIZE_FINGER_HEIGHT);
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
        gtk_widget_show (label);
-       box = gtk_hbox_new (FALSE, MODEST_MARGIN_HALF);
-       gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_box_pack_start (GTK_BOX (box), control, TRUE, TRUE, MODEST_MARGIN_HALF);
+       gtk_widget_show (align);
+       box = gtk_hbox_new (FALSE, 0);
+       gtk_container_add (GTK_CONTAINER (align), label);
+       gtk_box_pack_start (GTK_BOX (box), align, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (box), control, TRUE, TRUE, 0);
        if (title_size_group)
                gtk_size_group_add_widget (title_size_group, label);
        if (value_size_group)
@@ -383,7 +395,7 @@ static gboolean match_all (TnyList *list, GObject *item, gpointer match_data)
 }
 
 gboolean
-modest_maemo_utils_select_attachments (GtkWindow *window, TnyList *att_list)
+modest_maemo_utils_select_attachments (GtkWindow *window, TnyList *att_list, gboolean include_msgs)
 {
        GtkTreeModel *model;
        TnyIterator *iterator;
@@ -399,15 +411,23 @@ modest_maemo_utils_select_attachments (GtkWindow *window, TnyList *att_list)
             tny_iterator_next (iterator)) {
                GtkTreeIter iter;
                TnyMimePart *part;
+               gchar *label;
+               gchar *filename = NULL;
 
                part = (TnyMimePart *) tny_iterator_get_current (iterator);
 
-               /* Embbeded messages are not offered to be saved */
-               if (!TNY_IS_MSG (part)) {
-                       gchar *label;
-                       gchar *filename = NULL;
-
-                       filename = g_strdup (tny_mime_part_get_filename (part));
+               /* Ignore purged attachments and messages if ignore is
+                  set to TRUE */
+               if (!(tny_mime_part_is_purged (part) ||
+                     (TNY_IS_MSG (part) && !include_msgs))) {
+
+                       if (TNY_IS_MSG (part)) {
+                               TnyHeader *header = tny_msg_get_header (TNY_MSG (part));
+                               filename = tny_header_dup_subject (header);
+                               g_object_unref (header);
+                       } else {
+                               filename = g_strdup (tny_mime_part_get_filename (part));
+                       }
                        label = g_strconcat (filename, NULL);
                        gtk_list_store_append (GTK_LIST_STORE (model), &iter);
                        gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, label, 1, part, -1);
@@ -424,7 +444,7 @@ modest_maemo_utils_select_attachments (GtkWindow *window, TnyList *att_list)
                                                         HILDON_TOUCH_SELECTOR_SELECTION_MODE_MULTIPLE);
 
        dialog = hildon_picker_dialog_new (window);
-       gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_select_attachment_title"));
+       gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_select_attachments_title"));
        hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (dialog), HILDON_TOUCH_SELECTOR (selector));
        hildon_picker_dialog_set_done_label (HILDON_PICKER_DIALOG (dialog), _HL("wdgt_bd_done"));