2006-03-09 [paul] 2.0.0cvs124

	* src/plugins/pgpcore/prefs_gpg.c
		normalise construction of dialogue

diff --git a/ChangeLog b/ChangeLog
index 63ca9bddab3036dd9e6efe499cb8d18374089ed1..b5774a82a6977358b40116daf4bea38aaad635bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-09 [paul]      2.0.0cvs124
+
+       * src/plugins/pgpcore/prefs_gpg.c
+               normalise construction of dialogue
+
 2006-03-09 [paul]      2.0.0cvs123
 
        * src/plugins/trayicon/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index 88d4ed203041d8fdd44c793979ad9b423539880d..f7693fd2bddeaad09a3f48b31cefab176cd5a883 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1307,3 +1307,4 @@
 ( cvs diff -u -r 1.150.2.56 -r 1.150.2.57 src/procmsg.c;  ) > 2.0.0cvs121.patchset
 ( cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/plugins/trayicon/Makefile.am;  ) > 2.0.0cvs122.patchset
 ( cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/plugins/trayicon/Makefile.am;  ) > 2.0.0cvs123.patchset
+( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpcore/prefs_gpg.c;  ) > 2.0.0cvs124.patchset

diff --git a/configure.ac b/configure.ac
index 9e77639eaec5bde1df2ce2d091f508753ee3728e..6fd7505a5b2411ccc3c86829cc83fc79971015c1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=123
+EXTRA_VERSION=124
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c
index 591a4250d33da5a93208a266f323b998ce81c020..47d0e6883b4a6f90bfaf0eb85323e4d829299b37 100644 (file)
--- a/src/plugins/pgpcore/prefs_gpg.c
+++ b/src/plugins/pgpcore/prefs_gpg.c
@@ -219,7 +219,8 @@ static void prefs_gpg_account_create_widget_func(PrefsPage *_page,
 
        GtkWidget *vbox;
        GtkWidget *frame1;
-       GtkWidget *table1;
+       GtkWidget *vbox2;
+       GtkWidget *hbox;
        GSList *key_group = NULL;
        GtkWidget *key_default;
        GtkWidget *key_by_from;
@@ -227,57 +228,63 @@ static void prefs_gpg_account_create_widget_func(PrefsPage *_page,
        GtkWidget *keyid_label;
        GtkWidget *keyid;
 
-       vbox = gtk_vbox_new(FALSE, 0);
+       vbox = gtk_vbox_new(FALSE, VSPACING);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
        gtk_widget_show(vbox);
 
-       frame1 = gtk_frame_new(_("Sign key"));
-       gtk_widget_show(frame1);
-       gtk_box_pack_start(GTK_BOX(vbox), frame1, FALSE, FALSE, 0);
-       gtk_frame_set_label_align(GTK_FRAME(frame1), 0.0, 0.5);
+       PACK_FRAME (vbox, frame1, _("Sign key"));
 
-       table1 = gtk_table_new(4, 3, FALSE);
-       gtk_widget_show(table1);
-       gtk_container_add(GTK_CONTAINER(frame1), table1);
-       gtk_container_set_border_width(GTK_CONTAINER(table1), 8);
-       gtk_table_set_row_spacings(GTK_TABLE(table1), 4);
-       gtk_table_set_col_spacings(GTK_TABLE(table1), 4);
+       vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
+       gtk_widget_show (vbox2);
+       gtk_container_add (GTK_CONTAINER (frame1), vbox2);
+
+       hbox = gtk_hbox_new (FALSE, 5);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+       gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
 
        key_default = gtk_radio_button_new_with_label(key_group,
                        _("Use default GnuPG key"));
        key_group = gtk_radio_button_group(GTK_RADIO_BUTTON(key_default));
        gtk_widget_show(key_default);
-       gtk_table_attach(GTK_TABLE(table1), key_default, 0, 3, 0, 1,
-                        (GtkAttachOptions) (GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), key_default, FALSE, FALSE, 0);
+
+       hbox = gtk_hbox_new (FALSE, 5);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+       gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
 
        key_by_from = gtk_radio_button_new_with_label(key_group,
                _("Select key by your email address"));
        key_group = gtk_radio_button_group(GTK_RADIO_BUTTON(key_by_from));
        gtk_widget_show(key_by_from);
-       gtk_table_attach(GTK_TABLE(table1), key_by_from, 0, 3, 1, 2,
-                        (GtkAttachOptions) (GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), key_by_from, FALSE, FALSE, 0);
+
+       hbox = gtk_hbox_new (FALSE, 5);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+       gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
 
        key_custom = gtk_radio_button_new_with_label(key_group,
                _("Specify key manually"));
        key_group = gtk_radio_button_group(GTK_RADIO_BUTTON(key_custom));
        gtk_widget_show(key_custom);
-       gtk_table_attach(GTK_TABLE(table1), key_custom, 0, 3, 2, 3,
-                        (GtkAttachOptions) (GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), key_custom, FALSE, FALSE, 0);
+
+       hbox = gtk_hbox_new (FALSE, 5);
+       gtk_widget_show (hbox);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+       gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
 
        keyid_label = gtk_label_new(_("User or key ID:"));
        gtk_widget_show(keyid_label);
-       gtk_table_attach(GTK_TABLE(table1), keyid_label, 0, 2, 3, 4,
-                        (GtkAttachOptions) (GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
        gtk_label_set_justify(GTK_LABEL(keyid_label), GTK_JUSTIFY_LEFT);
+       gtk_box_pack_start(GTK_BOX(hbox), keyid_label, FALSE, FALSE, 0);
 
        keyid = gtk_entry_new();
        gtk_widget_show(keyid);
-       gtk_table_attach(GTK_TABLE(table1), keyid, 2, 3, 3, 4,
-                        (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), keyid, FALSE, FALSE, 0);
 
        config = prefs_gpg_account_get_config(account);
        switch (config->sign_key) {