2011-04-10 [colin] 3.7.9cvs10

[claws.git] / src / prefs_toolbar.c

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index b83be45586601f4df66c6b5ba3e035d7b5422596..ee4003e786e21c8b347ce6206a60cd19d0c1b32c 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -370,9 +370,7 @@ static void prefs_toolbar_set_displayed(ToolbarPage *prefs_toolbar)
 
 static void add_item_to_plugin_combo(gpointer key, gpointer data, gpointer combo_box)
 {
-       gtk_combo_box_text_append_text(
-               GTK_COMBO_BOX_TEXT(combo_box),
-               (const gchar*)key);
+       gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), (const gchar*)key);
 }
 
 static void prefs_toolbar_populate(ToolbarPage *prefs_toolbar)
@@ -391,8 +389,8 @@ static void prefs_toolbar_populate(ToolbarPage *prefs_toolbar)
                        act = (gchar *)cur->data;
                        get_action_name(act, &act_name);
                        
-                       gtk_combo_box_text_append_text(
-                               GTK_COMBO_BOX_TEXT(prefs_toolbar->item_action_combo),
+                       gtk_combo_box_append_text(
+                               GTK_COMBO_BOX(prefs_toolbar->item_action_combo),
                                act_name);
 
                        g_free(act_name);
@@ -514,8 +512,8 @@ static void prefs_toolbar_register(GtkButton *button, ToolbarPage *prefs_toolbar
                }
                                
                if (item_type == ITEM_FUNCTION) {
-                       event = gtk_combo_box_text_get_active_text(
-                               GTK_COMBO_BOX_TEXT(prefs_toolbar->item_func_combo));
+                       event = gtk_combo_box_get_active_text(GTK_COMBO_BOX(
+                                               prefs_toolbar->item_func_combo));
                                                
                        if (is_duplicate(prefs_toolbar, event)) {
                                alertpanel_error(ERROR_MSG);
@@ -600,8 +598,8 @@ static void prefs_toolbar_substitute(GtkButton *button, ToolbarPage *prefs_toolb
                                                  -1);
                
                if (item_type == ITEM_FUNCTION) {
-                       icon_event = gtk_combo_box_text_get_active_text(
-                               GTK_COMBO_BOX_TEXT(prefs_toolbar->item_func_combo));
+                       icon_event = gtk_combo_box_get_active_text(GTK_COMBO_BOX(
+                                               prefs_toolbar->item_func_combo));
                                                
                        if (is_duplicate(prefs_toolbar, icon_event)
                        && g_utf8_collate(icon_event, set_event) != 0){
@@ -794,7 +792,7 @@ static void item_type_changed(GtkComboBox *item_type_combo,
 static void action_selection_changed(GtkComboBox *action_combo,
                                ToolbarPage *prefs_toolbar)
 {
-       gchar *text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(
+       gchar *text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(
                           prefs_toolbar->item_action_combo));
 
        if(text != NULL) { /* action */
@@ -806,7 +804,7 @@ static void action_selection_changed(GtkComboBox *action_combo,
 static void plugin_selection_changed(GtkComboBox *action_combo,
                 ToolbarPage *prefs_toolbar)
 {
-       gchar *text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(prefs_toolbar->item_plugin_combo));
+       gchar *text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(prefs_toolbar->item_plugin_combo));
 
        if (text != NULL) { /* action */
                gtk_entry_set_text(GTK_ENTRY(prefs_toolbar->item_text_entry), text);
@@ -817,7 +815,7 @@ static void plugin_selection_changed(GtkComboBox *action_combo,
 static void func_selection_changed(GtkComboBox *action_combo,
                                ToolbarPage *prefs_toolbar)
 {
-       gchar *text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(
+       gchar *text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(
                           prefs_toolbar->item_func_combo));
 
        if(text != NULL) { /* action */
@@ -925,21 +923,21 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
 
-       item_action_combo = gtk_combo_box_text_new();
+       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, 1, 2,
                          (GtkAttachOptions) (GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
                          
        /* available internal functions */
-       item_func_combo = gtk_combo_box_text_new();
+       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, 1, 2,
                          (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                          (GtkAttachOptions) (0), 0, 0);
        
        /* plugin-registered items */
-       item_plugin_combo = gtk_combo_box_text_new();
+       item_plugin_combo = gtk_combo_box_new_text();
        gtk_widget_set_size_request(item_plugin_combo, 200, -1);
        gtk_table_attach(GTK_TABLE(table), item_plugin_combo, 1, 3, 1, 2,
                         (GtkAttachOptions) (GTK_FILL),