2007-01-17 [paul] 2.7.1cvs15

	* src/prefs_common.c
	* src/gtk/pluginwindow.c
		fix bug 1101, '"Load plugin" button is
		accidentally hidden'
		unset (-1) initial width in prefs_common,
		fix overlapping buttons,
		and other cleanups

diff --git a/ChangeLog b/ChangeLog
index 1725fb35f777e8a0617738707915d6f289ca929e..635e275c0d5960f98eda64e9166da3c07eed86b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-01-17 [paul]      2.7.1cvs15
+
+       * src/prefs_common.c
+       * src/gtk/pluginwindow.c
+               fix bug 1101, '"Load plugin" button is
+               accidentally hidden'
+               unset (-1) initial width in prefs_common,
+               fix overlapping buttons,
+               and other cleanups
+
 2007-01-17 [paul]      2.7.1cvs14
 
        * src/procmime.c

diff --git a/PATCHSETS b/PATCHSETS
index f14359e2ef051b013818a9b80892d0ec0679560d..1e23aa8019e3854ed827b4eece196b7ac4232502 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2272,3 +2272,4 @@
 ( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/plugins/pgpcore/select-keys.c;  cvs diff -u -r 1.5.2.41 -r 1.5.2.42 src/gtk/pluginwindow.c;  cvs diff -u -r 1.105.2.80 -r 1.105.2.81 src/prefs_account.c;  ) > 2.7.1cvs12.patchset
 ( cvs diff -u -r 1.9.2.33 -r 1.9.2.34 src/common/defs.h;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/etpan/etpan-errors.h;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/etpan/etpan-log.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/etpan/etpan-log.h;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/etpan/etpan-thread-manager-types.h;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/etpan/etpan-thread-manager.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/etpan/etpan-thread-manager.h;  cvs diff -u -r 1.1.4.71 -r 1.1.4.72 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/etpan/imap-thread.h;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 tools/make.themes.project;  ) > 2.7.1cvs13.patchset
 ( cvs diff -u -r 1.49.2.87 -r 1.49.2.88 src/procmime.c;  ) > 2.7.1cvs14.patchset
+( cvs diff -u -r 1.204.2.117 -r 1.204.2.118 src/prefs_common.c;  cvs diff -u -r 1.5.2.42 -r 1.5.2.43 src/gtk/pluginwindow.c;  ) > 2.7.1cvs15.patchset

diff --git a/configure.ac b/configure.ac
index ee62434656f9dbdadf1be277dfb45ce075f08cdf..35ffb15b954b126daeaea121fba671dc851ed8a9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
index 8cb392399500a23dda52e23980f5be999a185cf0..f551daa65f723cac4e3fa8de953f5f1608cda8e5 100644 (file)
--- a/src/gtk/pluginwindow.c
+++ b/src/gtk/pluginwindow.c
@@ -286,7 +286,7 @@ void pluginwindow_create()
        gtk_container_set_border_width(GTK_CONTAINER(window), 8);
        gtk_window_set_title(GTK_WINDOW(window), _("Plugins"));
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
-       manage_window_set_transient(window);
+       manage_window_set_transient(GTK_WINDOW(window));
 
        vbox1 = gtk_vbox_new(FALSE, 4);
        gtk_widget_show(vbox1);
@@ -346,12 +346,8 @@ void pluginwindow_create()
        gtk_widget_show(get_more_btn);
        gtk_box_pack_start(GTK_BOX(vbox1), get_more_btn, FALSE, FALSE, 0);
 
-       hbox3 = gtk_hbox_new(FALSE, 0);
+       hbox3 = gtk_hbox_new(TRUE, 0);
        gtk_widget_show(hbox3);
-       hbuttonbox1 = gtk_hbutton_box_new();
-       gtk_widget_show(hbuttonbox1);
-
-       gtk_box_pack_start(GTK_BOX(hbox3), hbuttonbox1, FALSE, FALSE, 0);
        gtk_box_pack_start(GTK_BOX(vbox1), hbox3, FALSE, FALSE, 0);
 
        gtkut_stock_button_set_create_with_help(&hbuttonbox1, &help_btn,
@@ -360,7 +356,7 @@ void pluginwindow_create()
                        &close_btn, GTK_STOCK_CLOSE);
        gtk_box_set_spacing(GTK_BOX(hbuttonbox1), 6);
        gtk_widget_show(hbuttonbox1);
-       gtk_box_pack_end (GTK_BOX (hbox3), hbuttonbox1, TRUE, TRUE, 0);
+       gtk_box_pack_end(GTK_BOX(hbox3), hbuttonbox1, FALSE, FALSE, 0);
 
        gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(plugin_desc), GTK_WRAP_WORD);
        gtk_widget_set_sensitive(GTK_WIDGET(unload_btn), FALSE);
@@ -409,8 +405,6 @@ void pluginwindow_create()
        gtk_widget_set_size_request(window, prefs_common.pluginswin_width,
                                    prefs_common.pluginswin_height);
 
-       gtk_widget_set_size_request(hbuttonbox1, -1, -1);
-
        gtk_widget_show(window);
 }
 

diff --git a/src/prefs_common.c b/src/prefs_common.c
index e1c8ad5db08bf3e1b2c0274ba3f5eb2a300a1db5..b56551b23df8b1d5118da99fa747db89fca0bf6c 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -738,7 +738,7 @@ static PrefParam param[] = {
        {"addressbookeditgroupwin_height", "340", &prefs_common.addressbookeditgroupwin_height, P_INT,
         NULL, NULL, NULL},
 
-       {"pluginswin_width", "480", &prefs_common.pluginswin_width, P_INT,
+       {"pluginswin_width", "-1", &prefs_common.pluginswin_width, P_INT,
         NULL, NULL, NULL},
        {"pluginswin_height", "-1", &prefs_common.pluginswin_height, P_INT,
         NULL, NULL, NULL},