2007-11-19 [wwp] 3.1.0cvs4
authorTristan Chabredier <wwp@claws-mail.org>
Mon, 19 Nov 2007 15:36:40 +0000 (15:36 +0000)
committerTristan Chabredier <wwp@claws-mail.org>
Mon, 19 Nov 2007 15:36:40 +0000 (15:36 +0000)
* src/compose.c
* src/compose.h
Revert changes to compose.c made in 3.1.0cvs2.

ChangeLog
PATCHSETS
configure.ac
src/compose.c
src/compose.h

index 76ae7de..2775c68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-19 [wwp]       3.1.0cvs4
+
+       * src/compose.c
+       * src/compose.h
+               Revert changes to compose.c made in 3.1.0cvs2.
+
 2007-11-19 [wwp]       3.1.0cvs3
 
        * src/addressbook.c
index 6abfc69..c614b7d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/edittags.c;  ) > 3.1.0cvs1.patchset
 ( cvs diff -u -r 1.382.2.421 -r 1.382.2.422 src/compose.c;  cvs diff -u -r 1.50.2.43 -r 1.50.2.44 src/compose.h;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/prefs_logging.c;  cvs diff -u -r 1.1.2.47 -r 1.1.2.48 src/prefs_summaries.c;  ) > 3.1.0cvs2.patchset
 ( cvs diff -u -r 1.60.2.105 -r 1.60.2.106 src/addressbook.c;  cvs diff -u -r 1.18.2.11 -r 1.18.2.12 src/addressbook.h;  cvs diff -u -r 1.14.2.44 -r 1.14.2.45 src/editaddress.c;  cvs diff -u -r 1.11.2.17 -r 1.11.2.18 src/editgroup.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/addrduplicates.c;  ) > 3.1.0cvs3.patchset
+( cvs diff -u -r 1.382.2.422 -r 1.382.2.423 src/compose.c;  cvs diff -u -r 1.50.2.44 -r 1.50.2.45 src/compose.h;  ) > 3.1.0cvs4.patchset
index f77a1a7..976a5f2 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index eaa7eb3..eb27cb5 100644 (file)
@@ -6035,7 +6035,6 @@ static void compose_create_header_entry(Compose *compose)
 
        /* Combo box */
        combo = gtk_combo_box_entry_new_text();
-       gtk_size_group_add_widget(compose->size_group, combo);
        string = headers; 
        while(*string != NULL) {
                gtk_combo_box_append_text(GTK_COMBO_BOX(combo),
@@ -6158,8 +6157,6 @@ static GtkWidget *compose_create_header(Compose *compose)
 
        gint count = 0;
 
-       compose->size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-
        /* header labels and entries */
        header_scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_widget_show(header_scrolledwin);
@@ -6168,7 +6165,6 @@ static GtkWidget *compose_create_header(Compose *compose)
        header_table = gtk_table_new(2, 2, FALSE);
        gtk_widget_show(header_table);
        gtk_container_set_border_width(GTK_CONTAINER(header_table), BORDER_WIDTH);
-       gtk_table_set_col_spacings(GTK_TABLE(header_table), 6);
        gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(header_scrolledwin), header_table);
        gtk_viewport_set_shadow_type(GTK_VIEWPORT(GTK_BIN(header_scrolledwin)->child), GTK_SHADOW_NONE);
        count = 0;
@@ -6960,7 +6956,6 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
 
        optmenubox = gtk_event_box_new();
        optmenu = gtkut_sc_combobox_create(optmenubox, FALSE);
-       gtk_size_group_add_widget(compose->size_group, optmenu);
        menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
 
        hbox = gtk_hbox_new(FALSE, 6);
index 3c37d2d..5fe568c 100644 (file)
@@ -97,7 +97,6 @@ struct _Compose
        Toolbar *toolbar;
        
        GtkWidget *vbox2;
-       GtkSizeGroup *size_group;
 
        /* Header */
        GtkWidget *table_vbox;