2007-10-06 [colin] 3.0.2cvs23

	* src/prefs_toolbar.c
		Fix text reset; patch by Pawel

diff --git a/ChangeLog b/ChangeLog
index 9af0698f5da20361e591e9583388de9877b6bc9d..e42a1ef24dd3641c8c8464cef15bad3823dee8c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-06 [colin]     3.0.2cvs23
+
+       * src/prefs_toolbar.c
+               Fix text reset; patch by Pawel
+

 2007-10-06 [colin]     3.0.2cvs22
 
        * src/toolbar.h
 2007-10-06 [colin]     3.0.2cvs22
 
        * src/toolbar.h

diff --git a/PATCHSETS b/PATCHSETS
index 170fbbd90f11e0569ac0320829ce3eba639acafc..4a383b6cd783df4f2677d2c669117b1dc512192d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2935,3 +2935,4 @@
 ( cvs diff -u -r 1.30.2.36 -r 1.30.2.37 src/prefs_toolbar.c;  ) > 3.0.2cvs20.patchset
 ( cvs diff -u -r 1.30.2.37 -r 1.30.2.38 src/prefs_toolbar.c;  cvs diff -u -r 1.43.2.85 -r 1.43.2.86 src/toolbar.c;  ) > 3.0.2cvs21.patchset
 ( cvs diff -u -r 1.19.2.22 -r 1.19.2.23 src/toolbar.h;  ) > 3.0.2cvs22.patchset
 ( cvs diff -u -r 1.30.2.36 -r 1.30.2.37 src/prefs_toolbar.c;  ) > 3.0.2cvs20.patchset
 ( cvs diff -u -r 1.30.2.37 -r 1.30.2.38 src/prefs_toolbar.c;  cvs diff -u -r 1.43.2.85 -r 1.43.2.86 src/toolbar.c;  ) > 3.0.2cvs21.patchset
 ( cvs diff -u -r 1.19.2.22 -r 1.19.2.23 src/toolbar.h;  ) > 3.0.2cvs22.patchset

+( cvs diff -u -r 1.30.2.38 -r 1.30.2.39 src/prefs_toolbar.c;  ) > 3.0.2cvs23.patchset

diff --git a/configure.ac b/configure.ac
index 9c720c58dd4b40e35bf3c570ad8789fdc63e0fbc..361bf45a03628c26b08f685c1a0cef4a16d5a73a 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=22
+EXTRA_VERSION=23

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 810270d404a6fe1e3d2812e82dac697ae9f62453..6fb6012a5f944b42e1433c8854d3741aff50ad8f 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -116,6 +116,12 @@ static void prefs_toolbar_up                     (GtkButton        *button,
 static void prefs_toolbar_down                   (GtkButton        *button,
                                                  ToolbarPage *prefs_toolbar);
 
 static void prefs_toolbar_down                   (GtkButton        *button,
                                                  ToolbarPage *prefs_toolbar);
 

+static void action_selection_changed            (GtkComboBox *action_combo,
+                                                 ToolbarPage *prefs_toolbar);
+
+static void func_selection_changed              (GtkComboBox *action_combo,
+                                                 ToolbarPage *prefs_toolbar);
+

 static void prefs_toolbar_create                 (ToolbarPage *prefs_toolbar);
 
 static GtkWidget *create_set_list_view          (ToolbarPage *prefs_toolbar);
 static void prefs_toolbar_create                 (ToolbarPage *prefs_toolbar);
 
 static GtkWidget *create_set_list_view          (ToolbarPage *prefs_toolbar);


@@ -602,10 +608,12 @@ static void item_type_changed(GtkComboBox *item_type_combo,
                gtk_combo_box_set_active(
                        GTK_COMBO_BOX(prefs_toolbar->item_func_combo), 0);
                gtk_button_set_label(GTK_BUTTON(prefs_toolbar->icon_button), "");
                gtk_combo_box_set_active(
                        GTK_COMBO_BOX(prefs_toolbar->item_func_combo), 0);
                gtk_button_set_label(GTK_BUTTON(prefs_toolbar->icon_button), "");

-               gtk_entry_set_text(GTK_ENTRY(prefs_toolbar->item_text_entry), "");

                gtk_widget_set_sensitive(prefs_toolbar->item_text_entry, TRUE);
                gtk_widget_set_sensitive(prefs_toolbar->item_func_combo, TRUE);
                gtk_widget_set_sensitive(prefs_toolbar->icon_button, TRUE);
                gtk_widget_set_sensitive(prefs_toolbar->item_text_entry, TRUE);
                gtk_widget_set_sensitive(prefs_toolbar->item_func_combo, TRUE);
                gtk_widget_set_sensitive(prefs_toolbar->icon_button, TRUE);

+
+               func_selection_changed(GTK_COMBO_BOX(prefs_toolbar->item_func_combo),
+                                       prefs_toolbar);

                break;
        case ITEM_USER_ACTION:
                gtk_widget_show(prefs_toolbar->item_action_combo);
                break;
        case ITEM_USER_ACTION:
                gtk_widget_show(prefs_toolbar->item_action_combo);


@@ -617,11 +625,8 @@ static void item_type_changed(GtkComboBox *item_type_combo,
                gtk_widget_set_sensitive(prefs_toolbar->item_action_combo, TRUE);
                gtk_widget_set_sensitive(prefs_toolbar->icon_button, TRUE);
                
                gtk_widget_set_sensitive(prefs_toolbar->item_action_combo, TRUE);
                gtk_widget_set_sensitive(prefs_toolbar->icon_button, TRUE);
                

-               gchar *text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(
-                                  prefs_toolbar->item_action_combo));
-               gtk_entry_set_text(GTK_ENTRY(prefs_toolbar->item_text_entry), text);
-               g_free(text);
-               
+               action_selection_changed(GTK_COMBO_BOX(prefs_toolbar->item_action_combo),
+                                       prefs_toolbar);         

                break;
        case ITEM_SEPARATOR:
                gtk_button_set_label(GTK_BUTTON(prefs_toolbar->icon_button), _("None"));
                break;
        case ITEM_SEPARATOR:
                gtk_button_set_label(GTK_BUTTON(prefs_toolbar->icon_button), _("None"));