X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-maemo-utils.c;h=0b5feeecd20803b63199fa4a99cb9b4346511d10;hb=2d993bd381d631c6b8527dbc19011138fccb7759;hp=2d81c68da2a0b514a1869f5f3aa4cd5797e15410;hpb=2470c15ef83e02a1f15482b35588699ae5762b1c;p=modest

diff --git a/src/hildon2/modest-maemo-utils.c b/src/hildon2/modest-maemo-utils.c
index 2d81c68..0b5feee 100644
--- 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 */
-	images_folder = g_build_filename (g_get_home_dir (), 
-					  MODEST_MAEMO_UTILS_MYDOCS_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);
@@ -341,10 +340,12 @@ modest_maemo_utils_create_captioned_with_size_type    (GtkSizeGroup *title_size_
 	GtkWidget *box;
   
 	label = gtk_label_new (title);
+	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 (TRUE, MODEST_MARGIN_HALF);
-	gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, MODEST_MARGIN_HALF);
+	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);
 	if (title_size_group)
 		gtk_size_group_add_widget (title_size_group, label);
@@ -380,7 +381,7 @@ modest_maemo_utils_set_hbutton_layout (GtkSizeGroup *title_sizegroup,
 	if (title_sizegroup)
 		hildon_button_add_title_size_group (HILDON_BUTTON (button), title_sizegroup);
 	if (value_sizegroup)
-		hildon_button_add_title_size_group (HILDON_BUTTON (button), value_sizegroup);
+		hildon_button_add_value_size_group (HILDON_BUTTON (button), value_sizegroup);
 	hildon_button_set_alignment (HILDON_BUTTON (button), 0.0, 0.5, 1.0, 0.0);
 	hildon_button_set_title_alignment (HILDON_BUTTON (button), 0.0, 0.5);
 	hildon_button_set_value_alignment (HILDON_BUTTON (button), 0.0, 0.5);