2006-08-24 [colin] 2.4.0cvs84

	* src/alertpanel.c
	* src/gtk/inputdialog.c
	* src/plugins/pgpcore/passphrase.c
		Revert minimal width patch of 2.4.0cvs67,
		as it is also a maximal width. Use
		gtk_window_set_default_size instead.

diff --git a/ChangeLog b/ChangeLog
index 129b798466a23082f381b81f9d4df21d66b7a176..164ab9c5ee0c3f3847e13f3b11d45ec531dace77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-24 [colin]     2.4.0cvs84
+
+       * src/alertpanel.c
+       * src/gtk/inputdialog.c
+       * src/plugins/pgpcore/passphrase.c
+               Revert minimal width patch of 2.4.0cvs67,
+               as it is also a maximal width. Use 
+               gtk_window_set_default_size instead.
+

 2006-08-24 [colin]     2.4.0cvs83
 
        * src/msgcache.c
 2006-08-24 [colin]     2.4.0cvs83
 
        * src/msgcache.c

diff --git a/PATCHSETS b/PATCHSETS
index a2625f6be2db4869ddd04c9e29e3a9e6f2e637b3..326bb30d93f69279a917f4421e9388b98859ec6a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1775,3 +1775,4 @@
 ( cvs diff -u -r 1.213.2.107 -r 1.213.2.108 src/folder.c;  cvs diff -u -r 1.79.2.37 -r 1.79.2.38 src/mh.c;  ) > 2.4.0cvs81.patchset
 ( diff -u /dev/null manual/es/.cvsignore;  diff -u /dev/null manual/es/dist/.cvsignore;  diff -u /dev/null manual/es/dist/html/.cvsignore;  diff -u /dev/null manual/es/dist/pdf/.cvsignore;  diff -u /dev/null manual/es/dist/ps/.cvsignore;  diff -u /dev/null manual/es/dist/txt/.cvsignore;  ) > 2.4.0cvs82.patchset
 ( cvs diff -u -r 1.8.2.17 -r 1.8.2.18 src/headerview.c;  cvs diff -u -r 1.274.2.139 -r 1.274.2.140 src/mainwindow.c;  cvs diff -u -r 1.94.2.98 -r 1.94.2.99 src/messageview.c;  cvs diff -u -r 1.16.2.35 -r 1.16.2.36 src/msgcache.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/partial_download.c;  cvs diff -u -r 1.47.2.32 -r 1.47.2.33 src/procheader.c;  cvs diff -u -r 1.150.2.74 -r 1.150.2.75 src/procmsg.c;  cvs diff -u -r 1.60.2.31 -r 1.60.2.32 src/procmsg.h;  cvs diff -u -r 1.96.2.140 -r 1.96.2.141 src/textview.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/common/timing.h;  ) > 2.4.0cvs83.patchset
 ( cvs diff -u -r 1.213.2.107 -r 1.213.2.108 src/folder.c;  cvs diff -u -r 1.79.2.37 -r 1.79.2.38 src/mh.c;  ) > 2.4.0cvs81.patchset
 ( diff -u /dev/null manual/es/.cvsignore;  diff -u /dev/null manual/es/dist/.cvsignore;  diff -u /dev/null manual/es/dist/html/.cvsignore;  diff -u /dev/null manual/es/dist/pdf/.cvsignore;  diff -u /dev/null manual/es/dist/ps/.cvsignore;  diff -u /dev/null manual/es/dist/txt/.cvsignore;  ) > 2.4.0cvs82.patchset
 ( cvs diff -u -r 1.8.2.17 -r 1.8.2.18 src/headerview.c;  cvs diff -u -r 1.274.2.139 -r 1.274.2.140 src/mainwindow.c;  cvs diff -u -r 1.94.2.98 -r 1.94.2.99 src/messageview.c;  cvs diff -u -r 1.16.2.35 -r 1.16.2.36 src/msgcache.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/partial_download.c;  cvs diff -u -r 1.47.2.32 -r 1.47.2.33 src/procheader.c;  cvs diff -u -r 1.150.2.74 -r 1.150.2.75 src/procmsg.c;  cvs diff -u -r 1.60.2.31 -r 1.60.2.32 src/procmsg.h;  cvs diff -u -r 1.96.2.140 -r 1.96.2.141 src/textview.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/common/timing.h;  ) > 2.4.0cvs83.patchset

+( cvs diff -u -r 1.17.2.25 -r 1.17.2.26 src/alertpanel.c;  cvs diff -u -r 1.2.2.18 -r 1.2.2.19 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/plugins/pgpcore/passphrase.c;  ) > 2.4.0cvs84.patchset

diff --git a/configure.ac b/configure.ac
index f3f9ce158f9399d6addcb82c48a918918baed4eb..c053b6763ad272b9da4a0634f46fe3bdf6a6f9c1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=83
+EXTRA_VERSION=84

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/alertpanel.c b/src/alertpanel.c
index 72dd2b25d07d9eb69ad41c61be22009be19caca2..e0918ac003a7380dd12fb245cdf1f81bee29deaa 100644 (file)
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -247,7 +247,7 @@ static void alertpanel_create(const gchar *title,
        gtk_window_set_title(GTK_WINDOW(dialog), title);
        gtk_window_set_resizable(GTK_WINDOW(dialog), TRUE);
 
        gtk_window_set_title(GTK_WINDOW(dialog), title);
        gtk_window_set_resizable(GTK_WINDOW(dialog), TRUE);
 

-       gtk_window_set_default_size(GTK_WINDOW(dialog), 300, 100);
+       gtk_window_set_default_size(GTK_WINDOW(dialog), 375, 100);

        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
        
        gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
        
        gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);


@@ -357,8 +357,6 @@ static void alertpanel_create(const gchar *title,
                                      button2_label ? &button2 : NULL, label2,
                                      button3_label ? &button3 : NULL, label3);
 
                                      button2_label ? &button2 : NULL, label2,
                                      button3_label ? &button3 : NULL, label3);
 

-       gtk_widget_set_size_request(confirm_area, 375, -1);
-

        gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->action_area),
                         confirm_area, FALSE, FALSE, 0);
        gtk_container_set_border_width(GTK_CONTAINER(confirm_area), 5);
        gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->action_area),
                         confirm_area, FALSE, FALSE, 0);
        gtk_container_set_border_width(GTK_CONTAINER(confirm_area), 5);

diff --git a/src/gtk/inputdialog.c b/src/gtk/inputdialog.c
index c1bb718a406adccc2d8e32d3953c88923e97067d..2161211732712ff09470d40fc1bec016bb8b2901 100644 (file)
--- a/src/gtk/inputdialog.c
+++ b/src/gtk/inputdialog.c
@@ -203,6 +203,7 @@ static void input_dialog_create(gboolean is_password)
        dialog = gtk_dialog_new();
 
        gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
        dialog = gtk_dialog_new();
 
        gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);

+       gtk_window_set_default_size(GTK_WINDOW(dialog), 375, 100);

        gtk_window_set_title(GTK_WINDOW(dialog), "");
        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 
        gtk_window_set_title(GTK_WINDOW(dialog), "");
        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 


@@ -281,8 +282,6 @@ static void input_dialog_create(gboolean is_password)
                                      &ok_button, GTK_STOCK_OK,
                                      NULL, NULL);
 
                                      &ok_button, GTK_STOCK_OK,
                                      NULL, NULL);
 

-       gtk_widget_set_size_request(confirm_area, 375, -1);
-

        gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->action_area),
                         confirm_area, FALSE, FALSE, 0);
        gtk_container_set_border_width(GTK_CONTAINER(confirm_area), 5);
        gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->action_area),
                         confirm_area, FALSE, FALSE, 0);
        gtk_container_set_border_width(GTK_CONTAINER(confirm_area), 5);

diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c
index e115abd512883b8cfe2f6638b79cf99002fbf533..387994dab41b274e96bd6f14b590019ceaa3656f 100644 (file)
--- a/src/plugins/pgpcore/passphrase.c
+++ b/src/plugins/pgpcore/passphrase.c
@@ -95,6 +95,7 @@ passphrase_mbox(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad, gi
 
     window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     gtk_window_set_title(GTK_WINDOW(window), _("Passphrase"));
 
     window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     gtk_window_set_title(GTK_WINDOW(window), _("Passphrase"));

+    gtk_window_set_default_size(GTK_WINDOW(window), 375, 100);

     gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
     gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
     gtk_window_set_modal(GTK_WINDOW(window), TRUE);
     gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
     gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
     gtk_window_set_modal(GTK_WINDOW(window), TRUE);


@@ -134,8 +135,6 @@ passphrase_mbox(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad, gi
                                  &ok_button, GTK_STOCK_OK,
                                  NULL, NULL);
 
                                  &ok_button, GTK_STOCK_OK,
                                  NULL, NULL);
 

-    gtk_widget_set_size_request(confirm_box, 375, -1);
-

     gtk_box_pack_end(GTK_BOX(vbox), confirm_box, FALSE, FALSE, 0);
     gtk_widget_grab_default(ok_button);
 
     gtk_box_pack_end(GTK_BOX(vbox), confirm_box, FALSE, FALSE, 0);
     gtk_widget_grab_default(ok_button);
 


@@ -148,7 +147,7 @@ passphrase_mbox(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad, gi
 
     gtk_window_set_position (GTK_WINDOW(window), GTK_WIN_POS_CENTER);
     if (grab_all)   
 
     gtk_window_set_position (GTK_WINDOW(window), GTK_WIN_POS_CENTER);
     if (grab_all)   

-        gtk_window_set_policy (GTK_WINDOW(window), FALSE, FALSE, TRUE);
+        gtk_window_set_policy (GTK_WINDOW(window), FALSE, FALSE, FALSE);

     
     gtk_widget_show_all(window);
 
     
     gtk_widget_show_all(window);