From: Paul Mangan Date: Fri, 28 Sep 2007 17:48:04 +0000 (+0000) Subject: 2007-09-28 [paul] 3.0.1cvs43 X-Git-Tag: rel_3_1_0~169 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=5b09c5c96dd68c2f20a094d3099ae7d41552ad26;ds=sidebyside 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 b78ff5dcf..b693a747e 100644 --- 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 diff --git a/PATCHSETS b/PATCHSETS index 6ace3374c..5f9fe95e2 100644 --- 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.61.2.69 -r 1.61.2.70 src/account.c; ) > 3.0.1cvs43.patchset diff --git a/configure.ac b/configure.ac index db9377e29..460ddf8f9 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=42 +EXTRA_VERSION=43 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/account.c b/src/account.c index 6f3e03b65..757f931b7 100644 --- a/src/account.c +++ b/src/account.c @@ -688,7 +688,7 @@ static void account_edit_create(void) GtkWidget *default_btn; - GtkWidget *hbbox; + GtkWidget *confirm_area; 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); + 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); @@ -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); - 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); - 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); - 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); - 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",