From e89232e97e2e4a1e7e084ea32f9a078754e8ebfc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 31 Oct 2008 16:53:15 +0000 Subject: Get composer integration working with the rest of the modules, but man do we have circular dependencies all over the place! Big house of cards. svn path=/branches/kill-bonobo/; revision=36706 --- addressbook/gui/widgets/Makefile.am | 3 +-- addressbook/gui/widgets/eab-gui-util.c | 14 -------------- 2 files changed, 1 insertion(+), 16 deletions(-) (limited to 'addressbook') diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 6ffa03204d..c06328c2aa 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -32,8 +32,6 @@ libeabwidgets_la_SOURCES = \ eab-contact-display.h \ eab-gui-util.c \ eab-gui-util.h \ - eab-vcard-control.c \ - eab-vcard-control.h \ e-minicard.c \ e-minicard.h \ e-minicard-label.c \ @@ -58,6 +56,7 @@ libeabwidgets_la_SOURCES = \ gal-view-factory-minicard.h libeabwidgets_la_LIBADD = \ + $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la CLEANFILES = $(BUILT_SOURCES) diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 76153b9d30..3ba848ecc8 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -629,16 +629,6 @@ struct ContactCopyProcess_ { ContactCopyDone done_cb; }; -#if 0 -static void -contact_deleted_cb (EBook* book, EBookStatus status, gpointer user_data) -{ - if (status != E_BOOK_ERROR_OK) { - eab_error_dialog (_("Error removing contact"), status); - } -} -#endif - static void do_delete (gpointer data, gpointer user_data) { @@ -791,7 +781,6 @@ typedef struct { static void eab_send_to_contact_and_email_num_list (GList *contact_list) { -#if 0 /* NOT READY FOR COMPOSER YET */ EMsgComposer *composer; EComposerHeaderTable *table; GPtrArray *to_array; @@ -855,7 +844,6 @@ eab_send_to_contact_and_email_num_list (GList *contact_list) e_destination_freev (convert.destinations); gtk_widget_show (GTK_WIDGET (composer)); -#endif } static const char * @@ -880,7 +868,6 @@ get_email (EContact *contact, EContactField field_id, gchar **to_free) static void eab_send_contact_list_as_attachment (GList *contacts) { -#if 0 /* NOT READY FOR COMPOSER YET */ EMsgComposer *composer; EComposerHeaderTable *table; CamelMimePart *attachment; @@ -957,7 +944,6 @@ eab_send_contact_list_as_attachment (GList *contacts) } gtk_widget_show (GTK_WIDGET (composer)); -#endif } void -- cgit v1.2.3