X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=27c1878170648ec140f5f457b9387d4362b10818;hb=3657a0c4fbad8e7a2f27f92a053182968f24a8a1;hp=ae8eb8535a01a7b6a1ce6ed0cacc7694bbc77d25;hpb=a9fd15b0768255b183d8ce664edd9ee83a045df4;p=modest

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index ae8eb85..27c1878 100644
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -718,6 +718,16 @@ attachment_deleted (ModestAttachmentsView *attachments_view,
 }
 
 static void
+body_size_request (GtkWidget *body,
+		   GtkRequisition *req,
+		   gpointer user_data)
+{
+	/* Make sure the body always get at least 70 pixels */
+	if (req->height < 70)
+		req->height = 70;
+}
+
+static void
 connect_signals (ModestMsgEditWindow *obj)
 {
 	ModestMsgEditWindowPrivate *priv;
@@ -759,6 +769,8 @@ connect_signals (ModestMsgEditWindow *obj)
 			  G_CALLBACK (msg_body_focus), obj);
 	g_signal_connect (G_OBJECT (priv->msg_body), "focus-out-event",
 			  G_CALLBACK (msg_body_focus), obj);
+	g_signal_connect (G_OBJECT (priv->msg_body), "size-request",
+			  G_CALLBACK (body_size_request), obj);
 	g_signal_connect (G_OBJECT (obj), "set-focus", G_CALLBACK (window_focus), obj);
 	g_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field))),
 			  "changed", G_CALLBACK (recpt_field_changed), obj);
@@ -2534,14 +2546,19 @@ modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window)
 	dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), 
 						 GTK_FILE_CHOOSER_ACTION_OPEN);
 	gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_select_attachment_title"));
-	conf_folder = modest_conf_get_string (modest_runtime_get_conf (), MODEST_CONF_LATEST_ATTACH_FILE_PATH, NULL);
+	conf_folder = modest_conf_get_string (modest_runtime_get_conf (),
+					      MODEST_CONF_LATEST_ATTACH_FILE_PATH, NULL);
 	if (conf_folder && conf_folder[0] != '\0') {
 		gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog), conf_folder);
 	} else {
 		gchar *docs_folder;
-		/* Set the default folder to images folder */
-		docs_folder = g_build_filename (g_getenv (MODEST_MAEMO_UTILS_MYDOCS_ENV),
-						".documents", NULL);
+		/* Set the default folder to documents folder */
+		docs_folder = (gchar *) g_strdup(g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
+		if (!docs_folder) {
+			/* fallback */
+			docs_folder = g_build_filename (g_getenv (MODEST_MAEMO_UTILS_MYDOCS_ENV),
+							".documents", NULL);
+		}
 		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), docs_folder);
 		g_free (docs_folder);
 	}