2008-10-08 [paul] 3.6.0cvs17

[claws.git] / src / prefs_filtering_action.c

diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index 1cb26fe7980e211a1b852753b60c9ebee79b1c09..5536c842b32dc3bd95c4e305f284a9bec7c2bfba 100644 (file)
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -17,7 +17,6 @@
  * 
  */
 
-#undef GTK_DISABLE_DEPRECATED /* Fixme GtkOptionMenu */
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
@@ -33,6 +32,7 @@
 #include <string.h>
 #include <errno.h>
 
+#include "gtkcmoptionmenu.h"
 #include "main.h"
 #include "prefs_gtk.h"
 #include "prefs_filtering_action.h"
@@ -271,7 +271,7 @@ void prefs_filtering_action_open(GSList *action_list,
                prefs_filtering_action_create();
        } else {
                /* update color label menu */
-               gtk_option_menu_set_menu(GTK_OPTION_MENU(filtering_action.color_optmenu),
+               gtk_cmoption_menu_set_menu(GTK_CMOPTION_MENU(filtering_action.color_optmenu),
                                colorlabel_create_color_menu());
        }
 
@@ -489,7 +489,7 @@ static void prefs_filtering_action_create(void)
        gtk_size_group_add_widget(size_action, header_combo);
        gtk_box_pack_start (GTK_BOX (hbox1), header_combo,
                            FALSE, FALSE, 0);
-       header_entry = GTK_BIN(header_combo)->child;
+       header_entry = gtk_bin_get_child(GTK_BIN((header_combo)));
 
        /* destination */
 
@@ -503,9 +503,9 @@ static void prefs_filtering_action_create(void)
        score_entry = gtk_spin_button_new_with_range(-1000, 1000, 1);
        gtk_box_pack_start(GTK_BOX(hbox1), score_entry, FALSE, FALSE, 0);
        
-       color_optmenu = gtk_option_menu_new();
+       color_optmenu = gtk_cmoption_menu_new();
        gtk_size_group_add_widget(size_action, color_optmenu);
-       gtk_option_menu_set_menu(GTK_OPTION_MENU(color_optmenu),
+       gtk_cmoption_menu_set_menu(GTK_CMOPTION_MENU(color_optmenu),
                                 colorlabel_create_color_menu());
        prefs_filtering_action_check_widget_width(color_optmenu);
        gtk_box_pack_start(GTK_BOX(hbox1), color_optmenu, FALSE, FALSE, 0);
@@ -904,7 +904,7 @@ static FilteringAction * prefs_filtering_action_dialog_to_action(gboolean alert)
                break;
        case ACTION_COLOR:
                labelcolor = colorlabel_get_color_menu_active_item(
-                       gtk_option_menu_get_menu(GTK_OPTION_MENU(filtering_action.color_optmenu)));
+                       gtk_cmoption_menu_get_menu(GTK_CMOPTION_MENU(filtering_action.color_optmenu)));
                destination = NULL;     
                break;
         case ACTION_CHANGE_SCORE:
@@ -1273,8 +1273,8 @@ static void prefs_filtering_action_enable_widget(GtkWidget* widget, const gboole
                        gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), 0);
                else if(GTK_IS_ENTRY(widget)) {
                        gtk_entry_set_text(GTK_ENTRY(widget), "");
-               } else if(GTK_IS_OPTION_MENU(widget))
-                       gtk_option_menu_set_history(GTK_OPTION_MENU(widget), 0);
+               } else if(GTK_IS_CMOPTION_MENU(widget))
+                       gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(widget), 0);
                
                gtk_widget_set_sensitive(widget, TRUE);
                gtk_widget_show(widget);
@@ -1431,6 +1431,7 @@ static GtkWidget *prefs_filtering_action_list_view_create(void)
        g_object_unref(model);  
        
        gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
+       gtk_tree_view_set_reorderable(list_view, TRUE);
 
        selector = gtk_tree_view_get_selection(list_view);
        gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
@@ -1572,7 +1573,7 @@ static gboolean prefs_filtering_actions_selected
        case MATCHACTION_COLOR:
                combobox_select_by_data(GTK_COMBO_BOX(filtering_action.action_combo),
                                     ACTION_COLOR);
-               gtk_option_menu_set_history(GTK_OPTION_MENU(filtering_action.color_optmenu),
+               gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(filtering_action.color_optmenu),
                                            action->labelcolor);     
                break;
        case MATCHACTION_CHANGE_SCORE: