Patch by Ralph Sennhauser.
Thomas Orgis
Olaf Hering
Michael Gmelin
+ Ralph Sennhauser
entryBook = gtk_entry_new();
#else
books = addressbook_dbus_get_books(&error);
- entryBook = gtk_combo_box_new_text();
+ entryBook = gtk_combo_box_text_new();
if (books) {
for (cur = books; cur; cur = g_slist_next(cur)) {
gchar* book = (gchar *) cur->data;
- gtk_combo_box_prepend_text(GTK_COMBO_BOX(entryBook), book);
+ gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(entryBook), book);
g_free(book);
}
g_slist_free(books);
}
else
- gtk_combo_box_prepend_text(GTK_COMBO_BOX(entryBook), "");
+ gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(entryBook), "");
gtk_combo_box_set_active(GTK_COMBO_BOX(entryBook), 0);
#endif
gtk_table_attach( GTK_TABLE(table), entryBook, 1, 2, top, (top + 1),
gchar **attribute = (gchar **) ATTRIBUTE;
- combo_box = gtk_combo_box_new_text();
+ combo_box = gtk_combo_box_text_new();
while (*attribute) {
if (!strcmp(*attribute, "jpegPhoto")) {
attribute++;
continue;
}
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), *attribute++);
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), *attribute++);
}
gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 0);
"Simon 'corecode' Schubert",
"Kim Schulz",
"Markus Schwarzenberg",
+"Ralph Sennhauser",
"Setoh",
"Michael Shell",
"shigeri",
gboolean combobox_set_value_from_arrow_key(GtkComboBox *combobox,
guint keyval)
/* used from key_press events upon gtk_combo_box_entry with one text column
- (gtk_combo_box_new_text() and with GtkComboBoxEntry's for instance),
+ (gtk_combo_box_text_new() and with GtkComboBoxEntry's for instance),
make sure that up and down arrow keys behave the same as old with old
gtk_combo widgets:
when pressing Up:
GtkTreeIter *iter,
const gchar* text)
/* do the same as gtk_tree_model_iter_next, but _prev instead.
- to use with widgets with one text column (gtk_combo_box_new_text()
+ to use with widgets with one text column (gtk_combo_box_text_new()
and with GtkComboBoxEntry's for instance),
*/
{
label = gtk_label_new(_("Show banner"));
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
gtk_widget_show(label);
- combo = gtk_combo_box_new_text();
- gtk_combo_box_insert_text(GTK_COMBO_BOX(combo), NOTIFY_BANNER_SHOW_NEVER,
+ combo = gtk_combo_box_text_new();
+ gtk_combo_box_text_insert_text(GTK_COMBO_BOX_TEXT(combo), NOTIFY_BANNER_SHOW_NEVER,
_("Never"));
- gtk_combo_box_insert_text(GTK_COMBO_BOX(combo), NOTIFY_BANNER_SHOW_ALWAYS,
+ gtk_combo_box_text_insert_text(GTK_COMBO_BOX_TEXT(combo), NOTIFY_BANNER_SHOW_ALWAYS,
_("Always"));
- gtk_combo_box_insert_text(GTK_COMBO_BOX(combo), NOTIFY_BANNER_SHOW_NONEMPTY,
+ gtk_combo_box_text_insert_text(GTK_COMBO_BOX_TEXT(combo), NOTIFY_BANNER_SHOW_NONEMPTY,
_("Only when not empty"));
gtk_combo_box_set_active(GTK_COMBO_BOX(combo), notify_config.banner_show);
gtk_box_pack_start(GTK_BOX(hbox), combo, FALSE, FALSE, 0);
VCalAttendee *attendee = g_new0(VCalAttendee, 1);
attendee->address = gtk_entry_new();
- attendee->cutype = gtk_combo_box_new_text();
+ attendee->cutype = gtk_combo_box_text_new();
attendee->avail_evtbox = gtk_event_box_new();
attendee->avail_img = gtk_image_new_from_stock
(GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR);
if (partstat)
attendee->status = g_strdup(partstat);
- gtk_combo_box_append_text(GTK_COMBO_BOX(attendee->cutype), _("Individual"));
- gtk_combo_box_append_text(GTK_COMBO_BOX(attendee->cutype), _("Group"));
- gtk_combo_box_append_text(GTK_COMBO_BOX(attendee->cutype), _("Resource"));
- gtk_combo_box_append_text(GTK_COMBO_BOX(attendee->cutype), _("Room"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(attendee->cutype), _("Individual"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(attendee->cutype), _("Group"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(attendee->cutype), _("Resource"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(attendee->cutype), _("Room"));
gtk_combo_box_set_active(GTK_COMBO_BOX(attendee->cutype), 0);
meet->table1 = gtk_table_new(4, 2, FALSE);
meet->table2 = gtk_table_new(2, 2, FALSE);
#endif
- meet->who = gtk_combo_box_new_text();
+ meet->who = gtk_combo_box_text_new();
meet->start_c = gtk_calendar_new();
meet->end_c = gtk_calendar_new();
s = g_strdup_printf("%s: %s",
ac->account_name, ac->address);
- gtk_combo_box_append_text(GTK_COMBO_BOX(meet->who), s);
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(meet->who), s);
g_free(s);
i++;
}
gtk_widget_hide(vcalviewer->button);
for (i = 0; i < 3; i++)
- gtk_combo_box_remove_text(GTK_COMBO_BOX(vcalviewer->answer), 0);
+ gtk_combo_box_text_remove(GTK_COMBO_BOX_TEXT(vcalviewer->answer), 0);
vcalviewer_show_unavailable(vcalviewer, FALSE);
ICAL_CUTYPE_INDIVIDUAL);
}
if (account) {
- gtk_combo_box_append_text(GTK_COMBO_BOX(vcalviewer->answer), _("Accept"));
- gtk_combo_box_append_text(GTK_COMBO_BOX(vcalviewer->answer), _("Tentatively accept"));
- gtk_combo_box_append_text(GTK_COMBO_BOX(vcalviewer->answer), _("Decline"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(vcalviewer->answer), _("Accept"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(vcalviewer->answer), _("Tentatively accept"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(vcalviewer->answer), _("Decline"));
gtk_widget_set_sensitive(vcalviewer->answer, TRUE);
gtk_widget_set_sensitive(vcalviewer->button, TRUE);
gtk_widget_show(vcalviewer->answer);
gtk_widget_show(vcalviewer->button);
} else {
- gtk_combo_box_append_text(GTK_COMBO_BOX(vcalviewer->answer), "-");
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(vcalviewer->answer), "-");
gtk_widget_set_sensitive(vcalviewer->answer, FALSE);
gtk_widget_set_sensitive(vcalviewer->button, FALSE);
}
} else {
- gtk_combo_box_append_text(GTK_COMBO_BOX(vcalviewer->answer), "-");
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(vcalviewer->answer), "-");
gtk_widget_set_sensitive(vcalviewer->answer, FALSE);
gtk_widget_set_sensitive(vcalviewer->button, FALSE);
}
vcalviewer->description = gtk_label_new("description");
vcalviewer->attendees = gtk_label_new("attendees");
- vcalviewer->answer = gtk_combo_box_new_text();
+ vcalviewer->answer = gtk_combo_box_text_new();
vcalviewer->url = NULL;
vcalviewer->button = gtk_button_new_with_label(_("Answer"));
vcalviewer->reedit = gtk_button_new_with_label(_("Edit meeting..."));