2007-10-06 [colin] 3.0.2cvs20

	* src/prefs_toolbar.c
		Invert Text and Event fields

diff --git a/ChangeLog b/ChangeLog
index 999389f4c7f381878051ecacab240532c5297099..c0b4560028a8046d6d83b8928c03dd57c3715cec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-06 [colin]     3.0.2cvs20
+
+       * src/prefs_toolbar.c
+               Invert Text and Event fields
+

 2007-10-06 [colin]     3.0.2cvs19
 
        * src/prefs_toolbar.c
 2007-10-06 [colin]     3.0.2cvs19
 
        * src/prefs_toolbar.c

diff --git a/PATCHSETS b/PATCHSETS
index eaee236ac6223df69e75b275d7946ec565c390fd..d26f64cdbbea91a1711efc8b117b7807a20abaa2 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2932,3 +2932,4 @@
 ( cvs diff -u -r 1.654.2.2985 -r 1.654.2.2986 configure.ac;  ) > 3.0.2cvs17.patchset
 ( cvs diff -u -r 1.61.2.71 -r 1.61.2.72 src/account.c;  cvs diff -u -r 1.59.2.59 -r 1.59.2.60 src/prefs_filtering.c;  ) > 3.0.2cvs18.patchset
 ( cvs diff -u -r 1.30.2.35 -r 1.30.2.36 src/prefs_toolbar.c;  cvs diff -u -r 1.43.2.84 -r 1.43.2.85 src/toolbar.c;  ) > 3.0.2cvs19.patchset
 ( cvs diff -u -r 1.654.2.2985 -r 1.654.2.2986 configure.ac;  ) > 3.0.2cvs17.patchset
 ( cvs diff -u -r 1.61.2.71 -r 1.61.2.72 src/account.c;  cvs diff -u -r 1.59.2.59 -r 1.59.2.60 src/prefs_filtering.c;  ) > 3.0.2cvs18.patchset
 ( cvs diff -u -r 1.30.2.35 -r 1.30.2.36 src/prefs_toolbar.c;  cvs diff -u -r 1.43.2.84 -r 1.43.2.85 src/toolbar.c;  ) > 3.0.2cvs19.patchset

+( cvs diff -u -r 1.30.2.36 -r 1.30.2.37 src/prefs_toolbar.c;  ) > 3.0.2cvs20.patchset

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

-EXTRA_VERSION=19
+EXTRA_VERSION=20

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 431cc70530b82831e75337530938062f196d3702..b1dc6cacc297fa9c366a8792678019876d1ee3df 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -721,39 +721,39 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);
 
                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);
 

-       /* toolbar item description */
-       label_icon_text = gtk_label_new(_("Toolbar text"));
-       gtk_misc_set_alignment(GTK_MISC(label_icon_text), 0, 0.5);
-       gtk_widget_show (label_icon_text);
-       gtk_table_attach (GTK_TABLE (table), label_icon_text, 0, 1, 1, 2,
-                         (GtkAttachOptions) (GTK_FILL),
-                         (GtkAttachOptions) (0), 0, 0);
-
-       item_text_entry = gtk_entry_new();
-       gtk_table_attach (GTK_TABLE (table), item_text_entry, 1, 3, 1, 2,
-                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                         (GtkAttachOptions) (0), 0, 0);
-

        /* available actions */
        label = gtk_label_new(_("Event executed on click"));
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
        /* available actions */
        label = gtk_label_new(_("Event executed on click"));
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);

-       gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
+       gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,

                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
 
        item_action_combo = gtk_combo_box_new_text();
        gtk_widget_set_size_request(item_action_combo, 200, -1);
                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
 
        item_action_combo = gtk_combo_box_new_text();
        gtk_widget_set_size_request(item_action_combo, 200, -1);

-       gtk_table_attach (GTK_TABLE (table), item_action_combo, 1, 3, 2, 3,
+       gtk_table_attach (GTK_TABLE (table), item_action_combo, 1, 3, 1, 2,

                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
                          
        /* available internal functions */
        item_func_combo = gtk_combo_box_new_text();
        gtk_widget_set_size_request(item_func_combo, 200, -1);
                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
                          
        /* available internal functions */
        item_func_combo = gtk_combo_box_new_text();
        gtk_widget_set_size_request(item_func_combo, 200, -1);

-       gtk_table_attach (GTK_TABLE (table), item_func_combo, 1, 3, 2, 3,
+       gtk_table_attach (GTK_TABLE (table), item_func_combo, 1, 3, 1, 2,

                          (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
        
                          (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
        

+       /* toolbar item description */
+       label_icon_text = gtk_label_new(_("Toolbar text"));
+       gtk_misc_set_alignment(GTK_MISC(label_icon_text), 0, 0.5);
+       gtk_widget_show (label_icon_text);
+       gtk_table_attach (GTK_TABLE (table), label_icon_text, 0, 1, 2, 3,
+                         (GtkAttachOptions) (GTK_FILL),
+                         (GtkAttachOptions) (0), 0, 0);
+
+       item_text_entry = gtk_entry_new();
+       gtk_table_attach (GTK_TABLE (table), item_text_entry, 1, 3, 2, 3,
+                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                         (GtkAttachOptions) (0), 0, 0);
+

        icon_vbox = gtk_vbox_new(FALSE, VBOX_BORDER);
        gtk_widget_show(icon_vbox);
        
        icon_vbox = gtk_vbox_new(FALSE, VBOX_BORDER);
        gtk_widget_show(icon_vbox);