aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-11-01 00:53:15 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-11-01 00:53:15 +0800
commite89232e97e2e4a1e7e084ea32f9a078754e8ebfc (patch)
tree28715a0f90513c7e9149a86fb2da9f18ac131060 /addressbook/gui
parent78fd379aa7c17c60c4b5fc07e5243b32ec4a2639 (diff)
downloadgsoc2013-evolution-e89232e97e2e4a1e7e084ea32f9a078754e8ebfc.tar
gsoc2013-evolution-e89232e97e2e4a1e7e084ea32f9a078754e8ebfc.tar.gz
gsoc2013-evolution-e89232e97e2e4a1e7e084ea32f9a078754e8ebfc.tar.bz2
gsoc2013-evolution-e89232e97e2e4a1e7e084ea32f9a078754e8ebfc.tar.lz
gsoc2013-evolution-e89232e97e2e4a1e7e084ea32f9a078754e8ebfc.tar.xz
gsoc2013-evolution-e89232e97e2e4a1e7e084ea32f9a078754e8ebfc.tar.zst
gsoc2013-evolution-e89232e97e2e4a1e7e084ea32f9a078754e8ebfc.zip
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
Diffstat (limited to 'addressbook/gui')
-rw-r--r--addressbook/gui/widgets/Makefile.am3
-rw-r--r--addressbook/gui/widgets/eab-gui-util.c14
2 files changed, 1 insertions, 16 deletions
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