aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--addressbook/gui/widgets/Makefile.am3
-rw-r--r--addressbook/gui/widgets/eab-gui-util.c14
-rw-r--r--calendar/gui/Makefile.am1
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c2
-rw-r--r--calendar/gui/itip-utils.c16
-rw-r--r--calendar/modules/Makefile.am9
-rw-r--r--composer/Makefile.am7
-rw-r--r--mail/Makefile.am16
8 files changed, 22 insertions, 46 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
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index b6ce23fa91..a0d15b0061 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -177,6 +177,7 @@ libcal_gui_la_SOURCES = \
libcal_gui_la_LIBADD = \
$(WIN32_BOOTSTRAP_LIBS) \
+ $(top_builddir)/composer/libcomposer.la \
$(top_builddir)/widgets/menus/libmenus.la \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/calendar/common/libevolution-calendarprivate.la \
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index f320ccc42b..ad0abaa0e0 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -910,6 +910,7 @@ create_snooze (CompQueuedAlarms *cqa, gpointer alarm_id, int snooze_mins)
static void
edit_component (ECal *client, ECalComponent *comp)
{
+#if 0 /* KILL-BONOBO */
const char *uid;
const char *uri;
ECalSourceType source_type;
@@ -953,6 +954,7 @@ edit_component (ECal *client, ECalComponent *comp)
/* Get rid of the factory */
bonobo_object_release_unref (factory, NULL);
+#endif
}
typedef struct {
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index eb407a8117..5a954b5ff9 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -1098,7 +1098,6 @@ append_cal_attachments (EMsgComposer *composer,
ECalComponent *comp,
GSList *attach_list)
{
-#if 0 /* KILL-BONOBO */
struct CalMimeAttach *mime_attach;
GSList *l;
@@ -1131,14 +1130,12 @@ append_cal_attachments (EMsgComposer *composer,
g_free (mime_attach->description);
g_free (mime_attach->encoded_data);
}
-#endif
}
gboolean
itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
ECal *client, icalcomponent *zones, GSList *attachments_list, GList *users)
{
-#if 0 /* KILL-BONOBO */
EMsgComposer *composer;
EComposerHeaderTable *table;
EDestination **destinations;
@@ -1186,11 +1183,9 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
table = e_msg_composer_get_header_table (composer);
em_composer_utils_setup_default_callbacks (composer);
-#if 0 /* KILL-BONOBO */
e_composer_header_table_set_subject (table, subject);
e_composer_header_table_set_account_name (table, from);
e_composer_header_table_set_destinations_to (table, destinations);
-#endif
e_destination_freev (destinations);
@@ -1212,7 +1207,7 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
description = comp_description (comp);
body = camel_text_to_html (
- body, CAMEL_MIME_FILTER_TOHTML_PRE, 0);
+ description, CAMEL_MIME_FILTER_TOHTML_PRE, 0);
e_msg_composer_set_body_text (composer, body, -1);
g_free (body);
@@ -1257,9 +1252,6 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
g_free (ical_string);
return retval;
-#endif
-
- return FALSE;
}
gboolean
@@ -1270,7 +1262,6 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
icalcomponent *zones,
GSList *attachments_list)
{
-#if 0 /* KILL-BONOBO */
EMsgComposer *composer;
EComposerHeaderTable *table;
EDestination **destinations;
@@ -1300,11 +1291,9 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
table = e_msg_composer_get_header_table (composer);
em_composer_utils_setup_default_callbacks (composer);
-#if 0 /* KILL-BONOBO */
e_composer_header_table_set_subject (table, subject);
e_composer_header_table_set_account_name (table, from);
e_composer_header_table_set_destinations_to (table, destinations);
-#endif
e_destination_freev (destinations);
@@ -1427,9 +1416,6 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
g_free (subject);
g_free (ical_string);
return retval;
-#endif
-
- return FALSE;
}
gboolean
diff --git a/calendar/modules/Makefile.am b/calendar/modules/Makefile.am
index 8a3cb16322..059d99fea1 100644
--- a/calendar/modules/Makefile.am
+++ b/calendar/modules/Makefile.am
@@ -67,14 +67,17 @@ libevolution_module_tasks_la_SOURCES = \
libevolution_module_calendars_la_LIBADD = \
$(WIN32_BOOTSTRAP_LIBS) \
$(top_builddir)/shell/libeshell.la \
- $(top_builddir)/calendar/gui/libcal-gui.la
+ $(top_builddir)/calendar/gui/libcal-gui.la \
+ $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la
libevolution_module_memos_la_LIBADD = \
$(WIN32_BOOTSTRAP_LIBS) \
$(top_builddir)/shell/libeshell.la \
- $(top_builddir)/calendar/gui/libcal-gui.la
+ $(top_builddir)/calendar/gui/libcal-gui.la \
+ $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la
libevolution_module_tasks_la_LIBADD = \
$(WIN32_BOOTSTRAP_LIBS) \
$(top_builddir)/shell/libeshell.la \
- $(top_builddir)/calendar/gui/libcal-gui.la
+ $(top_builddir)/calendar/gui/libcal-gui.la \
+ $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 5b777f5525..4b46b3eb54 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -25,8 +25,6 @@ INCLUDES = \
$(EVOLUTION_MAIL_CFLAGS)
libcomposer_la_SOURCES = \
- $(IDL_GENERATED) \
- $(HTML_EDITOR_GENERATED) \
e-composer-actions.c \
e-composer-actions.h \
e-composer-autosave.c \
@@ -49,6 +47,9 @@ libcomposer_la_SOURCES = \
e-msg-composer.c \
e-msg-composer.h
+libcomposer_la_LIBADD = \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la
+
uidir = $(evolutionuidir)
ui_DATA = evolution-composer.ui
@@ -57,7 +58,7 @@ EXTRA_DIST = \
mail-composer.error.xml \
ChangeLog.pre-1-4
-BUILT_SOURCES = $(IDL_GENERATED) $(HTML_EDITOR_GENERATED) $(error_DATA)
+BUILT_SOURCES = $(error_DATA)
CLEANFILES = $(BUILT_SOURCES)
dist-hook:
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 5165e04527..2f44ada1ff 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -155,10 +155,14 @@ libevolution_module_mail_la_SOURCES = \
message-tag-followup,h
libevolution_module_mail_la_LIBADD = \
- $(top_builddir)/composer/libcomposer.la \
- $(top_builddir)/mail/importers/libevolution-mail-importers.la \
+ $(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/libeshell.la \
- $(top_builddir)/widgets/misc/libemiscwidgets.la
+ $(top_builddir)/composer/libcomposer.la \
+ $(top_builddir)/widgets/table/libetable.la \
+ $(top_builddir)/widgets/text/libetext.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
+ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
+ $(top_builddir)/mail/importers/libevolution-mail-importers.la
# plugin mail api
#mailinclude_HEADERS = \
@@ -293,12 +297,6 @@ SMIME_LIBS = \
endif
#libevolution_mail_la_LIBADD = \
-# $(top_builddir)/e-util/libeutil.la \
-# $(top_builddir)/shell/libeshell.la \
-# $(top_builddir)/composer/libcomposer.la \
-# $(top_builddir)/widgets/table/libetable.la \
-# $(top_builddir)/widgets/text/libetext.la \
-# $(top_builddir)/widgets/misc/libemiscwidgets.la \
# $(top_builddir)/widgets/misc/libefilterbar.la \
# $(top_builddir)/filter/libfilter.la \
# $(top_builddir)/widgets/menus/libmenus.la \
generated by cgit (git 2.34.1) at 2024-11-26 18:01:30 +0800