2007-07-05 Murray Cumming <murrayc@murrayc.com>

* src/maemo/easysetup/modest-easysetup-wizard.c:
        (create_page_complete_easysetup): Use
        gtk_widget_set_size() request to ensure that the text wraps
        even in osso 1.1.

pmo-trunk-r2594

diff --git a/ChangeLog2 b/ChangeLog2
index 000f7b9..579cdb2 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,3 +1,10 @@
+2007-07-05  Murray Cumming <murrayc@murrayc.com>
+
+       * src/maemo/easysetup/modest-easysetup-wizard.c:
+       (create_page_complete_easysetup): Use 
+       gtk_widget_set_size() request to ensure that the text wraps 
+       even in osso 1.1.
+

 2007-07-05  Johannes Schmid <johannes.schmid@openismus.com>
 
        * src/maemo/easysetup/modest-easysetup-wizard.c:
 2007-07-05  Johannes Schmid <johannes.schmid@openismus.com>
 
        * src/maemo/easysetup/modest-easysetup-wizard.c:

@@ -12,7 +19,6 @@
        Added a new callback function to be able to react to prevented 
        characters whitespaces to e.g show a banner.
 
        Added a new callback function to be able to react to prevented 
        characters whitespaces to e.g show a banner.
 

-

 2007-07-05  Armin Burgmeier  <armin@openismus.com>
 
        * src/maemo/modest-account-settings-dialog.c: Use the notify::value
 2007-07-05  Armin Burgmeier  <armin@openismus.com>
 
        * src/maemo/modest-account-settings-dialog.c: Use the notify::value

diff --git a/src/maemo/easysetup/modest-easysetup-wizard.c b/src/maemo/easysetup/modest-easysetup-wizard.c
index a87c543..aa60311 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-wizard.c
+++ b/src/maemo/easysetup/modest-easysetup-wizard.c
@@ -625,6 +625,12 @@ static GtkWidget* create_page_complete_easysetup (ModestEasysetupWizardDialog *s
        label = gtk_label_new (_("mcen_ia_easysetup_complete"));
        gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
        gtk_label_set_max_width_chars (GTK_LABEL (label), 40);
        label = gtk_label_new (_("mcen_ia_easysetup_complete"));
        gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
        gtk_label_set_max_width_chars (GTK_LABEL (label), 40);

+       
+       /* The documentation for gtk_label_set_line_wrap() says that we must 
+        * call gtk_widget_set_size_request() with a hard-coded width, 
+        * though I wonder why gtk_label_set_max_width_chars() isn't enough. */
+       gtk_widget_set_size_request (label, 400, -1);
+       

        gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
        gtk_widget_show (label);
        gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
        gtk_widget_show (label);