From 7f5228bdbad17fddedaddc4714a52b5601cb0769 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Wed, 24 Mar 2004 20:18:49 +0000 Subject: parent_type == EAB_TYPE_EDITOR. (e_contact_list_editor_class_init): fill 2004-03-24 Chris Toshok * gui/contact-list-editor/e-contact-list-editor.c (e_contact_list_editor_get_type): parent_type == EAB_TYPE_EDITOR. (e_contact_list_editor_class_init): fill in editor_class virtual functions, and remove all the signals. (list_added_cb): call eab_editor_contact_* instead of emitting a signal here. also call eab_editor_close (list_modified_cb): same. (e_contact_list_editor_is_valid): new function. (e_contact_list_editor_is_changed): same. (e_contact_list_editor_get_window): same. (file_close_cb): call eab_editor_ functions. (list_deleted_cb): call eab_editor_contact_* instead of emitting a signal here. also call eab_editor_close (delete_cb): call eab_editor_* functions. (contact_list_editor_destroy_notify): call eab_editor_remove. (e_contact_list_editor_new): call eab_editor_add, and remove the g_object_ref/gtk_object_sink two-step. (e_contact_list_editor_show): make static, and make arg EABEditor. (e_contact_list_editor_raise): same. (e_contact_list_editor_close): same. (app_delete_event_cb): call eab_editor_ functions. (command_state_changed): use eab_editor_is_valid instead of is_named. (e_contact_list_editor_request_close_all): nuke. * gui/contact-list-editor/e-contact-list-editor.h: nuke a bunch of prototypes for functions that are now either virtual functions from EABEditor or eab_editor_* functions. (struct _EContactListEditor): we subclass from EABEditor. (struct _EContactListEditorClass): same, and nuke all the signals. * gui/contact-editor/e-contact-editor.c (e_contact_editor_get_type): parent_type == EAB_TYPE_EDITOR. (e_contact_editor_class_init): fill in editor_class virtual functions, and remove all the signals. (contact_moved_cb): call eab_editor_contact_* instead of emitting a signal here. also call eab_editor_close (contact_added_cb): same. (contact_modified_cb): same. (e_contact_editor_close): rename from close_dialog. (e_contact_editor_is_valid): new function. (e_contact_editor_is_changed): new function. (e_contact_editor_get_window): new function. (file_close_cb): use eab_editor_ calls here. (e_contact_editor_confirm_delete): nuke. (contact_deleted_cb): call eab_editor_contact_* instead of emitting a signal here. also call eab_editor_close (delete_cb): use eab_editor_ functions. (e_contact_editor_dispose): chain up to our parent's ::dispose. (contact_editor_destroy_notify): use eab_editor_remove. (e_contact_editor_new): use eab_editor_add, and remove the g_object_ref/gtk_object_sink two-step. (_popup_position): nuke dead function. (set_fields): i is an index, not a field_id. (e_contact_editor_raise): make this static, and it takes an EABEditor arg now, not a EContactEditor. (e_contact_editor_show): same. (e_contact_editor_request_close_all): nuke. * gui/contact-editor/e-contact-editor.h: nuke a bunch of prototypes for functions that are now either virtual functions from EABEditor or eab_editor_* functions. (struct _EContactEditor): we subclass from EABEditor. (struct _EContactEditorClass): same, and remove the signals. * gui/widgets/e-addressbook-view.c (delete): call eab_editor_confirm_delete. * gui/widgets/eab-popup-control.c (contact_editor_cb): don't bother calling e_contact_editor_raise since this is a new contact editor anyway. * gui/widgets/eab-gui-util.c (eab_show_contact_list_editor): use EABEditor signals, and eab_editor_show. * gui/widgets/e-minicard.h: "editor" is now of type EABEditor, not GObject. * gui/widgets/e-minicard.c (e_minicard_event): just use eab_editor_raise instead of e_contact_editor_raise/e_contact_list_editor_raise. * gui/component/addressbook-component.c (impl_requestQuit): implement this again, calling eab_editor_request_close_all. (addressbook_component_class_init): fill in epv->requestQuit. svn path=/trunk/; revision=25173 --- addressbook/gui/widgets/e-minicard.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/widgets/e-minicard.h') diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h index 8fbb2b7a01..dd6ab33199 100644 --- a/addressbook/gui/widgets/e-minicard.h +++ b/addressbook/gui/widgets/e-minicard.h @@ -21,7 +21,7 @@ #define __E_MINICARD_H__ #include -#include "addressbook/gui/contact-editor/e-contact-editor.h" +#include "addressbook/gui/contact-editor/eab-editor.h" #include #include @@ -72,7 +72,7 @@ struct _EMinicard GdkPixbuf *list_icon_pixbuf; double list_icon_size; - GObject *editor; + EABEditor *editor; GList *fields; /* Of type EMinicardField */ guint needs_remodeling : 1; -- cgit v1.2.3