2006-02-23 [wwp] 2.0.0cvs74

	* src/prefs_toolbar.c
		simplify and fix prefs/toolbars layouting. Combos' contents can
		now be really displayed.

diff --git a/ChangeLog b/ChangeLog
index 53c0d16ce16b986cfc52a4da3750d30620ee2230..c60db04e410aa01aa507b5c9a3f2b7e59d98b97b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-23 [wwp]       2.0.0cvs74
+
+       * src/prefs_toolbar.c
+               simplify and fix prefs/toolbars layouting. Combos' contents can
+               now be really displayed.
+
+2006-02-23 [wwp]       2.0.0cvs73
+       simplifies and fix prefs/toolbars layouting. Combos' contents can now
+       be really displayed.
+
 2006-02-22 [wwp]       2.0.0cvs72
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 77b8f42333ac72014ee72b4638a973dbbdde63c3..8feafca7903cfcacd935ded243119d2ba0927cdd 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1256,3 +1256,5 @@
 ( cvs diff -u -r 1.382.2.243 -r 1.382.2.244 src/compose.c;  ) > 2.0.0cvs70.patchset
 ( cvs diff -u -r 1.30.2.23 -r 1.30.2.24 src/prefs_toolbar.c;  ) > 2.0.0cvs71.patchset
 ( cvs diff -u -r 1.382.2.244 -r 1.382.2.245 src/compose.c;  ) > 2.0.0cvs72.patchset
+( ) > 2.0.0cvs73.patchset
+( cvs diff -u -r 1.30.2.24 -r 1.30.2.25 src/prefs_toolbar.c;  ) > 2.0.0cvs74.patchset

diff --git a/configure.ac b/configure.ac
index cea523bf7175ddfbebe2c54f813bcdb06d034cd8..4e2c35085f7baca1362fb67ef3f5cd6554a4487b 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=72
+EXTRA_VERSION=74
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index eea846ac8ef1e57574ef42565b9811b2d1270d3a..5f22dbb02c499b989f7ad00243b64efcf87a82d7 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -674,7 +674,6 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
        GtkWidget *label_icon_text;
        GtkWidget *entry_icon_text;
        GtkWidget *label_action_sel;
-       GtkWidget *empty_label;
        GtkWidget *combo_action;
        GtkWidget *combo_entry;
        GtkWidget *combo_list;
@@ -737,8 +736,8 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
                          (GtkAttachOptions) (0), 0, 0);
 
        entry_icon_text = gtk_entry_new();
-       gtk_table_attach (GTK_TABLE (table), entry_icon_text, 1, 2, 0, 1,
-                         (GtkAttachOptions) (/*GTK_EXPAND | */GTK_FILL),
+       gtk_table_attach (GTK_TABLE (table), entry_icon_text, 1, 3, 0, 1,
+                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
 
        /* Sylpheed Action Combo Box */
@@ -746,14 +745,10 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
        combo_syl_list = GTK_COMBO(combo_syl_action)->list;
        combo_syl_entry = GTK_COMBO(combo_syl_action)->entry;
        gtk_entry_set_editable(GTK_ENTRY(combo_syl_entry), FALSE);
-       gtk_table_attach (GTK_TABLE (table), combo_syl_action, 1, 2, 0, 1,
-                         (GtkAttachOptions) (/*GTK_EXPAND | */GTK_FILL),
+       gtk_table_attach (GTK_TABLE (table), combo_syl_action, 1, 3, 0, 1,
+                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
 
-       empty_label = gtk_label_new("");
-       gtk_table_attach (GTK_TABLE (table), empty_label, 2, 3, 0, 1,
-                         (GtkAttachOptions) (GTK_EXPAND),
-                         (GtkAttachOptions) (0), 0, 0);
        /* available actions */
        label_action_sel = gtk_label_new(_("Event executed on click"));
        gtk_misc_set_alignment(GTK_MISC(label_action_sel), 0, 0.5);
@@ -762,7 +757,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
                          (GtkAttachOptions) (0), 0, 0);
 
        combo_action = gtk_combo_new();
-       gtk_table_attach (GTK_TABLE (table), combo_action, 1, 2, 1, 2,
+       gtk_table_attach (GTK_TABLE (table), combo_action, 1, 3, 1, 2,
                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
        
@@ -770,11 +765,6 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
        combo_entry = GTK_COMBO(combo_action)->entry;
        gtk_entry_set_editable(GTK_ENTRY(combo_entry), FALSE);
        
-       empty_label = gtk_label_new("");
-       gtk_table_attach (GTK_TABLE (table), empty_label, 2, 3, 1, 2,
-                         (GtkAttachOptions) (GTK_EXPAND),
-                         (GtkAttachOptions) (0), 0, 0);
-
        /* register / substitute / delete */
        reg_hbox = gtk_hbox_new(FALSE, 4);
        gtk_box_pack_start(GTK_BOX(main_vbox), reg_hbox, FALSE, FALSE, 0);