aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2010-11-18 20:35:36 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:41:01 +0800
commit12a91dbb21f2a052d26460c9aad30835fd17456b (patch)
tree5dede0765bb0f74f363614a05210e533655e0c39 /calendar
parent9e833a704ce57e4f571d0da91e795e6ae7cc2469 (diff)
downloadgsoc2013-evolution-12a91dbb21f2a052d26460c9aad30835fd17456b.tar
gsoc2013-evolution-12a91dbb21f2a052d26460c9aad30835fd17456b.tar.gz
gsoc2013-evolution-12a91dbb21f2a052d26460c9aad30835fd17456b.tar.bz2
gsoc2013-evolution-12a91dbb21f2a052d26460c9aad30835fd17456b.tar.lz
gsoc2013-evolution-12a91dbb21f2a052d26460c9aad30835fd17456b.tar.xz
gsoc2013-evolution-12a91dbb21f2a052d26460c9aad30835fd17456b.tar.zst
gsoc2013-evolution-12a91dbb21f2a052d26460c9aad30835fd17456b.zip
Bug #633779 - GtkComboBoxText issues
Diffstat (limited to 'calendar')
-rw-r--r--calendar/gui/dialogs/event-page.c21
-rw-r--r--calendar/gui/dialogs/event-page.ui2
2 files changed, 18 insertions, 5 deletions
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 32c2c18653..06ba14751b 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -2859,6 +2859,8 @@ init_widgets (EventPage *epage)
GtkTreeSelection *selection;
gboolean active;
ECal *client;
+ GtkTreeIter iter;
+ GtkListStore *store;
editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (epage));
client = comp_editor_get_client (editor);
@@ -3025,17 +3027,28 @@ init_widgets (EventPage *epage)
break;
}
+ store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (priv->alarm_time_combo)));
if (combo_label) {
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->alarm_time_combo), combo_label);
+ gtk_list_store_append (store, &iter);
+ gtk_list_store_set (store, &iter,
+ 0, combo_label,
+ -1);
g_free (combo_label);
priv->alarm_map = alarm_map_with_user_time;
} else {
priv->alarm_map = alarm_map_without_user_time;
}
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->alarm_time_combo), _("Customize"));
- /* Translators: "None" for "No alarm set" */
- gtk_combo_box_text_prepend_text (GTK_COMBO_BOX_TEXT (priv->alarm_time_combo), C_("cal-alarms", "None"));
+ gtk_list_store_append (store, &iter);
+ gtk_list_store_set (store, &iter,
+ 0, _("Customize"),
+ -1);
+
+ gtk_list_store_insert (store, &iter, 0);
+ gtk_list_store_set (store, &iter,
+ /* Translators: "None" for "No alarm set" */
+ 0, C_("cal-alarms", "None"),
+ -1);
g_signal_connect_swapped (
priv->alarm_time_combo, "changed",
diff --git a/calendar/gui/dialogs/event-page.ui b/calendar/gui/dialogs/event-page.ui
index fe3ece21ca..17919048a6 100644
--- a/calendar/gui/dialogs/event-page.ui
+++ b/calendar/gui/dialogs/event-page.ui
@@ -1059,7 +1059,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="alarm-time-combobox">
+ <object class="GtkComboBox" id="alarm-time-combobox">
<property name="visible">True</property>
<property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>