From a1082f0e45e1e34c3f0193ff3a51588c89f914c1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 2 Jul 2009 13:49:11 -0400 Subject: Kill the last GtkOptionMenu instances. Wrote a new widget (ECharsetComboBox) to replace e-charset-picker.c. The widget provides a "charset" string property that allows us to bind to GConf keys (via EShellSettings). Moved e_charset_add_radio_actions() to e-util/e-charset.c. Updated Glade files, #include lines, etc. --- .../gui/contact-editor/e-contact-quick-add.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index 9bd97f2b84..cd81d28690 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -49,7 +49,7 @@ struct _QuickAdd { GtkWidget *dialog; GtkWidget *name_entry; GtkWidget *email_entry; - GtkWidget *option_menu; + GtkWidget *combo_box; gint refs; @@ -285,7 +285,7 @@ sanitize_widgets (QuickAdd *qa) g_return_if_fail (qa->dialog != NULL); /* do not call here e_book_is_writable (qa->book), because it requires opened book, which takes time for remote books */ - enabled = qa->book != NULL && e_source_combo_box_get_active_uid (E_SOURCE_COMBO_BOX (qa->option_menu)); + enabled = qa->book != NULL && e_source_combo_box_get_active_uid (E_SOURCE_COMBO_BOX (qa->combo_box)); gtk_dialog_set_response_sensitive (GTK_DIALOG (qa->dialog), QUICK_ADD_RESPONSE_EDIT_FULL, enabled); gtk_dialog_set_response_sensitive (GTK_DIALOG (qa->dialog), GTK_RESPONSE_OK, enabled); @@ -356,13 +356,13 @@ build_quick_add_dialog (QuickAdd *qa) gconf_client = gconf_client_get_default (); source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources"); g_object_unref (gconf_client); - qa->option_menu = e_source_combo_box_new (source_list); + qa->combo_box = e_source_combo_box_new (source_list); book = e_book_new_default_addressbook (NULL); e_source_combo_box_set_active ( - E_SOURCE_COMBO_BOX (qa->option_menu), + E_SOURCE_COMBO_BOX (qa->combo_box), e_book_get_source (book)); - if (!e_source_combo_box_get_active_uid (E_SOURCE_COMBO_BOX (qa->option_menu))) { + if (!e_source_combo_box_get_active_uid (E_SOURCE_COMBO_BOX (qa->combo_box))) { /* this means the e_book_new_default_addressbook didn't find any "default" nor "system" source, and created new one for us. That is wrong, choose one from combo instead. */ @@ -372,9 +372,9 @@ build_quick_add_dialog (QuickAdd *qa) } book = e_book_new (e_source_list_peek_source_any (source_list), NULL); - e_source_combo_box_set_active (E_SOURCE_COMBO_BOX (qa->option_menu), e_book_get_source (book)); + e_source_combo_box_set_active (E_SOURCE_COMBO_BOX (qa->combo_box), e_book_get_source (book)); - if (!e_source_combo_box_get_active_uid (E_SOURCE_COMBO_BOX (qa->option_menu))) { + if (!e_source_combo_box_get_active_uid (E_SOURCE_COMBO_BOX (qa->combo_box))) { /* Does it failed again? What is going on? */ if (book) g_object_unref (book); @@ -387,9 +387,9 @@ build_quick_add_dialog (QuickAdd *qa) qa->book = NULL; } qa->book = book; - source_changed (E_SOURCE_COMBO_BOX (qa->option_menu), qa); + source_changed (E_SOURCE_COMBO_BOX (qa->combo_box), qa); g_signal_connect ( - qa->option_menu, "changed", + qa->combo_box, "changed", G_CALLBACK (source_changed), qa); g_object_unref (source_list); @@ -421,13 +421,13 @@ build_quick_add_dialog (QuickAdd *qa) GTK_EXPAND | GTK_FILL, 0, xpad, ypad); label = gtk_label_new_with_mnemonic (_("_Select Address Book")); - gtk_label_set_mnemonic_widget ((GtkLabel *)label, qa->option_menu); + gtk_label_set_mnemonic_widget ((GtkLabel *)label, qa->combo_box); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (table, label, 0, 1, 2, 3, GTK_FILL, 0, xpad, ypad); - gtk_table_attach (table, qa->option_menu, + gtk_table_attach (table, qa->combo_box, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, 0, xpad, ypad); -- cgit