[planner: 10/61] Switch from GtkComboBoxEntry to GtkComboBox

[Mart Raudsepp <mraudsepp src gnome org>]

commit 5fce94f0a40c8b59fbe28e36ee5585bb8df9c1aa
Author: Alexandre Franke <alexandre franke gmail com>
Date:   Fri May 17 15:43:31 2013 +0200

    Switch from GtkComboBoxEntry to GtkComboBox
    
    GtkComboBoxEntry has been disabled in 2.24.
    We don't lose any feature since our GtkComboBox has the has-entry
    property set to True.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=575129

 data/ui/add-predecessor.ui | 3 ++-
 src/planner-task-dialog.c  | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/data/ui/add-predecessor.ui b/data/ui/add-predecessor.ui
index 0edd563e..a44d10d2 100644
--- a/data/ui/add-predecessor.ui
+++ b/data/ui/add-predecessor.ui
@@ -183,11 +183,12 @@
               </packing>
             </child>
             <child>
-              <object class="GtkComboBoxEntry" id="predecessor_combo">
+              <object class="GtkComboBox" id="predecessor_combo">
                 <property name="visible">True</property>
                 <property name="add_tearoffs">False</property>
                 <property name="has_frame">True</property>
                 <property name="focus_on_click">True</property>
+                <property name="has_entry">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
diff --git a/src/planner-task-dialog.c b/src/planner-task-dialog.c
index aa92fddf..e6968a1e 100644
--- a/src/planner-task-dialog.c
+++ b/src/planner-task-dialog.c
@@ -351,7 +351,7 @@ task_dialog_option_menu_set_selected (GtkWidget *option_menu, gint data)
 #endif
 
 static void
-task_dialog_setup_task_combo (GtkComboBoxEntry *combo,
+task_dialog_setup_task_combo (GtkComboBox *combo,
                              GList    *tasks)
 {
        GtkListStore *store;
@@ -397,7 +397,7 @@ task_dialog_setup_task_combo (GtkComboBoxEntry *combo,
        gtk_combo_box_set_model (GTK_COMBO_BOX (combo),
                                 GTK_TREE_MODEL (store));
 
-       gtk_combo_box_entry_set_text_column (combo, 0);
+       gtk_combo_box_set_entry_text_column (combo, 0);
 
        gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
 }
@@ -1895,7 +1895,7 @@ task_dialog_predecessor_dialog_new (MrpTask       *task,
 
        tasks = mrp_project_get_all_tasks (project);
        tasks = g_list_remove (tasks, task);
-       task_dialog_setup_task_combo (GTK_COMBO_BOX_ENTRY (w), tasks);
+       task_dialog_setup_task_combo (GTK_COMBO_BOX (w), tasks);
 
        w = GTK_WIDGET (gtk_builder_get_object (builder, "type_optionmenu"));
        g_object_set_data (G_OBJECT (dialog), "type_optionmenu", w);