From 37751b5ece11dfa79a4175ec87f72670579d18ea Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Fri, 6 Dec 2002 17:29:59 +0000 Subject: #include . * gui/component/e-cardlist-model.c: #include . * gui/component/addressbook-storage.c: #include , , . * gui/component/addressbook-factory.c: Removed. * gui/component/addressbook-component.c: #include , and . (create_view): addressbook_new_control() instead of addressbook_factory_new_control(). * gui/component/select-names/e-select-names.c (e_addressbook_create_ebook_table): Removed unused variable. (e_select_names_add_section): Removed unused variable. * gui/component/select-names/e-select-names-manager.c (focus_in_cb): Use g_source_remove() here instead of gtk_timeout_remove(). * gui/widgets/e-minicard-control.c (e_minicard_control_factory_init): Removed. (e_minicard_control_control_factory): Removed. (e_minicard_control_new): New. * gui/component/e-address-widget.c (e_address_widget_factory_init): Removed. (e_address_widget_new_control): Renamed from e_address_widget_factory_new_control(), made public. (e_address_widget_factory): Removed. * gui/component/e-address-popup.c (e_address_popup_new_control): New. (e_address_popup_factory_new_control): Removed. (e_address_popup_factory): Removed. (e_address_popup_factory_init): Removed. * gui/component/addressbook-config.c (addressbook_config_register_factory): Removed. (addressbook_config_create_control): New. * gui/component/addressbook-component.c (addressbook_component_factory_init): Removed. (addressbook_component_get_object): New. (owner_set_cb): Do not call addressbok_config_register_factory(). * gui/component/addressbook.c (addressbook_factory_init): Removed. (addressbook_new_control): Renamed from addressbook_factory_new_control(). svn path=/trunk/; revision=19041 --- addressbook/gui/component/select-names/e-select-names-manager.c | 4 ++-- addressbook/gui/component/select-names/e-select-names.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'addressbook/gui/component/select-names') diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c index c994bc1c3c..f127532c0a 100644 --- a/addressbook/gui/component/select-names/e-select-names-manager.c +++ b/addressbook/gui/component/select-names/e-select-names-manager.c @@ -169,7 +169,7 @@ focus_in_cb (GtkWidget *w, GdkEventFocus *ev, gpointer user_data) ESelectNamesManagerEntry *entry = user_data; if (entry->cleaning_tag) { - gtk_timeout_remove (entry->cleaning_tag); + g_source_remove (entry->cleaning_tag); entry->cleaning_tag = 0; } @@ -558,7 +558,7 @@ e_select_names_manager_create_entry (ESelectNamesManager *manager, const char *i static void e_select_names_response(ESelectNames *dialog, gint response_id, ESelectNamesManager *manager) { - gtk_widget_destroy (GTK_DIALOG (dialog)); + gtk_widget_destroy (GTK_WIDGET (dialog)); switch(response_id) { case GTK_RESPONSE_OK: diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index 54186ee16b..bed94290ae 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -291,7 +291,6 @@ e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int n ETableModel *without; EAddressbookModel *model; GtkWidget *table; - char *spec; model = e_addressbook_model_new (); adapter = E_TABLE_MODEL (e_addressbook_table_adapter_new (model)); @@ -712,7 +711,6 @@ e_select_names_add_section(ESelectNames *e_select_names, char *name, char *id, E GtkTable *table; char *label_text; ETable *etable; - PangoLayout *layout; GtkWidget *sw; GtkWidget *recipient_table; -- cgit v1.2.3