[Evolution-hackers] kill-bonobo with -no-undefined
- From: Milan Crha <mcrha redhat com>
- To: sragavan novell com
- Subject: [Evolution-hackers] kill-bonobo with -no-undefined
- Date: Thu, 07 May 2009 18:10:25 +0200
Hi both,
I tried to play with -no-undefined on linux, as I understood that as a
good thing to use, when reading some recent discussions on IRC.
Long story short: with only two "yet-to-be-done" it's done.
Full story:
My changes are quite simple, moving files here and there, changing
folder structure, to make compiler happy. Also moving functions from one
lib to the other. Nonetheless, this is just what I found with my basic
automake knowledge. Thus some polishing and cleaning will be probably
required, to follow your needs.
Changes in folder structure:
/widgets/text -> /widgets/misc
/a11y/addressbook -> /addressbook/gui/widgets/a11y
/a11y/calendar -> /calendar/gui/a11y
/a11y/e-table -> /widgets/table/a11y
/a11y/e-text -> /widgets/misc/a11y
/a11y/widgets -> /widgets/misc/a11y
Some e-table related files from /widgets/misc had been moved
to /widgets/table.
New library libemformat.la which contains necessary minimum to be shared
between mail and composer:
/emformat
em-format.h
em-format.c
em-format-quote.h
em-format-quote.c
em-stripsig-filter.h
em-stripsig-filter.c
Makefile.am (attached)
Note that a11y subdirectories in addressbook and such does not contain
any Makefile.am, sources are only used from there in the parent folder.
The patch doesn't contain any removed files, as it made it only awfully
big and didn't bring anything new.
To be done:
a) There is one place in composer, marked with KILL-BONOBO, which I do
not know how to trigger. Either remove it, or make it a signal, and let
mailer itself take care of it.
b) calendar doesn't compile to its a11y subfolder, as that requires
gnome-cal, which Matt removed (at the moment). I believe this one will
be pretty easy to fix.
c) I kept there those WIN32_BOOTSTRAP_LIB and similar, as I do not
compile on windows. Maybe it'll show there more than just those things I
changed.
And that's all.
Enjoy and bye,
Milan
diff --git a/Makefile.am b/Makefile.am
index 7adf7ea..cce363d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,11 +61,12 @@ SUBDIRS = \
win32 \
data \
e-util \
- a11y \
filter \
+ a11y \
widgets \
shell \
$(SMIME_DIR) \
+ emformat \
composer \
addressbook \
mail \
diff --git a/a11y/Makefile.am b/a11y/Makefile.am
index 9fe0b07..772a969 100644
--- a/a11y/Makefile.am
+++ b/a11y/Makefile.am
@@ -1,14 +1,3 @@
-# Somewhat odd looking to have "." in SUBDIRS, but apparently it works?
-#SUBDIRS = e-text e-table . calendar widgets addressbook
-SUBDIRS = e-text e-table . widgets addressbook
-
-if OS_WIN32
-WIN32_BOOTSTRAP_LIBS = \
- $(top_builddir)/win32/libemiscwidgets.la \
- $(top_builddir)/win32/libetable.la \
- $(top_builddir)/win32/libetext.la
-endif
-
# for debug
#A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
@@ -28,9 +17,6 @@ libevolution_a11y_la_SOURCES = \
libevolution_a11y_la_LDFLAGS = $(NO_UNDEFINED)
libevolution_a11y_la_LIBADD = \
- $(WIN32_BOOTSTRAP_LIBS) \
- e-text/libgal-a11y-etext.la \
- e-table/libgal-a11y-etable.la \
$(top_builddir)/e-util/libeutil.la \
$(GNOME_PLATFORM_LIBS)
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 7aea849..cdcce79 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -60,10 +60,8 @@ libevolution_module_contacts_la_LIBADD = \
$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
$(top_builddir)/widgets/table/libetable.la \
- $(top_builddir)/widgets/text/libetext.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/widgets/menus/libmenus.la \
- $(top_builddir)/a11y/addressbook/libevolution-addressbook-a11y.la \
$(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la \
$(WIN32_BOOTSTRAP_LIBS) \
$(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS)
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 9e3affc..45c0b0c 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -51,11 +51,22 @@ libeabwidgets_la_SOURCES = \
gal-view-minicard.c \
gal-view-minicard.h \
gal-view-factory-minicard.c \
- gal-view-factory-minicard.h
+ gal-view-factory-minicard.h \
+ a11y/ea-minicard.c \
+ a11y/ea-minicard.h \
+ a11y/ea-minicard-view.c \
+ a11y/ea-minicard-view.h \
+ a11y/ea-addressbook-view.c \
+ a11y/ea-addressbook-view.h \
+ a11y/ea-addressbook.c \
+ a11y/ea-addressbook.h
libeabwidgets_la_LIBADD = \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
- $(top_builddir)/a11y/addressbook/libevolution-addressbook-a11y.la
+ $(top_builddir)/shell/libeshell.la \
+ $(top_builddir)/widgets/table/libetable.la \
+ $(top_builddir)/widgets/menus/libmenus.la \
+ $(top_builddir)/a11y/libevolution-a11y.la
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index a979e5a..1a4eea5 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -33,7 +33,7 @@
#include <e-shell-sidebar.h>
#include "addressbook/printing/e-contact-print.h"
-#include "a11y/addressbook/ea-addressbook.h"
+#include "a11y/ea-addressbook.h"
#include "e-util/e-print.h"
#include "e-util/e-util.h"
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 696d42d..2831195 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -27,10 +27,10 @@
#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
#include <glib/gi18n.h>
-#include <e-util/e-util.h>
-#include <text/e-text.h>
-#include <misc/e-canvas.h>
-#include <misc/e-canvas-utils.h>
+#include "e-util/e-util.h"
+#include "misc/e-text.h"
+#include "misc/e-canvas.h"
+#include "misc/e-canvas-utils.h"
#include <gdk/gdkkeysyms.h>
static void e_minicard_label_init (EMinicardLabel *card);
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 32957fd..c6faa4a 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -34,7 +34,7 @@
#include <glib/gi18n.h>
#include <string.h>
#include "e-util/e-util.h"
-#include "a11y/addressbook/ea-addressbook.h"
+#include "a11y/ea-addressbook.h"
static void e_minicard_view_drag_data_get(GtkWidget *widget,
GdkDragContext *context,
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 3e5e8ec..0e83216 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -26,19 +26,19 @@
#include <glib/gi18n.h>
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
#include <libgnomecanvas/gnome-canvas-pixbuf.h>
-#include <text/e-text.h>
-#include <e-util/e-util.h>
-#include <misc/e-canvas-utils.h>
-#include <misc/e-canvas.h>
+#include "misc/e-text.h"
+#include "e-util/e-util.h"
+#include "misc/e-canvas-utils.h"
+#include "misc/e-canvas.h"
#include <libebook/e-book.h>
#include "eab-gui-util.h"
#include "e-minicard.h"
#include "e-minicard-label.h"
#include "e-minicard-view.h"
-#include <e-util/e-html-utils.h>
-#include <e-util/e-icon-factory.h>
+#include "e-util/e-html-utils.h"
+#include "e-util/e-icon-factory.h"
#include <libebook/e-destination.h>
-#include "a11y/addressbook/ea-addressbook.h"
+#include "a11y/ea-addressbook.h"
static void e_minicard_init (EMinicard *card);
static void e_minicard_class_init (EMinicardClass *class);
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index c194f27..59c5c51 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -38,12 +38,6 @@ contact_print_test_LDADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_ADDRESSBOOK_LIBS)
-contact_print_style_editor_test_LDADD = \
- libecontactprint.la \
- $(top_builddir)/addressbook/util/libeabutil.la \
- $(top_builddir)/e-util/libeutil.la \
- $(EVOLUTION_ADDRESSBOOK_LIBS)
-
EXTRA_DIST = \
$(ecps_DATA)
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index a2b4be2..b4f8197 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -172,8 +172,31 @@ libcal_gui_la_SOURCES = \
weekday-picker.c \
weekday-picker.h
-# Removed
-# $(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la
+# no gnome-cal no a11y. FIXME: KILL-BONOBO
+# a11y/ea-calendar.c \
+# a11y/ea-calendar.h \
+# a11y/ea-calendar-helpers.c \
+# a11y/ea-calendar-helpers.h \
+# a11y/ea-cal-view.c \
+# a11y/ea-cal-view.h \
+# a11y/ea-cal-view-event.c \
+# a11y/ea-cal-view-event.h \
+# a11y/ea-day-view.c \
+# a11y/ea-day-view.h \
+# a11y/ea-day-view-main-item.c \
+# a11y/ea-day-view-main-item.h \
+# a11y/ea-day-view-cell.c \
+# a11y/ea-day-view-cell.h \
+# a11y/ea-week-view.c \
+# a11y/ea-week-view.h \
+# a11y/ea-week-view-main-item.c \
+# a11y/ea-week-view-main-item.h \
+# a11y/ea-week-view-cell.c \
+# a11y/ea-week-view-cell.h \
+# a11y/ea-jump-button.c \
+# a11y/ea-jump-button.h \
+# a11y/ea-gnome-calendar.c \
+# a11y/ea-gnome-calendar.h
libcal_gui_la_LIBADD = \
$(WIN32_BOOTSTRAP_LIBS) \
@@ -187,6 +210,7 @@ libcal_gui_la_LIBADD = \
$(top_builddir)/calendar/importers/libevolution-calendar-importers.la \
$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
+ $(top_builddir)/widgets/table/libetable.la \
$(top_builddir)/filter/libfilter.la \
$(top_builddir)/e-util/libeutil.la \
$(LIBSOUP_LIBS) \
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index cfb77f8..6b4aa3e 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -25,7 +25,7 @@
#endif
#include "e-cal-list-view.h"
-#include "ea-calendar.h"
+#include "a11y/ea-calendar.h"
#include <math.h>
#include <time.h>
@@ -34,18 +34,18 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <gdk/gdkkeysyms.h>
-#include <misc/e-gui-utils.h>
-#include <table/e-table-memory-store.h>
-#include <table/e-cell-checkbox.h>
-#include <table/e-cell-toggle.h>
-#include <table/e-cell-text.h>
-#include <table/e-cell-combo.h>
-#include <misc/e-popup-menu.h>
-#include <misc/e-cell-date-edit.h>
+#include "misc/e-gui-utils.h"
+#include "table/e-table-memory-store.h"
+#include "table/e-cell-checkbox.h"
+#include "table/e-cell-toggle.h"
+#include "table/e-cell-text.h"
+#include "table/e-cell-combo.h"
+#include "misc/e-popup-menu.h"
+#include "table/e-cell-date-edit.h"
#include <libgnome/gnome-exec.h>
-#include <e-util/e-categories-config.h>
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-util-private.h>
+#include "e-util/e-categories-config.h"
+#include "e-util/e-dialog-utils.h"
+#include "e-util/e-util-private.h"
#include <libecal/e-cal-time-util.h>
#include "e-cal-model-calendar.h"
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index a432027..80dac30 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -36,15 +36,15 @@
#include <glib/gstdio.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#include <misc/e-gui-utils.h>
-#include <table/e-cell-checkbox.h>
-#include <table/e-cell-toggle.h>
-#include <table/e-cell-text.h>
-#include <table/e-cell-combo.h>
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-util-private.h>
-#include <widgets/misc/e-cell-date-edit.h>
-#include <widgets/misc/e-cell-percent.h>
+#include "misc/e-gui-utils.h"
+#include "table/e-cell-checkbox.h"
+#include "table/e-cell-toggle.h"
+#include "table/e-cell-text.h"
+#include "table/e-cell-combo.h"
+#include "e-util/e-dialog-utils.h"
+#include "e-util/e-util-private.h"
+#include "table/e-cell-date-edit.h"
+#include "table/e-cell-percent.h"
#include <libecal/e-cal-time-util.h>
#include <libedataserver/e-time-utils.h>
@@ -57,7 +57,7 @@
#include "e-calendar-view.h"
#include "e-cell-date-edit-text.h"
#include "print.h"
-#include <e-util/e-icon-factory.h>
+#include "e-util/e-icon-factory.h"
#include "e-cal-popup.h"
#include "misc.h"
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
index a3dba94..e7698ea 100644
--- a/calendar/gui/e-calendar-table.h
+++ b/calendar/gui/e-calendar-table.h
@@ -24,8 +24,8 @@
#define _E_CALENDAR_TABLE_H_
#include <shell/e-shell-view.h>
-#include <widgets/table/e-table-scrolled.h>
-#include <widgets/misc/e-cell-date-edit.h>
+#include "table/e-table-scrolled.h"
+#include "table/e-cell-date-edit.h"
#include "e-cal-model.h"
/*
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 2294c0b..a888e04 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -55,7 +55,7 @@
#include "dialogs/select-source-dialog.h"
#include "print.h"
#include "goto.h"
-#include "ea-calendar.h"
+#include "a11y/ea-calendar.h"
#include "e-cal-popup.h"
#include "misc.h"
diff --git a/calendar/gui/e-cell-date-edit-config.h b/calendar/gui/e-cell-date-edit-config.h
index 6203aec..496b68d 100644
--- a/calendar/gui/e-cell-date-edit-config.h
+++ b/calendar/gui/e-cell-date-edit-config.h
@@ -24,7 +24,7 @@
#ifndef _E_CELL_DATE_EDIT_CONFIG_H_
#define _E_CELL_DATE_EDIT_CONFIG_H_
-#include <misc/e-cell-date-edit.h>
+#include "table/e-cell-date-edit.h"
#include "e-cell-date-edit-text.h"
G_BEGIN_DECLS
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index f96e6cc..7b98777 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -32,11 +32,11 @@
#include "e-util/e-categories-config.h"
#include "e-day-view-layout.h"
#include "e-day-view-main-item.h"
-#include "ea-calendar.h"
+#include "a11y/ea-calendar.h"
#include "e-calendar-view.h"
#include "comp-util.h"
#include <libecal/e-cal-time-util.h>
-#include <e-calendar-view.h>
+#include "e-calendar-view.h"
static void e_day_view_main_item_set_property (GObject *object,
guint property_id,
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 6a07d97..ef4e262 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -26,21 +26,21 @@
#endif
#include "e-day-view.h"
-#include "ea-calendar.h"
+#include "a11y/ea-calendar.h"
#include <math.h>
#include <time.h>
#include <gdk/gdkkeysyms.h>
-#include <text/e-text.h>
-#include <misc/e-canvas-utils.h>
-#include <misc/e-popup-menu.h>
-#include <misc/e-gui-utils.h>
-#include <misc/e-unicode.h>
+#include "misc/e-text.h"
+#include "misc/e-canvas-utils.h"
+#include "misc/e-popup-menu.h"
+#include "misc/e-gui-utils.h"
+#include "misc/e-unicode.h"
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-exec.h>
-#include <e-util/e-categories-config.h>
-#include <e-util/e-dialog-utils.h>
+#include "e-util/e-categories-config.h"
+#include "e-util/e-dialog-utils.h"
#include <libecal/e-cal-time-util.h>
#include <libedataserver/e-data-server-util.h>
@@ -60,7 +60,7 @@
#include "e-day-view-layout.h"
#include "e-day-view-main-item.h"
#include "misc.h"
-#include <e-util/e-icon-factory.h>
+#include "e-util/e-icon-factory.h"
/* The minimum amount of space wanted on each side of the date string. */
#define E_DAY_VIEW_DATE_X_PAD 4
diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h
index deb91c2..b144d48 100644
--- a/calendar/gui/e-meeting-time-sel.h
+++ b/calendar/gui/e-meeting-time-sel.h
@@ -25,9 +25,9 @@
#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas.h>
-#include <text/e-text.h>
-#include <table/e-table-model.h>
-#include <table/e-table.h>
+#include "misc/e-text.h"
+#include "table/e-table-model.h"
+#include "table/e-table.h"
#include "e-meeting-store.h"
#include "e-meeting-list-view.h"
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 891bec6..8f1c705 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -35,15 +35,15 @@
#include <unistd.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
-#include <widgets/misc/e-gui-utils.h>
-#include <table/e-cell-checkbox.h>
-#include <table/e-cell-toggle.h>
-#include <table/e-cell-text.h>
-#include <table/e-cell-combo.h>
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-util-private.h>
-#include <widgets/misc/e-cell-date-edit.h>
-#include <widgets/misc/e-cell-percent.h>
+#include "misc/e-gui-utils.h"
+#include "table/e-cell-checkbox.h"
+#include "table/e-cell-toggle.h"
+#include "table/e-cell-text.h"
+#include "table/e-cell-combo.h"
+#include "e-util/e-dialog-utils.h"
+#include "e-util/e-util-private.h"
+#include "table/e-cell-date-edit.h"
+#include "table/e-cell-percent.h"
#include <libecal/e-cal-time-util.h>
#include <libedataserver/e-time-utils.h>
@@ -56,7 +56,7 @@
#include "e-calendar-view.h"
#include "e-cell-date-edit-text.h"
#include "print.h"
-#include <e-util/e-icon-factory.h>
+#include "e-util/e-icon-factory.h"
#include "e-cal-popup.h"
#include "misc.h"
diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h
index 0a13006..f44b193 100644
--- a/calendar/gui/e-memo-table.h
+++ b/calendar/gui/e-memo-table.h
@@ -26,8 +26,8 @@
#define _E_MEMO_TABLE_H_
#include <shell/e-shell-view.h>
-#include <widgets/table/e-table-scrolled.h>
-#include <widgets/misc/e-cell-date-edit.h>
+#include "table/e-table-scrolled.h"
+#include "table/e-cell-date-edit.h"
#include "e-cal-model.h"
/*
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index dcb3dd9..a7525a2 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -36,8 +36,7 @@
#include <gtk/gtk.h>
#include "e-calendar-view.h"
#include "comp-util.h"
-
-#include <text/e-text.h>
+#include "misc/e-text.h"
static void e_week_view_event_item_set_property (GObject *object,
guint property_id,
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index 322acc6..82dc43e 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -29,7 +29,7 @@
#include <glib.h>
#include <glib/gi18n.h>
#include "e-week-view-main-item.h"
-#include "ea-calendar.h"
+#include "a11y/ea-calendar.h"
static void e_week_view_main_item_set_property (GObject *object,
guint property_id,
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 2120d02..4bf3dad 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -30,20 +30,20 @@
#endif
#include "e-week-view.h"
-#include "ea-calendar.h"
+#include "a11y/ea-calendar.h"
#include <math.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-exec.h>
#include <libgnomecanvas/gnome-canvas-pixbuf.h>
-#include <text/e-text.h>
-#include <misc/e-canvas-utils.h>
-#include <misc/e-gui-utils.h>
-#include <misc/e-unicode.h>
-#include <e-util/e-categories-config.h>
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-util.h>
+#include "misc/e-text.h"
+#include "misc/e-canvas-utils.h"
+#include "misc/e-gui-utils.h"
+#include "misc/e-unicode.h"
+#include "e-util/e-categories-config.h"
+#include "e-util/e-dialog-utils.h"
+#include "e-util/e-util.h"
#include "dialogs/delete-comp.h"
#include "dialogs/delete-error.h"
#include "dialogs/send-comp.h"
@@ -61,7 +61,7 @@
#include "e-week-view-main-item.h"
#include "e-week-view-titles-item.h"
#include "misc.h"
-#include <e-util/e-icon-factory.h>
+#include "e-util/e-icon-factory.h"
/* Images */
#include "art/jump.xpm"
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 2217cd5..75a3764 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -74,7 +74,7 @@
#include "calendar-view-factory.h"
#include "tag-calendar.h"
#include "misc.h"
-#include "ea-calendar.h"
+#include "a11y/ea-calendar.h"
#include "common/authentication.h"
#include "e-cal-popup.h"
#include "e-cal-menu.h"
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 889a28f..a9d88c1 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -47,8 +47,9 @@ libcomposer_la_SOURCES = \
e-msg-composer.c \
e-msg-composer.h
-libcomposer_la_LIBADD = \
- $(top_builddir)/widgets/misc/libemiscwidgets.la
+libcomposer_la_LIBADD = \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
+ $(top_builddir)/emformat/libemformat.la
uidir = $(evolutionuidir)
ui_DATA = evolution-composer.ui
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index a1fe1ca..0194fe9 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -21,7 +21,6 @@
#include <errno.h>
#include <fcntl.h>
#include <e-util/e-error.h>
-#include <mail/em-event.h>
#include "misc/e-charset-picker.h"
@@ -249,6 +248,8 @@ static void
action_send_options_cb (GtkAction *action,
EMsgComposer *composer)
{
+ /* FIXME: KILL-BONOBO - should this be here when -no-undefined removed? */
+ /*
EMEvent *event = em_event_peek ();
EMEventTargetComposer *target;
@@ -260,6 +261,7 @@ action_send_options_cb (GtkAction *action,
(EEvent *) event,
"composer.selectsendoption",
(EEventTarget *) target);
+ */
if (!composer->priv->send_invoked)
e_error_run (
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index d1a6abb..03b2106 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -56,6 +56,8 @@
#include "e-util/e-account-utils.h"
#include "e-util/e-signature-utils.h"
#include "e-signature-combo-box.h"
+#include "emformat/em-format.h"
+#include "emformat/em-format-quote.h"
#include "shell/e-shell.h"
#include <camel/camel-charset-map.h>
@@ -75,9 +77,6 @@
#include <camel/camel-smime-context.h>
#endif
-#include "mail/em-utils.h"
-#include "mail/mail-tools.h"
-
#include "e-msg-composer.h"
#include "e-attachment.h"
#include "e-composer-autosave.h"
@@ -153,6 +152,104 @@ static void handle_multipart_alternative (EMsgComposer *composer, CamelMultipart
static void handle_multipart_encrypted (EMsgComposer *composer, CamelMimePart *multipart, gint depth);
static void handle_multipart_signed (EMsgComposer *composer, CamelMultipart *multipart, gint depth);
+/**
+ * em_utils_part_to_html:
+ * @part:
+ *
+ * Converts a mime part's contents into html text. If @credits is given,
+ * then it will be used as an attribution string, and the
+ * content will be cited. Otherwise no citation or attribution
+ * will be performed.
+ *
+ * Return Value: The part in displayable html format.
+ **/
+static char *
+em_utils_part_to_html (CamelMimePart *part, ssize_t *len, EMFormat *source)
+{
+ EMFormatQuote *emfq;
+ CamelStreamMem *mem;
+ GByteArray *buf;
+ char *text;
+
+ buf = g_byte_array_new ();
+ mem = (CamelStreamMem *) camel_stream_mem_new ();
+ camel_stream_mem_set_byte_array (mem, buf);
+
+ emfq = em_format_quote_new(NULL, (CamelStream *)mem, 0);
+ ((EMFormat *) emfq)->composer = TRUE;
+ if (source) {
+ /* copy over things we can, other things are internal, perhaps need different api than 'clone' */
+ if (source->default_charset)
+ em_format_set_default_charset((EMFormat *)emfq, source->default_charset);
+ if (source->charset)
+ em_format_set_default_charset((EMFormat *)emfq, source->charset);
+ }
+ em_format_part((EMFormat *) emfq, (CamelStream *)mem, part);
+ g_object_unref(emfq);
+
+ camel_stream_write((CamelStream *) mem, "", 1);
+ camel_object_unref(mem);
+
+ text = (char *)buf->data;
+ if (len)
+ *len = buf->len-1;
+ g_byte_array_free (buf, FALSE);
+
+ return text;
+}
+
+/* copy of em_utils_prompt_user from mailer */
+static gboolean
+emcu_prompt_user (GtkWindow *parent, const char *promptkey, const char *tag, const char *arg0, ...)
+{
+ GtkWidget *mbox, *check = NULL;
+ va_list ap;
+ int button;
+ GConfClient *gconf = gconf_client_get_default ();
+
+ if (promptkey
+ && !gconf_client_get_bool(gconf, promptkey, NULL)) {
+ g_object_unref (gconf);
+ return TRUE;
+ }
+
+ va_start(ap, arg0);
+ mbox = e_error_newv(parent, tag, arg0, ap);
+ va_end(ap);
+
+ if (promptkey) {
+ check = gtk_check_button_new_with_mnemonic (_("_Do not show this message again."));
+ gtk_container_set_border_width((GtkContainer *)check, 12);
+ gtk_box_pack_start ((GtkBox *)((GtkDialog *) mbox)->vbox, check, TRUE, TRUE, 0);
+ gtk_widget_show (check);
+ }
+
+ button = gtk_dialog_run ((GtkDialog *) mbox);
+ if (promptkey)
+ gconf_client_set_bool(gconf, promptkey, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check)), NULL);
+
+ gtk_widget_destroy(mbox);
+ g_object_unref (gconf);
+
+ return button == GTK_RESPONSE_YES;
+}
+
+/* copy of mail_tool_remove_xevolution_headers */
+static struct _camel_header_raw *
+emcu_remove_xevolution_headers (CamelMimeMessage *message)
+{
+ struct _camel_header_raw *scan, *list = NULL;
+
+ for (scan = ((CamelMimePart *)message)->headers;scan;scan=scan->next)
+ if (!strncmp(scan->name, "X-Evolution", 11))
+ camel_header_raw_append(&list, scan->name, scan->value, scan->offset);
+
+ for (scan=list;scan;scan=scan->next)
+ camel_medium_remove_header((CamelMedium *)message, scan->name);
+
+ return list;
+}
+
static EDestination**
destination_list_to_vector_sized (GList *list, gint n)
{
@@ -2992,7 +3089,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
}
/* Remove any other X-Evolution-* headers that may have been set */
- xev = mail_tool_remove_xevolution_headers (message);
+ xev = emcu_remove_xevolution_headers (message);
camel_header_raw_clear (&xev);
/* Check for receipt request */
@@ -3684,7 +3781,7 @@ e_msg_composer_get_message (EMsgComposer *composer,
store = e_attachment_view_get_store (view);
if (e_attachment_store_get_num_loading (store) > 0) {
- if (!em_utils_prompt_user (GTK_WINDOW (composer), NULL,
+ if (!emcu_prompt_user (GTK_WINDOW (composer), NULL,
"mail-composer:ask-send-message-pending-download", NULL)) {
return NULL;
}
diff --git a/configure.in b/configure.in
index 51e5267..f2b64a8 100644
--- a/configure.in
+++ b/configure.in
@@ -157,7 +157,7 @@ case "$host" in
HAL_REQUIREMENT=''
;;
*) os_win32=no
- NO_UNDEFINED=''
+ NO_UNDEFINED='-Wl,-no-undefined'
SOEXT='.so'
SA_JUNK_PLUGIN=sa-junk-plugin
BF_JUNK_PLUGIN=bogo-junk-plugin
@@ -1105,7 +1105,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
nsprlibs="$DL_LIB -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
fi
- AC_CACHE_CHECK([for Mozilla nspr libraries], moz_nspr_libs,
+ AC_CACHE_CHECK([for Mozilla nspr libraries], moz_nspr_libs_cv_,
[
LIBS_save="$LIBS"
CFLAGS="$CFLAGS $MANUAL_NSPR_CFLAGS"
@@ -1118,12 +1118,12 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
LDFLAGS="$LDFLAGS"
fi
- AC_TRY_LINK_FUNC(PR_Init, moz_nspr_libs="yes", moz_nspr_libs="no")
+ AC_TRY_LINK_FUNC(PR_Init, moz_nspr_libs_cv_="yes", moz_nspr_libs_cv_="no")
CFLAGS="$CFLAGS_save"
LDFLAGS="$LDFLAGS_save"
LIBS="$LIBS_save"
])
- if test "x$moz_nspr_libs" != "xno"; then
+ if test "x$moz_nspr_libs_cv_" != "xno"; then
have_nspr_libs="yes"
MANUAL_NSPR_LIBS="-L$with_nspr_libs $nsprlibs"
else
@@ -1184,21 +1184,21 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
nsslibs="-lssl3 -lsmime3 -lnss3 $SOFTOKN3_LIB"
fi
- AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs,
+ AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs_cv_,
[
LIBS_save="$LIBS"
LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
LIBS="$nsslibs $nsprlibs"
- AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no")
- if test "$moz_nss_libs" = no; then
+ AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs_cv_="yes", moz_nss_libs_cv_="no")
+ if test "$moz_nss_libs_cv_" = no; then
nsslibs="-lssl3 -lsmime3 -lnss3 $SOFTOKN3_LIB"
LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
- AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no")
+ AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs_cv_="yes", moz_nss_libs_cv_="no")
fi
LDFLAGS="$LDFLAGS_save"
LIBS="$LIBS_save"
])
- if test "$moz_nss_libs" != no; then
+ if test "$moz_nss_libs_cv_" != no; then
AC_DEFINE(HAVE_NSS)
AC_DEFINE(HAVE_SSL)
AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"$with_nss_libs", [Define to the full path of mozilla nss library])
@@ -1585,7 +1585,7 @@ fi
AM_CONDITIONAL(NM_SUPPORT, test x$NM_SUPPORT = xyes)
-EVO_SET_COMPILE_FLAGS(SHELL, libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE $NM_SUPPORT_PACKAGES unique-1.0)
+EVO_SET_COMPILE_FLAGS(SHELL, libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE $NM_SUPPORT_PACKAGES unique-1.0 libedataserverui-$EDS_PACKAGE)
AC_SUBST(SHELL_CFLAGS)
AC_SUBST(SHELL_LIBS)
@@ -2004,11 +2004,6 @@ AC_OUTPUT([ po/Makefile.in
Makefile
win32/Makefile
a11y/Makefile
-a11y/addressbook/Makefile
-a11y/calendar/Makefile
-a11y/widgets/Makefile
-a11y/e-table/Makefile
-a11y/e-text/Makefile
addressbook/Makefile
addressbook/conduit/Makefile
addressbook/gui/Makefile
@@ -2040,6 +2035,7 @@ doc/Makefile
doc/reference/Makefile
doc/reference/shell/Makefile
e-util/Makefile
+emformat/Makefile
filter/Makefile
help/Makefile
help/quickref/Makefile
@@ -2070,7 +2066,6 @@ widgets/Makefile
widgets/e-timezone-dialog/Makefile
widgets/menus/Makefile
widgets/misc/Makefile
-widgets/text/Makefile
widgets/table/Makefile
calendar/Makefile
calendar/importers/Makefile
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 384db63..8c777ca 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -128,7 +128,7 @@ MARSHAL_GENERATED = e-marshal.c e-marshal.h
libeutil_la_LDFLAGS = $(NO_UNDEFINED)
-libeutil_la_LIBADD = \
+libeutil_la_LIBADD = -lm \
$(WIN32_BOOTSTRAP_LIBS) \
$(ICONV_LIBS) \
$(E_UTIL_LIBS) \
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 5e8a7bc..ae7b1d4 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -1,12 +1,12 @@
-SUBDIRS = default importers
+SUBDIRS = default
mailincludedir = $(privincludedir)/mail
INCLUDES = \
-I$(top_srcdir)/widgets \
- -I$(top_srcdir)/widgets/e-text \
-I$(top_srcdir)/widgets/misc \
-I$(top_srcdir) \
+ -I$(top_srcdir)/emformat \
-I$(top_srcdir)/mail \
-I$(top_srcdir)/composer \
-I$(top_builddir)/composer \
@@ -34,6 +34,15 @@ INCLUDES = \
module_LTLIBRARIES = \
libevolution-module-mail.la
+# KILL-BONOBO - moved to /emformat
+# em-format.c \
+# em-format.h \
+# em-format-quote.c \
+# em-format-quote.h \
+# em-stripsig-filter.c \
+# em-stripsig-filter.h \
+#
+
libevolution_module_mail_la_SOURCES = \
e-attachment-handler-mail.c \
e-attachment-handler-mail.h \
@@ -111,8 +120,6 @@ libevolution_module_mail_la_SOURCES = \
em-folder-tree-model.h \
em-folder-utils.c \
em-folder-utils.h \
- em-format.c \
- em-format.h \
em-format-hook.c \
em-format-hook.h \
em-format-html.c \
@@ -121,8 +128,6 @@ libevolution_module_mail_la_SOURCES = \
em-format-html-display.h \
em-format-html-print.c \
em-format-html-print.h \
- em-format-quote.c \
- em-format-quote.h \
em-html-stream.c \
em-html-stream.h \
em-icon-stream.c \
@@ -141,8 +146,6 @@ libevolution_module_mail_la_SOURCES = \
em-popup.h \
em-search-context.c \
em-search-context.h \
- em-stripsig-filter.c \
- em-stripsig-filter.h \
em-subscribe-editor.c \
em-subscribe-editor.h \
em-sync-stream.c \
@@ -178,16 +181,19 @@ libevolution_module_mail_la_SOURCES = \
message-tag-editor.c \
message-tag-editor.h \
message-tag-followup.c \
- message-tag-followup,h
+ message-tag-followup.h \
+ importers/mail-importer.c \
+ importers/mail-importer.h \
+ importers/elm-importer.c \
+ importers/pine-importer.c \
+ importers/evolution-mbox-importer.c
libevolution_module_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)/mail/importers/libevolution-mail-importers.la \
+ $(top_builddir)/emformat/libemformat.la \
$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
$(SMIME_LIBS)
@@ -219,6 +225,7 @@ filter_DATA = filtertypes.xml vfoldertypes.xml searchtypes.xml
error_DATA = mail.error
errordir = $(privdatadir)/errors
+
# provides error rules too
@EVO_PLUGIN_RULE@
@@ -244,6 +251,7 @@ EXTRA_DIST = \
vfoldertypes.xml \
searchtypes.xml \
em-filter-i18n.h
+
# Purify support
diff --git a/mail/em-format-hook.h b/mail/em-format-hook.h
index 3665bbf..233f358 100644
--- a/mail/em-format-hook.h
+++ b/mail/em-format-hook.h
@@ -28,7 +28,7 @@
#include "libedataserver/e-msgport.h"
#include "e-util/e-plugin.h"
-#include "mail/em-format.h"
+#include "emformat/em-format.h"
#ifdef __cplusplus
extern "C" {
diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index d355563..000012a 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -28,8 +28,8 @@
#ifndef EM_FORMAT_HTML_H
#define EM_FORMAT_HTML_H
-#include <mail/em-format.h>
-#include <mail/mail-config.h>
+#include "emformat/em-format.h"
+#include "mail/mail-config.h"
#include <camel/camel-medium.h>
#include <camel/camel-mime-part.h>
#include <camel/camel-stream.h>
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index 07c7afa..f074e5c 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -31,7 +31,7 @@
#include <camel/camel-multipart.h>
#include <camel/camel-stream-mem.h>
-#include "em-utils.h"
+#include "emformat/em-format.h"
#define d(x)
@@ -176,7 +176,7 @@ emif_add_part(EMInlineFilter *emif, const char *data, int len)
/* pre-snoop the mime type of unknown objects, and poke and hack it into place */
if (camel_content_type_is(dw->mime_type, "application", "octet-stream")
- && (mimetype = em_utils_snoop_type(part))
+ && (mimetype = em_format_util_snoop_type (part))
&& strcmp(mimetype, "application/octet-stream") != 0) {
camel_data_wrapper_set_mime_type(dw, mimetype);
camel_mime_part_set_content_type(part, mimetype);
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index 379d126..38a8196 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -28,7 +28,7 @@
#include <glib/gi18n-lib.h>
#include "em-mailer-prefs.h"
-#include "em-format.h"
+#include "emformat/em-format.h"
#include <camel/camel-iconv.h>
#include <gtkhtml/gtkhtml-properties.h>
diff --git a/mail/em-stripsig-filter.c b/mail/em-stripsig-filter.c
deleted file mode 100644
index 7dd8a87..0000000
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 2da8efa..72e9d6d 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -1623,52 +1623,6 @@ em_utils_get_proxy_uri (const char *pUri)
}
/**
- * em_utils_part_to_html:
- * @part:
- *
- * Converts a mime part's contents into html text. If @credits is given,
- * then it will be used as an attribution string, and the
- * content will be cited. Otherwise no citation or attribution
- * will be performed.
- *
- * Return Value: The part in displayable html format.
- **/
-char *
-em_utils_part_to_html(CamelMimePart *part, ssize_t *len, EMFormat *source)
-{
- EMFormatQuote *emfq;
- CamelStreamMem *mem;
- GByteArray *buf;
- char *text;
-
- buf = g_byte_array_new ();
- mem = (CamelStreamMem *) camel_stream_mem_new ();
- camel_stream_mem_set_byte_array (mem, buf);
-
- emfq = em_format_quote_new(NULL, (CamelStream *)mem, 0);
- ((EMFormat *) emfq)->composer = TRUE;
- if (source) {
- /* copy over things we can, other things are internal, perhaps need different api than 'clone' */
- if (source->default_charset)
- em_format_set_default_charset((EMFormat *)emfq, source->default_charset);
- if (source->charset)
- em_format_set_default_charset((EMFormat *)emfq, source->charset);
- }
- em_format_part((EMFormat *) emfq, (CamelStream *)mem, part);
- g_object_unref(emfq);
-
- camel_stream_write((CamelStream *) mem, "", 1);
- camel_object_unref(mem);
-
- text = (char *)buf->data;
- if (len)
- *len = buf->len-1;
- g_byte_array_free (buf, FALSE);
-
- return text;
-}
-
-/**
* em_utils_message_to_html:
* @message:
* @credits:
@@ -2323,88 +2277,6 @@ em_utils_contact_photo (struct _CamelInternetAddress *cia, gboolean local)
return part;
}
-/**
- * em_utils_snoop_type:
- * @part:
- *
- * Tries to snoop the mime type of a part.
- *
- * Return value: NULL if unknown (more likely application/octet-stream).
- **/
-const char *
-em_utils_snoop_type(CamelMimePart *part)
-{
- /* cache is here only to be able still return const char * */
- static GHashTable *types_cache = NULL;
-
- const char *filename;
- char *name_type = NULL, *magic_type = NULL, *res, *tmp;
- CamelDataWrapper *dw;
-
- filename = camel_mime_part_get_filename (part);
- if (filename != NULL)
- name_type = e_util_guess_mime_type (filename, FALSE);
-
- dw = camel_medium_get_content_object((CamelMedium *)part);
- if (!camel_data_wrapper_is_offline(dw)) {
- CamelStreamMem *mem = (CamelStreamMem *)camel_stream_mem_new();
-
- if (camel_data_wrapper_decode_to_stream(dw, (CamelStream *)mem) > 0) {
- char *ct = g_content_type_guess (filename, mem->buffer->data, mem->buffer->len, NULL);
-
- if (ct)
- magic_type = g_content_type_get_mime_type (ct);
-
- g_free (ct);
- }
- camel_object_unref(mem);
- }
-
- d(printf("snooped part, magic_type '%s' name_type '%s'\n", magic_type, name_type));
-
- /* If gvfs doesn't recognize the data by magic, but it
- * contains English words, it will call it text/plain. If the
- * filename-based check came up with something different, use
- * that instead and if it returns "application/octet-stream"
- * try to do better with the filename check.
- */
-
- if (magic_type) {
- if (name_type
- && (!strcmp(magic_type, "text/plain")
- || !strcmp(magic_type, "application/octet-stream")))
- res = name_type;
- else
- res = magic_type;
- } else
- res = name_type;
-
-
- if (res != name_type)
- g_free (name_type);
-
- if (res != magic_type)
- g_free (magic_type);
-
- if (!types_cache)
- types_cache = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, (GDestroyNotify) NULL);
-
- if (res) {
- tmp = g_hash_table_lookup (types_cache, res);
- if (tmp) {
- g_free (res);
- res = tmp;
- } else {
- g_hash_table_insert (types_cache, res, res);
- }
- }
-
- return res;
-
- /* We used to load parts to check their type, we dont anymore,
- see bug #11778 for some discussion */
-}
-
void
em_utils_clear_get_password_canceled_accounts_flag (void)
{
diff --git a/mail/em-utils.h b/mail/em-utils.h
index 60c6e22..3167dba 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -83,7 +83,6 @@ void em_utils_adjustment_page(GtkAdjustment *adj, gboolean down);
char *em_utils_get_proxy_uri (const char *uri);
/* FIXME: should this have an override charset? */
-char *em_utils_part_to_html(CamelMimePart *part, ssize_t *len, struct _EMFormat *source);
char *em_utils_message_to_html(CamelMimeMessage *msg, const char *credits, guint32 flags, ssize_t *len, struct _EMFormat *source, const char *append);
void em_utils_expunge_folder (GtkWidget *parent, CamelFolder *folder);
@@ -104,8 +103,6 @@ void em_utils_show_info_silent (GtkWidget *widget);
gboolean em_utils_in_addressbook (CamelInternetAddress *addr, gboolean local_only);
CamelMimePart *em_utils_contact_photo (CamelInternetAddress *addr, gboolean local);
-const char *em_utils_snoop_type(CamelMimePart *part);
-
/* clears flag 'get_password_canceled' at every known accounts, so if needed, get_password will show dialog */
void em_utils_clear_get_password_canceled_accounts_flag (void);
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index 25b5648..7fe7767 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -26,6 +26,7 @@ libevolution_mail_importers_la_LIBADD = \
$(WIN32_BOOTSTRAP_LIBS) \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/filter/libfilter.la \
+ $(top_builddir)/mail/libevolution-module-mail.la \
$(IMPORTERS_LIBS)
-include $(top_srcdir)/git.mk
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 926f571..ac0c1a8 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -37,7 +37,7 @@
#include <libedataserver/e-data-server-util.h>
#include "em-utils.h"
#include "em-composer-utils.h"
-#include "em-format.h"
+#include "emformat/em-format.h"
#include "em-folder-tree.h"
#include "em-folder-browser.h"
#include "em-message-browser.h"
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index fb77e5a..edfe538 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -22,6 +22,10 @@ plugin_LTLIBRARIES = liborg-gnome-evolution-attachment-reminder.la
liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c
liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_evolution_attachment_reminder_la_LIBADD = \
+ $(top_builddir)/composer/libcomposer.la \
+ $(top_builddir)/shell/libeshell.la \
+ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
+ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/mail/libevolution-module-mail.la \
diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am
index 5dc0cc6..afa24a0 100644
--- a/plugins/bogo-junk-plugin/Makefile.am
+++ b/plugins/bogo-junk-plugin/Makefile.am
@@ -11,8 +11,10 @@ plugin_LTLIBRARIES = liborg-gnome-bogo-junk-plugin.la
liborg_gnome_bogo_junk_plugin_la_SOURCES = bf-junk-filter.c
liborg_gnome_bogo_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_bogo_junk_plugin_la_LIBADD = \
- $(GNOME_PLATFORM_LIBS) \
- $(top_builddir)/e-util/libeutil.la
+ $(top_builddir)/mail/libevolution-module-mail.la \
+ $(top_builddir)/e-util/libeutil.la \
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = bogo-junk-plugin.schemas.in
diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am
index 0a39bc4..02710a1 100644
--- a/plugins/external-editor/Makefile.am
+++ b/plugins/external-editor/Makefile.am
@@ -1,11 +1,3 @@
-if OS_WIN32
-NO_UNDEFINED_REQUIRED_LIBS = \
- $(EVOLUTION_MAIL_LIBS) \
- $(GNOME_PLATFORM_LIBS) \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/mail/libevolution-mail.la
-endif
-
INCLUDES = \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \
@@ -34,8 +26,15 @@ liborg_gnome_external_editor_la_SOURCES = \
liborg_gnome_external_editor_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
-liborg_gnome_external_editor_la_LIBADD = \
- $(NO_UNDEFINED_REQUIRED_LIBS)
+liborg_gnome_external_editor_la_LIBADD = \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/composer/libcomposer.la \
+ $(top_builddir)/shell/libeshell.la \
+ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
+ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
+ $(top_builddir)/mail/libevolution-module-mail.la \
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = apps-evolution-external-editor.schemas.in
diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am
index 3b73e27..b0f34f1 100644
--- a/plugins/imap-features/Makefile.am
+++ b/plugins/imap-features/Makefile.am
@@ -1,7 +1,3 @@
-if OS_WIN32
-NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la
-endif
-
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/mail \
@@ -19,8 +15,9 @@ plugin_LTLIBRARIES = liborg-gnome-imap-features.la
liborg_gnome_imap_features_la_SOURCES = \
imap-headers.c
-liborg_gnome_imap_features_la_LIBADD= \
- $(NO_UNDEFINED_REQUIRED_LIBS) \
+liborg_gnome_imap_features_la_LIBADD= \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/mail/libevolution-module-mail.la \
$(EVOLUTION_MAIL_LIBS)
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index f3434fd..fe407c6 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -1,10 +1,3 @@
-if OS_WIN32
-NO_UNDEFINED_REQUIRED_LIBS = \
- $(top_builddir)/mail/libevolution-mail.la \
- $(top_builddir)/e-util/libeutil.la \
- $(GNOME_PLATFORM_LIBS)
-endif
-
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
@@ -27,7 +20,9 @@ liborg_gnome_mail_notification_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
liborg_gnome_mail_notification_la_LIBADD = \
$(LIBNOTIFY_LIBS) \
- $(NO_UNDEFINED_REQUIRED_LIBS)
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/mail/libevolution-module-mail.la \
+ $(GNOME_PLATFORM_LIBS)
if ENABLE_DBUS
liborg_gnome_mail_notification_la_LDFLAGS += $(NMN_LIBS)
diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am
index 5c9feb1..dbd18dc 100644
--- a/plugins/mark-all-read/Makefile.am
+++ b/plugins/mark-all-read/Makefile.am
@@ -13,6 +13,7 @@ liborg_gnome_mark_all_read_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_mark_all_read_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/mail/libevolution-module-mail.la \
+ $(top_builddir)/shell/libeshell.la \
$(EVOLUTION_MAIL_LIBS)
EXTRA_DIST = org-gnome-mark-all-read.eplug.xml
diff --git a/plugins/plugin-manager/Makefile.am b/plugins/plugin-manager/Makefile.am
index 087c896..ab3c2ce 100644
--- a/plugins/plugin-manager/Makefile.am
+++ b/plugins/plugin-manager/Makefile.am
@@ -11,6 +11,7 @@ liborg_gnome_plugin_manager_la_SOURCES = plugin-manager.c
liborg_gnome_plugin_manager_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_plugin_manager_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/shell/libeshell.la \
$(EVOLUTION_MAIL_LIBS)
EXTRA_DIST = \
diff --git a/plugins/sa-junk-plugin/Makefile.am b/plugins/sa-junk-plugin/Makefile.am
index 4e44fa5..865744f 100644
--- a/plugins/sa-junk-plugin/Makefile.am
+++ b/plugins/sa-junk-plugin/Makefile.am
@@ -10,6 +10,12 @@ plugin_LTLIBRARIES = liborg-gnome-sa-junk-plugin.la
liborg_gnome_sa_junk_plugin_la_SOURCES = em-junk-filter.c
liborg_gnome_sa_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_sa_junk_plugin_la_LIBADD = \
+ $(top_builddir)/mail/libevolution-module-mail.la \
+ $(top_builddir)/e-util/libeutil.la \
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS)
+
BUILT_SOURCES = $(plugin_DATA) $(error_DATA)
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am
index 781eb53..f3c20d1 100644
--- a/plugins/vcard-inline/Makefile.am
+++ b/plugins/vcard-inline/Makefile.am
@@ -11,10 +11,17 @@ plugin_LTLIBRARIES = liborg-gnome-vcard-inline.la
liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c
liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_vcard_inline_la_LIBADD = \
- $(EVOLUTION_ADDRESSBOOK_LIBS)
+ $(top_builddir)/mail/libevolution-module-mail.la \
+ $(top_builddir)/addressbook/util/libeabutil.la \
+ $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
+ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
+ $(top_builddir)/addressbook/printing/libecontactprint.la \
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
$(EVOLUTION_MAIL_LIBS)
EXTRA_DIST = org-gnome-vcard-inline.eplug.xml
BUILT_SOURCES = $(plugin_DATA)
CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/po/LINGUAS b/po/LINGUAS
index 7bfdedb..992042f 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -6,7 +6,6 @@ ar
as
ast
az
-be
be latin
bg
bn
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 8fd5896..4e6f528 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -59,6 +59,7 @@ privsolib_LTLIBRARIES = \
eshellincludedir = $(privincludedir)/shell
eshellinclude_HEADERS = \
+ e-shell.h \
e-shell-common.h \
e-shell-content.h \
e-shell-module.h \
@@ -68,11 +69,11 @@ eshellinclude_HEADERS = \
e-shell-taskbar.h \
e-shell-view.h \
e-shell-window.h \
- e-shell-window-actions.h \
es-event.h
libeshell_la_SOURCES = \
$(IDL_GENERATED) \
+ e-shell.c \
e-shell-content.c \
e-shell-module.c \
e-shell-settings.c \
@@ -81,13 +82,22 @@ libeshell_la_SOURCES = \
e-shell-taskbar.c \
e-shell-view.c \
e-shell-window.c \
+ e-shell-window-private.c \
+ e-shell-window-private.h \
+ $(eshellinclude_HEADERS) \
+ e-shell-importer.c \
+ e-shell-importer.h \
+ e-shell-migrate.c \
+ e-shell-migrate.h \
+ e-shell-window-actions.h \
e-shell-window-actions.c \
- $(eshellinclude_HEADERS)
+ es-event.c
libeshell_la_LDFLAGS = $(NO_UNDEFINED)
libeshell_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/filter/libfilter.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/widgets/menus/libmenus.la \
$(SHELL_LIBS)
@@ -103,15 +113,6 @@ evolution_SOURCES = \
$(NM_SUPPORT_FILES) \
e-config-upgrade.c \
e-config-upgrade.h \
- e-shell.c \
- e-shell.h \
- e-shell-importer.c \
- e-shell-importer.h \
- e-shell-migrate.c \
- e-shell-migrate.h \
- e-shell-window-private.c \
- e-shell-window-private.h \
- es-event.c \
main.c
evolution_LDADD = \
diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am
index aa140f7..807e71f 100644
--- a/smime/gui/Makefile.am
+++ b/smime/gui/Makefile.am
@@ -35,10 +35,11 @@ libevolution_smime_la_SOURCES = \
component.h
-libevolution_smime_la_LIBADD = \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/shell/libeshell.la \
- $(top_builddir)/smime/lib/libessmime.la \
+libevolution_smime_la_LIBADD = \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/shell/libeshell.la \
+ $(top_builddir)/smime/lib/libessmime.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
$(CERT_UI_LIBS)
libevolution_smime_la_LDFLAGS = $(NO_UNDEFINED)
diff --git a/widgets/Makefile.am b/widgets/Makefile.am
index 347c0f7..14237c9 100644
--- a/widgets/Makefile.am
+++ b/widgets/Makefile.am
@@ -1,9 +1,8 @@
SUBDIRS = \
- table \
- text \
misc \
e-timezone-dialog \
+ table \
menus
EXTRA_DIST = \
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 35d9289..2f53081 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -4,7 +4,6 @@ endif
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_srcdir)/a11y/widgets \
-I$(top_srcdir)/filter \
-I$(top_srcdir)/widgets \
-DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
@@ -49,13 +48,10 @@ widgetsinclude_HEADERS = \
e-attachment-view.h \
e-calendar.h \
e-calendar-item.h \
- e-camel-activity.h \
e-canvas.h \
e-canvas-background.h \
e-canvas-utils.h \
e-canvas-vbox.h \
- e-cell-date-edit.h \
- e-cell-percent.h \
e-cell-renderer-combo.h \
e-charset-picker.h \
e-colors.h \
@@ -91,7 +87,15 @@ widgetsinclude_HEADERS = \
e-spinner.h \
e-timeout-activity.h \
e-unicode.h \
- e-url-entry.h
+ e-url-entry.h \
+ e-text-model-repos.h \
+ e-text-model.h \
+ e-text.h \
+ a11y/gal-a11y-e-text-factory.h \
+ a11y/gal-a11y-e-text.h \
+ a11y/ea-calendar-cell.h \
+ a11y/ea-calendar-item.h \
+ a11y/ea-widgets.h
libemiscwidgets_la_SOURCES = \
$(widgetsinclude_HEADERS) \
@@ -113,13 +117,10 @@ libemiscwidgets_la_SOURCES = \
e-attachment-view.c \
e-calendar.c \
e-calendar-item.c \
- e-camel-activity.c \
e-canvas.c \
e-canvas-background.c \
e-canvas-utils.c \
e-canvas-vbox.c \
- e-cell-date-edit.c \
- e-cell-percent.c \
e-cell-renderer-combo.c \
e-charset-picker.c \
e-colors.c \
@@ -153,19 +154,24 @@ libemiscwidgets_la_SOURCES = \
e-signature-tree-view.c \
e-timeout-activity.c \
e-unicode.c \
- e-url-entry.c
+ e-url-entry.c \
+ e-text-model-repos.c \
+ e-text-model.c \
+ e-text.c \
+ a11y/gal-a11y-e-text-factory.c \
+ a11y/gal-a11y-e-text.c \
+ a11y/ea-calendar-cell.c \
+ a11y/ea-calendar-item.c \
+ a11y/ea-widgets.c
libemiscwidgets_la_LDFLAGS = $(NO_UNDEFINED)
-libemiscwidgets_la_LIBADD = \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/filter/libfilter.la \
- $(top_builddir)/widgets/table/libetable.la \
- $(top_builddir)/widgets/text/libetext.la \
- $(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la \
- $(top_builddir)/a11y/libevolution-a11y.la \
- $(EVOLUTION_MAIL_LIBS) \
- $(GNOME_PLATFORM_LIBS) \
+libemiscwidgets_la_LIBADD = -lm \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/filter/libfilter.la \
+ $(top_builddir)/a11y/libevolution-a11y.la \
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GNOME_PLATFORM_LIBS) \
$(ICONV_LIBS)
noinst_PROGRAMS = \
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 32e74dd..d5f5efd 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -26,7 +26,7 @@
#endif
#include "e-calendar-item.h"
-#include "ea-widgets.h"
+#include "a11y/ea-widgets.h"
#include <time.h>
#include <string.h>
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index f51a502..dbc6ca3 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -26,12 +26,12 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-
-#include "text/e-text.h"
#include <glib/gi18n.h>
+
#include "e-util/e-util.h"
-#include "misc/e-unicode.h"
+#include "e-text.h"
+#include "e-unicode.h"
#include "e-canvas.h"
#include "e-canvas-utils.h"
#include "e-reflow.h"
diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index be43b55..f93723c 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -33,6 +33,8 @@ libetable_la_SOURCES = \
e-cell-tree.c \
e-cell-vbox.c \
e-cell-hbox.c \
+ e-cell-date-edit.c \
+ e-cell-percent.c \
e-table-click-to-add.c \
e-table-col.c \
e-table-column-specification.c \
@@ -76,7 +78,23 @@ libetable_la_SOURCES = \
e-tree-selection-model.c \
e-tree-sorted.c \
e-tree-table-adapter.c \
- e-tree.c
+ e-tree.c \
+ a11y/gal-a11y-e-cell.c \
+ a11y/gal-a11y-e-cell-popup.c \
+ a11y/gal-a11y-e-cell-registry.c \
+ a11y/gal-a11y-e-cell-text.c \
+ a11y/gal-a11y-e-cell-toggle.c \
+ a11y/gal-a11y-e-cell-tree.c \
+ a11y/gal-a11y-e-cell-vbox.c \
+ a11y/gal-a11y-e-table.c \
+ a11y/gal-a11y-e-table-click-to-add.c \
+ a11y/gal-a11y-e-table-click-to-add-factory.c \
+ a11y/gal-a11y-e-table-column-header.c \
+ a11y/gal-a11y-e-table-factory.c \
+ a11y/gal-a11y-e-table-item.c \
+ a11y/gal-a11y-e-table-item-factory.c \
+ a11y/gal-a11y-e-tree.c \
+ a11y/gal-a11y-e-tree-factory.c
libetableincludedir = $(privincludedir)/table
@@ -94,6 +112,8 @@ libetableinclude_HEADERS = \
e-cell-tree.h \
e-cell-vbox.h \
e-cell-hbox.h \
+ e-cell-date-edit.h \
+ e-cell-percent.h \
e-table-click-to-add.h \
e-table-col-dnd.h \
e-table-col.h \
@@ -140,13 +160,30 @@ libetableinclude_HEADERS = \
e-tree-selection-model.h \
e-tree-sorted.h \
e-tree-table-adapter.h \
- e-tree.h
+ e-tree.h \
+ a11y/gal-a11y-e-cell.h \
+ a11y/gal-a11y-e-cell-popup.h \
+ a11y/gal-a11y-e-cell-registry.h \
+ a11y/gal-a11y-e-cell-text.h \
+ a11y/gal-a11y-e-cell-toggle.h \
+ a11y/gal-a11y-e-cell-tree.h \
+ a11y/gal-a11y-e-cell-vbox.h \
+ a11y/gal-a11y-e-table.h \
+ a11y/gal-a11y-e-table-click-to-add.h \
+ a11y/gal-a11y-e-table-click-to-add-factory.h \
+ a11y/gal-a11y-e-table-column-header.h \
+ a11y/gal-a11y-e-table-factory.h \
+ a11y/gal-a11y-e-table-item.h \
+ a11y/gal-a11y-e-table-item-factory.h \
+ a11y/gal-a11y-e-tree.h \
+ a11y/gal-a11y-e-tree-factory.h
libetable_la_LDFLAGS = $(NO_UNDEFINED)
-libetable_la_LIBADD = \
+libetable_la_LIBADD = -lm \
$(WIN32_BOOTSTRAP_LIBS) \
$(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/a11y/libevolution-a11y.la \
$(E_UTIL_LIBS) \
$(E_WIDGETS_LIBS) \
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index b9a8544..6c0bded 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -32,8 +32,8 @@
#include <gtk/gtk.h>
-/* #include "a11y/e-table/gal-a11y-e-cell-registry.h" */
-/* #include "a11y/e-table/gal-a11y-e-cell-vbox.h" */
+/* #include "a11y/gal-a11y-e-cell-registry.h" */
+/* #include "a11y/gal-a11y-e-cell-vbox.h" */
#include "e-util/e-util.h"
#include "e-cell-hbox.h"
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index 92e03d7..e7203c5 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -33,8 +33,8 @@
#include <gdk/gdkkeysyms.h>
-#include "a11y/e-table/gal-a11y-e-cell-popup.h"
-#include "a11y/e-table/gal-a11y-e-cell-registry.h"
+#include "a11y/gal-a11y-e-cell-popup.h"
+#include "a11y/gal-a11y-e-cell-registry.h"
#include "e-util/e-util.h"
#include "e-cell-popup.h"
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index e50d3d7..90d8ef4 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -45,9 +45,9 @@
#include <libgnomecanvas/gnome-canvas.h>
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include "a11y/e-table/gal-a11y-e-cell-registry.h"
-#include "a11y/e-table/gal-a11y-e-cell-text.h"
-#include "text/e-text.h"
+#include "a11y/gal-a11y-e-cell-registry.h"
+#include "a11y/gal-a11y-e-cell-text.h"
+#include "misc/e-text.h"
#include <glib/gi18n.h>
#include "e-util/e-text-event-processor.h"
#include "e-util/e-text-event-processor-emacs-like.h"
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 4fc6aca..38562f5 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -28,8 +28,8 @@
#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas.h>
-#include "a11y/e-table/gal-a11y-e-cell-toggle.h"
-#include "a11y/e-table/gal-a11y-e-cell-registry.h"
+#include "a11y/gal-a11y-e-cell-toggle.h"
+#include "a11y/gal-a11y-e-cell-registry.h"
#include "e-util/e-util.h"
#include "misc/e-hsv-utils.h"
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index eb7e428..e9cb30b 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -38,8 +38,8 @@
#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas.h>
-#include "a11y/e-table/gal-a11y-e-cell-registry.h"
-#include "a11y/e-table/gal-a11y-e-cell-tree.h"
+#include "a11y/gal-a11y-e-cell-registry.h"
+#include "a11y/gal-a11y-e-cell-tree.h"
#include "e-util/e-util.h"
#include "e-cell-tree.h"
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index af398ae..46da90e 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -29,8 +29,8 @@
#include <gtk/gtk.h>
-#include "a11y/e-table/gal-a11y-e-cell-registry.h"
-#include "a11y/e-table/gal-a11y-e-cell-vbox.h"
+#include "a11y/gal-a11y-e-cell-registry.h"
+#include "a11y/gal-a11y-e-cell-vbox.h"
#include "e-util/e-util.h"
#include "e-cell-vbox.h"
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 4871b05..2bf9c15 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -29,8 +29,8 @@
#include <libgnomecanvas/gnome-canvas-util.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "a11y/e-table/gal-a11y-e-table-click-to-add.h"
-#include "text/e-text.h"
+#include "a11y/gal-a11y-e-table-click-to-add.h"
+#include "misc/e-text.h"
#include <glib/gi18n.h>
#include "e-util/e-util.h"
#include "misc/e-canvas-utils.h"
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index c342c6c..9ae9e8a 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -26,7 +26,7 @@
#include <gdk/gdkkeysyms.h>
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include "text/e-text.h"
+#include "misc/e-text.h"
#include <glib/gi18n.h>
#include "e-util/e-util.h"
#include "misc/e-canvas-utils.h"
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 58d6c65..394679e 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -36,8 +36,8 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#include "a11y/e-table/gal-a11y-e-table-item-factory.h"
-#include "a11y/e-table/gal-a11y-e-table-item.h"
+#include "a11y/gal-a11y-e-table-item-factory.h"
+#include "a11y/gal-a11y-e-table-item.h"
#include <glib/gi18n.h>
#include "e-util/e-util.h"
#include "misc/e-canvas.h"
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 69a300d..8483873 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -36,7 +36,7 @@
#include <libgnomecanvas/gnome-canvas.h>
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include "a11y/e-table/gal-a11y-e-table.h"
+#include "a11y/gal-a11y-e-table.h"
#include <glib/gi18n.h>
#include "e-util/e-util.h"
#include "misc/e-canvas.h"
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 0963229..222d55a 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -30,13 +30,13 @@
#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include "a11y/e-table/gal-a11y-e-tree.h"
+#include "a11y/gal-a11y-e-tree.h"
#include <glib/gi18n.h>
#include "e-util/e-util.h"
#include "misc/e-canvas.h"
#include "misc/e-canvas-utils.h"
#include "misc/e-canvas-background.h"
-#include "text/e-text.h"
+#include "misc/e-text.h"
#include "e-table-column-specification.h"
#include "e-table-header-item.h"
INCLUDES = \
-I$(top_srcdir) \
$(EVOLUTION_MAIL_CFLAGS)
noinst_LTLIBRARIES = libemformat.la
libemformat_la_SOURCES = \
em-format.h \
em-format.c \
em-format-quote.h \
em-format-quote.c \
em-stripsig-filter.c \
em-stripsig-filter.h
libemformat_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
libemformat_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/libeshell.la \
$(EVOLUTION_MAIL_LIBS)
-include $(top_srcdir)/git.mk
[Date Prev][
Date Next] [Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
