diff options
author | Srinivasa Ragavan <sragavan@gnome.org> | 2010-03-02 20:30:06 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-03-14 09:49:49 +0800 |
commit | 5069df6878424605df09517e3b097c0bb47be746 (patch) | |
tree | ef630480d8ccf4342e5e06c21af3b031afc27880 /capplet | |
parent | 8e0c294e15ca3f765e330b1d6ae892b768453fa9 (diff) | |
download | gsoc2013-evolution-5069df6878424605df09517e3b097c0bb47be746.tar gsoc2013-evolution-5069df6878424605df09517e3b097c0bb47be746.tar.gz gsoc2013-evolution-5069df6878424605df09517e3b097c0bb47be746.tar.bz2 gsoc2013-evolution-5069df6878424605df09517e3b097c0bb47be746.tar.lz gsoc2013-evolution-5069df6878424605df09517e3b097c0bb47be746.tar.xz gsoc2013-evolution-5069df6878424605df09517e3b097c0bb47be746.tar.zst gsoc2013-evolution-5069df6878424605df09517e3b097c0bb47be746.zip |
Restructure capplet stuffs and load only on express mode.
Diffstat (limited to 'capplet')
-rw-r--r-- | capplet/Makefile.am | 34 | ||||
-rw-r--r-- | capplet/anjal-settings-main.c | 2 | ||||
-rw-r--r-- | capplet/settings/Makefile.am | 69 | ||||
-rw-r--r-- | capplet/settings/anjal-mail-view.c (renamed from capplet/anjal-mail-view.c) | 0 | ||||
-rw-r--r-- | capplet/settings/anjal-mail-view.h (renamed from capplet/anjal-mail-view.h) | 0 | ||||
-rw-r--r-- | capplet/settings/mail-account-view.c (renamed from capplet/mail-account-view.c) | 0 | ||||
-rw-r--r-- | capplet/settings/mail-account-view.h (renamed from capplet/mail-account-view.h) | 0 | ||||
-rw-r--r-- | capplet/settings/mail-capplet-shell.c (renamed from capplet/mail-capplet-shell.c) | 0 | ||||
-rw-r--r-- | capplet/settings/mail-capplet-shell.h (renamed from capplet/mail-capplet-shell.h) | 0 | ||||
-rw-r--r-- | capplet/settings/mail-decoration.c (renamed from capplet/mail-decoration.c) | 0 | ||||
-rw-r--r-- | capplet/settings/mail-decoration.h (renamed from capplet/mail-decoration.h) | 0 | ||||
-rw-r--r-- | capplet/settings/mail-guess-servers.c (renamed from capplet/mail-guess-servers.c) | 0 | ||||
-rw-r--r-- | capplet/settings/mail-guess-servers.h (renamed from capplet/mail-guess-servers.h) | 0 | ||||
-rw-r--r-- | capplet/settings/mail-settings-view.c (renamed from capplet/mail-settings-view.c) | 0 | ||||
-rw-r--r-- | capplet/settings/mail-settings-view.h (renamed from capplet/mail-settings-view.h) | 0 | ||||
-rw-r--r-- | capplet/settings/mail-view.c (renamed from capplet/mail-view.c) | 0 | ||||
-rw-r--r-- | capplet/settings/mail-view.h (renamed from capplet/mail-view.h) | 0 |
17 files changed, 72 insertions, 33 deletions
diff --git a/capplet/Makefile.am b/capplet/Makefile.am index dd18c3e994..db32e89444 100644 --- a/capplet/Makefile.am +++ b/capplet/Makefile.am @@ -1,3 +1,4 @@ +SUBDIRS = settings AM_CPPFLAGS = \ -I$(top_srcdir)/widgets \ @@ -36,29 +37,10 @@ AM_CFLAGS =\ bin_PROGRAMS = evolution-settings -privsolib_LTLIBRARIES = libevolution-mail-settings.la evolution_settings_SOURCES = \ anjal-settings-main.c -libevolution_mail_settings_la_SOURCES = \ - mail-settings-view.c \ - mail-settings-view.h \ - mail-account-view.c \ - mail-account-view.h \ - mail-view.c \ - mail-view.h \ - mail-capplet-shell.c \ - mail-capplet-shell.h \ - mail-decoration.c \ - mail-decoration.h \ - anjal-mail-view.h \ - anjal-mail-view.c \ - mail-guess-servers.c \ - mail-guess-servers.h - -libevolution_mail_settings_la_CFLAGS = -DANJAL_SETTINGS - evolution_settings_LDFLAGS = \ -Wl,--export-dynamic @@ -73,18 +55,6 @@ evolution_settings_LDADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/capplet/libevolution-mail-settings.la - -libevolution_mail_settings_la_LIBADD = \ - $(EVOLUTION_MAIL_LIBS) \ - $(CERT_UI_LIBS) \ - $(CANBERRA_LIBS) \ - $(GTKHTML_LIBS) \ - $(E_WIDGETS_LIBS) \ - $(SMIME_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/filter/libfilter.la \ - $(top_builddir)/mail/libevolution-mail.la + $(top_builddir)/capplet/settings/libevolution-mail-settings.la diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c index 7a90b879f2..f704789521 100644 --- a/capplet/anjal-settings-main.c +++ b/capplet/anjal-settings-main.c @@ -34,7 +34,7 @@ #include <glib/gi18n.h> #include <libedataserverui/e-passwords.h> #include <mail/mail-mt.h> -#include "mail-capplet-shell.h" +#include "settings/mail-capplet-shell.h" #include <gconf/gconf-client.h> #include <libedataserver/e-categories.h> #include <dbus/dbus-glib.h> diff --git a/capplet/settings/Makefile.am b/capplet/settings/Makefile.am new file mode 100644 index 0000000000..c3df948f73 --- /dev/null +++ b/capplet/settings/Makefile.am @@ -0,0 +1,69 @@ + +AM_CPPFLAGS = \ + -I$(top_srcdir)/widgets \ + -I$(top_srcdir)/widgets/misc \ + -I$(top_srcdir) \ + -I$(top_srcdir)/em-format \ + -I$(top_srcdir)/mail \ + -I$(top_srcdir)/composer \ + -I$(top_builddir)/composer \ + -I$(top_builddir)/shell \ + -I$(top_srcdir)/shell \ + -I$(top_srcdir)/smime/lib \ + -I$(top_srcdir)/smime/gui \ + $(GNOME_PLATFORM_CFLAGS) \ + $(EVOLUTION_MAIL_CFLAGS) \ + $(CERT_UI_CFLAGS) \ + $(CANBERRA_CFLAGS) \ + -DEVOLUTION_DATADIR=\""$(datadir)"\" \ + -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ + -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ + -DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \ + -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ + -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ + -DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ + -DEVOLUTION_UIDIR=\""$(uidir)"\" \ + -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \ + -DPREFIX=\""$(prefix)"\" \ + -DG_LOG_DOMAIN=\"evolution-mail\" \ + -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" + +AM_CFLAGS =\ + -Wall\ + -g -O0 + +privsolib_LTLIBRARIES = libevolution-mail-settings.la + +libevolution_mail_settings_la_SOURCES = \ + mail-settings-view.c \ + mail-settings-view.h \ + mail-account-view.c \ + mail-account-view.h \ + mail-view.c \ + mail-view.h \ + mail-capplet-shell.c \ + mail-capplet-shell.h \ + mail-decoration.c \ + mail-decoration.h \ + anjal-mail-view.h \ + anjal-mail-view.c \ + mail-guess-servers.c \ + mail-guess-servers.h + +libevolution_mail_settings_la_CFLAGS = -DANJAL_SETTINGS + +libevolution_mail_settings_la_LIBADD = \ + $(EVOLUTION_MAIL_LIBS) \ + $(CERT_UI_LIBS) \ + $(CANBERRA_LIBS) \ + $(GTKHTML_LIBS) \ + $(E_WIDGETS_LIBS) \ + $(SMIME_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/filter/libfilter.la \ + $(top_builddir)/mail/libevolution-mail.la + + diff --git a/capplet/anjal-mail-view.c b/capplet/settings/anjal-mail-view.c index 5178b56422..5178b56422 100644 --- a/capplet/anjal-mail-view.c +++ b/capplet/settings/anjal-mail-view.c diff --git a/capplet/anjal-mail-view.h b/capplet/settings/anjal-mail-view.h index 647d07b29a..647d07b29a 100644 --- a/capplet/anjal-mail-view.h +++ b/capplet/settings/anjal-mail-view.h diff --git a/capplet/mail-account-view.c b/capplet/settings/mail-account-view.c index 94442a98ab..94442a98ab 100644 --- a/capplet/mail-account-view.c +++ b/capplet/settings/mail-account-view.c diff --git a/capplet/mail-account-view.h b/capplet/settings/mail-account-view.h index 5066d83dce..5066d83dce 100644 --- a/capplet/mail-account-view.h +++ b/capplet/settings/mail-account-view.h diff --git a/capplet/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index d1ccdf80ac..d1ccdf80ac 100644 --- a/capplet/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c diff --git a/capplet/mail-capplet-shell.h b/capplet/settings/mail-capplet-shell.h index 9cc4255760..9cc4255760 100644 --- a/capplet/mail-capplet-shell.h +++ b/capplet/settings/mail-capplet-shell.h diff --git a/capplet/mail-decoration.c b/capplet/settings/mail-decoration.c index 689bb83285..689bb83285 100644 --- a/capplet/mail-decoration.c +++ b/capplet/settings/mail-decoration.c diff --git a/capplet/mail-decoration.h b/capplet/settings/mail-decoration.h index 9010e8990c..9010e8990c 100644 --- a/capplet/mail-decoration.h +++ b/capplet/settings/mail-decoration.h diff --git a/capplet/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index 26fc630f16..26fc630f16 100644 --- a/capplet/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c diff --git a/capplet/mail-guess-servers.h b/capplet/settings/mail-guess-servers.h index b1d6746a4d..b1d6746a4d 100644 --- a/capplet/mail-guess-servers.h +++ b/capplet/settings/mail-guess-servers.h diff --git a/capplet/mail-settings-view.c b/capplet/settings/mail-settings-view.c index 154fd0b319..154fd0b319 100644 --- a/capplet/mail-settings-view.c +++ b/capplet/settings/mail-settings-view.c diff --git a/capplet/mail-settings-view.h b/capplet/settings/mail-settings-view.h index 6a649d31ad..6a649d31ad 100644 --- a/capplet/mail-settings-view.h +++ b/capplet/settings/mail-settings-view.h diff --git a/capplet/mail-view.c b/capplet/settings/mail-view.c index cb6afb659d..cb6afb659d 100644 --- a/capplet/mail-view.c +++ b/capplet/settings/mail-view.c diff --git a/capplet/mail-view.h b/capplet/settings/mail-view.h index 339d690c43..339d690c43 100644 --- a/capplet/mail-view.h +++ b/capplet/settings/mail-view.h |