diff options
Diffstat (limited to 'addressbook/gui/widgets')
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-view.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard.c | 9 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard.h | 4 | ||||
| -rw-r--r-- | addressbook/gui/widgets/eab-gui-util.c | 9 | ||||
| -rw-r--r-- | addressbook/gui/widgets/eab-popup-control.c | 3 |
5 files changed, 12 insertions, 15 deletions
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 2521638cca..963f1389b1 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -911,7 +911,7 @@ cut (GtkWidget *widget, ContactAndBook *contact_and_book) static void delete (GtkWidget *widget, ContactAndBook *contact_and_book) { - if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(contact_and_book->view->widget)))) { + if (eab_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(contact_and_book->view->widget)))) { EBook *book; GList *list = get_contact_list(contact_and_book); GList *iterator; diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 7e831090a6..c587d9764e 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -602,10 +602,7 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) case GDK_2BUTTON_PRESS: if (event->button.button == 1 && E_IS_MINICARD_VIEW(item->parent)) { if (e_minicard->editor) { - if (GPOINTER_TO_INT (e_contact_get (e_minicard->contact, E_CONTACT_IS_LIST))) - e_contact_list_editor_raise (E_CONTACT_LIST_EDITOR(e_minicard->editor)); - else - e_contact_editor_raise(E_CONTACT_EDITOR(e_minicard->editor)); + eab_editor_raise (e_minicard->editor); } else { EBook *book = NULL; if (E_IS_MINICARD_VIEW(item->parent)) { @@ -618,12 +615,12 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) if (e_contact_get (e_minicard->contact, E_CONTACT_IS_LIST)) { EContactListEditor *editor = eab_show_contact_list_editor (book, e_minicard->contact, FALSE, e_minicard->editable); - e_minicard->editor = G_OBJECT (editor); + e_minicard->editor = EAB_EDITOR (editor); } else { EContactEditor *editor = eab_show_contact_editor (book, e_minicard->contact, FALSE, e_minicard->editable); - e_minicard->editor = G_OBJECT (editor); + e_minicard->editor = EAB_EDITOR (editor); } g_object_ref (e_minicard->editor); 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 <gdk-pixbuf/gdk-pixbuf.h> -#include "addressbook/gui/contact-editor/e-contact-editor.h" +#include "addressbook/gui/contact-editor/eab-editor.h" #include <libgnomecanvas/gnome-canvas.h> #include <libebook/e-contact.h> @@ -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; diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 7c9e540cbe..6dd72d9325 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -35,6 +35,7 @@ #include <gnome.h> +#include "addressbook/gui/contact-editor/eab-editor.h" #include "addressbook/gui/contact-editor/e-contact-editor.h" #include "addressbook/gui/contact-list-editor/e-contact-list-editor.h" #include "addressbook/gui/component/addressbook-component.h" @@ -163,16 +164,16 @@ eab_show_contact_list_editor (EBook *book, EContact *contact, ce = e_contact_list_editor_new (book, contact, is_new_contact, editable); - g_signal_connect (ce, "list_added", + g_signal_connect (ce, "contact_added", G_CALLBACK (added_cb), GINT_TO_POINTER (TRUE)); - g_signal_connect (ce, "list_modified", + g_signal_connect (ce, "contact_modified", G_CALLBACK (modified_cb), GINT_TO_POINTER (TRUE)); - g_signal_connect (ce, "list_deleted", + g_signal_connect (ce, "contact_deleted", G_CALLBACK (deleted_cb), GINT_TO_POINTER (TRUE)); g_signal_connect (ce, "editor_closed", G_CALLBACK (editor_closed_cb), GINT_TO_POINTER (TRUE)); - e_contact_list_editor_show (ce); + eab_editor_show (EAB_EDITOR (ce)); return ce; } diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c index b7c635b089..943803ef47 100644 --- a/addressbook/gui/widgets/eab-popup-control.c +++ b/addressbook/gui/widgets/eab-popup-control.c @@ -933,10 +933,9 @@ contact_editor_cb (EBook *book, EBookStatus status, gpointer closure) { if (status == E_BOOK_ERROR_OK) { EABPopupControl *pop = EAB_POPUP_CONTROL (closure); - EContactEditor *ce = eab_show_contact_editor (book, pop->contact, FALSE, TRUE); + eab_show_contact_editor (book, pop->contact, FALSE, TRUE); eab_popup_control_cleanup (pop); emit_event (pop, "Destroy"); - e_contact_editor_raise (ce); } if (book) |