diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-01-14 12:22:29 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:41:25 +0800 |
| commit | cadcc080eeb998a52b2163604e07fa5a71089391 (patch) | |
| tree | 99773aaf880690e67f54f7a8e45f856fb35d5d00 /calendar | |
| parent | dbbe7408c563f9a6e47f65d5d3db7ee541285b41 (diff) | |
| download | gsoc2013-evolution-cadcc080eeb998a52b2163604e07fa5a71089391.tar.gz gsoc2013-evolution-cadcc080eeb998a52b2163604e07fa5a71089391.tar.zst gsoc2013-evolution-cadcc080eeb998a52b2163604e07fa5a71089391.zip | |
Adapt to GtkComboBox class reorg.
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/gui/dialogs/event-page.c | 2 | ||||
| -rw-r--r-- | calendar/gui/dialogs/event-page.ui | 4 | ||||
| -rw-r--r-- | calendar/gui/dialogs/memo-page.c | 2 | ||||
| -rw-r--r-- | calendar/gui/dialogs/memo-page.ui | 4 | ||||
| -rw-r--r-- | calendar/gui/dialogs/task-page.c | 2 | ||||
| -rw-r--r-- | calendar/gui/dialogs/task-page.ui | 3 |
6 files changed, 11 insertions, 6 deletions
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 1798d09f90..7595f50915 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -2247,7 +2247,7 @@ get_widgets (EventPage *epage) priv->organizer = GW ("organizer"); gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (priv->organizer)))); - gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX_ENTRY (priv->organizer), 0); + gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (priv->organizer), 0); priv->summary = GW ("summary"); priv->summary_label = GW ("summary-label"); diff --git a/calendar/gui/dialogs/event-page.ui b/calendar/gui/dialogs/event-page.ui index 0f5841ea08..0d3d73f5a8 100644 --- a/calendar/gui/dialogs/event-page.ui +++ b/calendar/gui/dialogs/event-page.ui @@ -741,10 +741,12 @@ <property name="homogeneous">True</property> <property name="spacing">0</property> <child> - <object class="GtkComboBoxEntry" id="organizer"> + <object class="GtkComboBox" id="organizer"> <property name="visible">True</property> <property name="add_tearoffs">False</property> <property name="has_frame">True</property> + <property name="has-entry">True</property> + <property name="entry-text-column">0</property> <property name="focus_on_click">True</property> <property name="model">model2</property> </object> diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index 60d6098a7e..996a4de8a5 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -826,7 +826,7 @@ get_widgets (MemoPage *mpage) priv->org_label = GW ("org-label"); priv->org_combo = GW ("org-combo"); gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (priv->org_combo)))); - gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX_ENTRY (priv->org_combo), 0); + gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (priv->org_combo), 0); priv->to_button = GW ("to-button"); priv->to_hbox = GW ("to-hbox"); diff --git a/calendar/gui/dialogs/memo-page.ui b/calendar/gui/dialogs/memo-page.ui index 6e9be05058..f0dd0bb974 100644 --- a/calendar/gui/dialogs/memo-page.ui +++ b/calendar/gui/dialogs/memo-page.ui @@ -422,10 +422,12 @@ </packing> </child> <child> - <object class="GtkComboBoxEntry" id="org-combo"> + <object class="GtkComboBox" id="org-combo"> <property name="visible">False</property> <property name="add_tearoffs">False</property> <property name="has_frame">True</property> + <property name="has-entry">True</property> + <property name="entry-text-column">0</property> <property name="focus_on_click">True</property> <property name="model">model1</property> </object> diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 8fe16d007d..7956b1b5d7 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -1418,7 +1418,7 @@ get_widgets (TaskPage *tpage) priv->organizer = e_builder_get_widget (priv->builder, "organizer"); gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (priv->organizer)))); - gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX_ENTRY (priv->organizer), 0); + gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (priv->organizer), 0); priv->invite = e_builder_get_widget (priv->builder, "invite"); priv->add = e_builder_get_widget (priv->builder, "add-attendee"); diff --git a/calendar/gui/dialogs/task-page.ui b/calendar/gui/dialogs/task-page.ui index 5d685a32f8..664caadf68 100644 --- a/calendar/gui/dialogs/task-page.ui +++ b/calendar/gui/dialogs/task-page.ui @@ -408,9 +408,10 @@ <property name="spacing">6</property> <property name="homogeneous">True</property> <child> - <object class="GtkComboBoxEntry" id="organizer"> + <object class="GtkComboBox" id="organizer"> <property name="visible">True</property> <property name="model">model1</property> + <property name="has-entry">TRUE</property> </object> <packing> <property name="position">0</property> |