2007-09-28 [paul] 3.0.1cvs43

	* src/account.c
		use gtk_widget_set_size_request() on the label
		so that wrapping works better. get rid of the
		(partially deprecated) hbutton_box.
		these changes should prevent buttons overlapping
		on maemo

diff --git a/ChangeLog b/ChangeLog
index b78ff5dcf0ffb4b6a50d6fd12a0c84ce53f54621..b693a747e1ae4eb161d8ac94463bf3796f6d4d83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-09-28 [paul]      3.0.1cvs43
+
+       * src/account.c
+               use gtk_widget_set_size_request() on the label
+               so that wrapping works better. get rid of the
+               (partially deprecated) hbutton_box.
+               these changes should prevent buttons overlapping
+               on maemo
+

 2007-09-28 [colin]     3.0.1cvs42
 
        * src/pop.c
 2007-09-28 [colin]     3.0.1cvs42
 
        * src/pop.c

diff --git a/PATCHSETS b/PATCHSETS
index 6ace3374c7dc8be2a04811553e9379b111d2298c..5f9fe95e2b0015a27b51a00a9bd0d145209c5562 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2906,3 +2906,4 @@
 ( cvs diff -u -r 1.2.2.23 -r 1.2.2.24 src/folder_item_prefs.c;  cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/ldaputil.c;  cvs diff -u -r 1.274.2.213 -r 1.274.2.214 src/mainwindow.c;  cvs diff -u -r 1.83.2.115 -r 1.83.2.116 src/mimeview.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/common/tags.c;  ) > 3.0.1cvs40.patchset
 ( cvs diff -u -r 1.382.2.411 -r 1.382.2.412 src/compose.c;  cvs diff -u -r 1.16.2.60 -r 1.16.2.61 src/msgcache.c;  cvs diff -u -r 1.56.2.54 -r 1.56.2.55 src/pop.c;  cvs diff -u -r 1.49.2.97 -r 1.49.2.98 src/procmime.c;  cvs diff -u -r 1.1.4.85 -r 1.1.4.86 src/etpan/imap-thread.c;  ) > 3.0.1cvs41.patchset
 ( cvs diff -u -r 1.56.2.55 -r 1.56.2.56 src/pop.c;  ) > 3.0.1cvs42.patchset
 ( cvs diff -u -r 1.2.2.23 -r 1.2.2.24 src/folder_item_prefs.c;  cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/ldaputil.c;  cvs diff -u -r 1.274.2.213 -r 1.274.2.214 src/mainwindow.c;  cvs diff -u -r 1.83.2.115 -r 1.83.2.116 src/mimeview.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/common/tags.c;  ) > 3.0.1cvs40.patchset
 ( cvs diff -u -r 1.382.2.411 -r 1.382.2.412 src/compose.c;  cvs diff -u -r 1.16.2.60 -r 1.16.2.61 src/msgcache.c;  cvs diff -u -r 1.56.2.54 -r 1.56.2.55 src/pop.c;  cvs diff -u -r 1.49.2.97 -r 1.49.2.98 src/procmime.c;  cvs diff -u -r 1.1.4.85 -r 1.1.4.86 src/etpan/imap-thread.c;  ) > 3.0.1cvs41.patchset
 ( cvs diff -u -r 1.56.2.55 -r 1.56.2.56 src/pop.c;  ) > 3.0.1cvs42.patchset

+( cvs diff -u -r 1.61.2.69 -r 1.61.2.70 src/account.c;  ) > 3.0.1cvs43.patchset

diff --git a/configure.ac b/configure.ac
index db9377e29f78c0f536a3d2720385d7c6c1e1216e..460ddf8f9c0f5a1edf729130ede6fb59a3b04070 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=42
+EXTRA_VERSION=43

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/account.c b/src/account.c
index 6f3e03b656d64e66fdb085cbe513b017ddbd2372..757f931b7090e614f2e5d04cb38476f23a3b9e2e 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -688,7 +688,7 @@ static void account_edit_create(void)
 
        GtkWidget *default_btn;
 
 
        GtkWidget *default_btn;
 

-       GtkWidget *hbbox;
+       GtkWidget *confirm_area;

        GtkWidget *help_btn;
        GtkWidget *close_btn;
 
        GtkWidget *help_btn;
        GtkWidget *close_btn;
 


@@ -724,6 +724,8 @@ static void account_edit_create(void)
                   "in the order given, the checkbox in the 'G' column indicates "
                   "which accounts will be included."));
        gtk_widget_show (label);
                   "in the order given, the checkbox in the 'G' column indicates "
                   "which accounts will be included."));
        gtk_widget_show (label);

+       gtk_widget_set_size_request(GTK_WIDGET(label), 
+                                   prefs_common.accountswin_width-8, -1);

        gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
        gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
        gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
        gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);


@@ -788,27 +790,19 @@ static void account_edit_create(void)
        gtk_widget_show (hbox);
        gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
        gtk_widget_show (hbox);
        gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 

-       vbox2 = gtk_vbox_new(FALSE, 0);
-       gtk_widget_show (vbox2);
-       gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
-

        default_btn = gtk_button_new_with_mnemonic
                (_(" _Set as default account "));
        gtk_widget_show (default_btn);
        default_btn = gtk_button_new_with_mnemonic
                (_(" _Set as default account "));
        gtk_widget_show (default_btn);

-       gtk_box_pack_start (GTK_BOX (vbox2), default_btn, TRUE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox), default_btn, FALSE, FALSE, 0);

        g_signal_connect (G_OBJECT(default_btn), "clicked",
                          G_CALLBACK (account_set_default), NULL);
 
        g_signal_connect (G_OBJECT(default_btn), "clicked",
                          G_CALLBACK (account_set_default), NULL);
 

-       hbbox = gtk_hbutton_box_new();
-       gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox), GTK_BUTTONBOX_END);
-       gtk_box_set_spacing(GTK_BOX(hbbox), 5);
-
-       gtkut_stock_button_set_create_with_help(&hbbox, &help_btn,
+       gtkut_stock_button_set_create_with_help(&confirm_area, &help_btn,

                        &close_btn, GTK_STOCK_CLOSE,
                        NULL, NULL, NULL, NULL);
                        &close_btn, GTK_STOCK_CLOSE,
                        NULL, NULL, NULL, NULL);

-       gtk_widget_show(hbbox);
+       gtk_widget_show(confirm_area);

 
 

-       gtk_box_pack_end (GTK_BOX (hbox), hbbox, FALSE, FALSE, 0);
+       gtk_box_pack_end (GTK_BOX (hbox), confirm_area, FALSE, FALSE, 0);

        gtk_widget_grab_default (close_btn);
 
        g_signal_connect (G_OBJECT (close_btn), "clicked",
        gtk_widget_grab_default (close_btn);
 
        g_signal_connect (G_OBJECT (close_btn), "clicked",