From d09d4962997e9056652815aab81f49311a6a59a8 Mon Sep 17 00:00:00 2001 From: Iain Holmes Date: Fri, 8 Jun 2001 20:47:52 +0000 Subject: Committing the new My Evolution. svn path=/trunk/; revision=10163 --- ChangeLog | 7 + Makefile.am | 2 +- art/ChangeLog | 13 + art/Makefile.am | 10 + art/bcg.png | Bin 0 -> 526 bytes art/empty.gif | Bin 0 -> 104 bytes art/es-appointments.png | Bin 0 -> 433 bytes art/es-weather.png | Bin 0 -> 1002 bytes art/ico-calendar.png | Bin 0 -> 2677 bytes art/ico-mail.png | Bin 0 -> 2937 bytes art/ico-rdf.png | Bin 0 -> 4048 bytes art/ico-weather.png | Bin 0 -> 4343 bytes art/pattern.png | Bin 0 -> 271 bytes art/rdf.png | Bin 0 -> 3802 bytes calendar/ChangeLog | 10 + calendar/gui/Makefile.am | 7 +- calendar/gui/calendar-component.c | 10 +- calendar/gui/component-factory.c | 10 +- configure.in | 6 +- default_user/ChangeLog | 6 + default_user/local/Executive-Summary/.cvsignore | 2 - default_user/local/Executive-Summary/Makefile.am | 6 - .../local/Executive-Summary/folder-metadata.xml | 5 - default_user/local/Makefile.am | 1 - default_user/shortcuts.xml | 1 - mail/ChangeLog | 17 + mail/GNOME_Evolution_Mail.oaf.in | 18 + mail/Mail.idl | 11 + mail/Makefile.am | 18 +- mail/component-factory.c | 15 +- mail/folder-info.c | 229 ++ my-evolution/.cvsignore | 12 + my-evolution/GNOME_Evolution_Summary.oaf.in | 29 + my-evolution/Locations | 3000 ++++++++++++++++++++ my-evolution/Makefile.am | 85 + my-evolution/component-factory.c | 132 + my-evolution/component-factory.h | 14 + my-evolution/e-summary-calendar.c | 286 ++ my-evolution/e-summary-calendar.h | 18 + my-evolution/e-summary-factory.c | 132 + my-evolution/e-summary-factory.h | 15 + my-evolution/e-summary-mail.c | 276 ++ my-evolution/e-summary-mail.h | 26 + my-evolution/e-summary-rdf.c | 440 +++ my-evolution/e-summary-rdf.h | 18 + my-evolution/e-summary-type.h | 14 + my-evolution/e-summary-weather.c | 419 +++ my-evolution/e-summary-weather.h | 128 + my-evolution/e-summary.c | 549 ++++ my-evolution/e-summary.h | 67 + my-evolution/main.c | 67 + my-evolution/metar.c | 590 ++++ my-evolution/metar.h | 46 + my-evolution/my-evolution-html.h | 52 + my-evolution/weather.h | 42 + shell/ChangeLog | 28 + shell/e-setup.c | 75 + shell/e-shell-importer.c | 1 - shell/e-shell-view.c | 92 +- shell/e-storage-set-view.c | 52 +- shell/evolution-storage.c | 1 - ui/ChangeLog | 4 + ui/Makefile.am | 3 +- ui/evolution-executive-summary.xml | 19 +- ui/my-evolution.xml | 23 + 65 files changed, 7022 insertions(+), 137 deletions(-) create mode 100644 art/bcg.png create mode 100644 art/empty.gif create mode 100644 art/es-appointments.png create mode 100644 art/es-weather.png create mode 100644 art/ico-calendar.png create mode 100644 art/ico-mail.png create mode 100644 art/ico-rdf.png create mode 100644 art/ico-weather.png create mode 100644 art/pattern.png create mode 100644 art/rdf.png delete mode 100644 default_user/local/Executive-Summary/.cvsignore delete mode 100644 default_user/local/Executive-Summary/Makefile.am delete mode 100644 default_user/local/Executive-Summary/folder-metadata.xml create mode 100644 mail/folder-info.c create mode 100644 my-evolution/.cvsignore create mode 100644 my-evolution/GNOME_Evolution_Summary.oaf.in create mode 100644 my-evolution/Locations create mode 100644 my-evolution/Makefile.am create mode 100644 my-evolution/component-factory.c create mode 100644 my-evolution/component-factory.h create mode 100644 my-evolution/e-summary-calendar.c create mode 100644 my-evolution/e-summary-calendar.h create mode 100644 my-evolution/e-summary-factory.c create mode 100644 my-evolution/e-summary-factory.h create mode 100644 my-evolution/e-summary-mail.c create mode 100644 my-evolution/e-summary-mail.h create mode 100644 my-evolution/e-summary-rdf.c create mode 100644 my-evolution/e-summary-rdf.h create mode 100644 my-evolution/e-summary-type.h create mode 100644 my-evolution/e-summary-weather.c create mode 100644 my-evolution/e-summary-weather.h create mode 100644 my-evolution/e-summary.c create mode 100644 my-evolution/e-summary.h create mode 100644 my-evolution/main.c create mode 100644 my-evolution/metar.c create mode 100644 my-evolution/metar.h create mode 100644 my-evolution/my-evolution-html.h create mode 100644 my-evolution/weather.h create mode 100644 ui/my-evolution.xml diff --git a/ChangeLog b/ChangeLog index 0e59cbaac6..da632a9a14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-06-08 Iain Holmes + + * Makefile.am: Byebye executive-summary, hello my-evolution + + * configure.in: Remove all the executive-summary Makefiles. Add the + my-evolution. + 2001-06-08 Jon Trowbridge * AUTHORS: Vanity, thy name is trow. diff --git a/Makefile.am b/Makefile.am index 5c72dc6a19..daab400ad3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,6 @@ SUBDIRS = \ e-util \ widgets \ shell \ - executive-summary \ libibex \ camel \ filter \ @@ -32,6 +31,7 @@ SUBDIRS = \ calendar \ wombat \ importers \ + my-evolution \ art \ ui \ default_user \ diff --git a/art/ChangeLog b/art/ChangeLog index a40a898548..c94fdd0789 100644 --- a/art/ChangeLog +++ b/art/ChangeLog @@ -1,3 +1,16 @@ +2001-06-07 Iain Holmes + + * empty.gif: + es-weather.png + es-appointments.png + ico-calendar.png + ico-mail.png + ico-rdf.png + ico-weather.png + bcg.png + rdf.png + pattern.png: Added all these for the new My Evolution + 2001-06-04 Jakub Steiner * timezone-16.xpm: for events in a diffrent timezone diff --git a/art/Makefile.am b/art/Makefile.am index 8ae91ca7d5..d7184a3a4d 100644 --- a/art/Makefile.am +++ b/art/Makefile.am @@ -1,21 +1,31 @@ imagesdir = $(datadir)/images/evolution images_DATA = \ + bcg.png \ configure_16_addressbook.xpm \ configure_16_calendar.xpm \ configure_16_folder.xpm \ configure_16_mail.xpm \ copy_16_message.xpm \ edit.xpm \ + empty.gif \ encrypt.xpm \ + es-appointments.png \ + es-weather.png \ folder.xpm \ forward.xpm \ + ico-calendar.png \ + ico-mail.png \ + ico-rdf.png \ + ico-weather.png \ import.png \ import.xpm \ move_message.xpm \ offline.png \ online.png \ + pattern.png \ print.xpm \ print-preview.xpm \ + rdf.png \ reply.xpm \ reply_to_all.xpm \ save.xpm \ diff --git a/art/bcg.png b/art/bcg.png new file mode 100644 index 0000000000..ec03f8ab6e Binary files /dev/null and b/art/bcg.png differ diff --git a/art/empty.gif b/art/empty.gif new file mode 100644 index 0000000000..0be4006193 Binary files /dev/null and b/art/empty.gif differ diff --git a/art/es-appointments.png b/art/es-appointments.png new file mode 100644 index 0000000000..e194232051 Binary files /dev/null and b/art/es-appointments.png differ diff --git a/art/es-weather.png b/art/es-weather.png new file mode 100644 index 0000000000..3d31469e78 Binary files /dev/null and b/art/es-weather.png differ diff --git a/art/ico-calendar.png b/art/ico-calendar.png new file mode 100644 index 0000000000..3010528d7f Binary files /dev/null and b/art/ico-calendar.png differ diff --git a/art/ico-mail.png b/art/ico-mail.png new file mode 100644 index 0000000000..66a4ba89cd Binary files /dev/null and b/art/ico-mail.png differ diff --git a/art/ico-rdf.png b/art/ico-rdf.png new file mode 100644 index 0000000000..ad1a8a42f5 Binary files /dev/null and b/art/ico-rdf.png differ diff --git a/art/ico-weather.png b/art/ico-weather.png new file mode 100644 index 0000000000..25eb161f8c Binary files /dev/null and b/art/ico-weather.png differ diff --git a/art/pattern.png b/art/pattern.png new file mode 100644 index 0000000000..33abc187ef Binary files /dev/null and b/art/pattern.png differ diff --git a/art/rdf.png b/art/rdf.png new file mode 100644 index 0000000000..7d84d64583 Binary files /dev/null and b/art/rdf.png differ diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 2f0b1e412e..15bf30af5a 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,13 @@ +2001-06-08 Iain Holmes + + * gui/component-factory.c: Removed the executive-summary includes. + (component_factory_init): Don't init the summary factory. + + * gui/calendar-summary.[ch]: Removed. + + * gui/Makefile.am: Remove executive-summary stuff, move some libs + around a bit. + 2001-06-04 JP Rosevear * gui/dialogs/recurrence-page.c (recurrence_page_set_dates): diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 5d48feff95..59850d48f5 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -30,7 +30,6 @@ INCLUDES = \ -I$(top_srcdir)/libical/src/libical \ -I$(top_builddir)/libical/src/libical \ -I$(top_srcdir)/widgets \ - -I$(top_srcdir)/executive-summary \ -I$(includedir) \ $(BONOBO_HTML_GNOME_CFLAGS) \ $(GNOME_VFS_CFLAGS) \ @@ -54,8 +53,6 @@ evolution_calendar_SOURCES = \ calendar-commands.h \ calendar-model.c \ calendar-model.h \ - calendar-summary.c \ - calendar-summary.h \ comp-util.c \ comp-util.h \ control-factory.c \ @@ -112,8 +109,8 @@ evolution_calendar_SOURCES = \ evolution_calendar_LDADD = \ alarm-notify/libalarm.a \ - $(top_builddir)/executive-summary/evolution-services/libevolution-services.la \ $(DB3_LDADD) \ + $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/calendar/cal-client/libcal-client.la \ $(top_builddir)/calendar/cal-util/libcal-util.la \ @@ -122,7 +119,7 @@ evolution_calendar_LDADD = \ $(top_builddir)/libical/src/libical/libical.la \ $(top_builddir)/widgets/meeting-time-sel/libevolutionmtsel.a \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ - $(top_builddir)/widgets/menus/libmenus.la \ + $(EXTRA_GNOME_LIBS) \ dialogs/libcal-dialogs.a \ $(BONOBO_HTML_GNOME_LIBS) \ $(GNOME_VFS_LIBS) \ diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 8dae53c707..da68cabf05 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -29,13 +29,12 @@ #include #include +#include #include "evolution-shell-component.h" -#include #include "component-factory.h" #include "tasks-control-factory.h" #include "control-factory.h" #include "calendar-config.h" -#include "calendar-summary.h" #include "tasks-control.h" #include "tasks-migrate.h" @@ -44,7 +43,6 @@ #define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory" static BonoboGenericFactory *factory = NULL; -static BonoboGenericFactory *summary_factory = NULL; char *evolution_dir; static const EvolutionShellComponentFolderType folder_types[] = { @@ -332,16 +330,12 @@ factory_fn (BonoboGenericFactory *factory, void component_factory_init (void) { - if (factory != NULL && factory != NULL) + if (factory != NULL) return; factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL); - summary_factory = calendar_summary_factory_init (); - if (factory == NULL) g_error ("Cannot initialize Evolution's calendar component."); - if (summary_factory == NULL) - g_error ("Cannot initialize Evolution's calendar summary component."); } diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c index 8dae53c707..da68cabf05 100644 --- a/calendar/gui/component-factory.c +++ b/calendar/gui/component-factory.c @@ -29,13 +29,12 @@ #include #include +#include #include "evolution-shell-component.h" -#include #include "component-factory.h" #include "tasks-control-factory.h" #include "control-factory.h" #include "calendar-config.h" -#include "calendar-summary.h" #include "tasks-control.h" #include "tasks-migrate.h" @@ -44,7 +43,6 @@ #define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponentFactory" static BonoboGenericFactory *factory = NULL; -static BonoboGenericFactory *summary_factory = NULL; char *evolution_dir; static const EvolutionShellComponentFolderType folder_types[] = { @@ -332,16 +330,12 @@ factory_fn (BonoboGenericFactory *factory, void component_factory_init (void) { - if (factory != NULL && factory != NULL) + if (factory != NULL) return; factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL); - summary_factory = calendar_summary_factory_init (); - if (factory == NULL) g_error ("Cannot initialize Evolution's calendar component."); - if (summary_factory == NULL) - g_error ("Cannot initialize Evolution's calendar summary component."); } diff --git a/configure.in b/configure.in index b312186a6c..3e914ca63a 100644 --- a/configure.in +++ b/configure.in @@ -940,11 +940,7 @@ po/Makefile.in e-util/Makefile e-util/ename/Makefile libibex/Makefile -executive-summary/Makefile -executive-summary/evolution-services/Makefile -executive-summary/idl/Makefile -executive-summary/component/Makefile -executive-summary/test-service/Makefile +my-evolution/Makefile camel/Makefile camel/providers/Makefile camel/providers/pop3/Makefile diff --git a/default_user/ChangeLog b/default_user/ChangeLog index 5b69c01e21..0608e60a11 100644 --- a/default_user/ChangeLog +++ b/default_user/ChangeLog @@ -1,3 +1,9 @@ +2001-06-07 Iain Holmes + + * shortcuts.xml: Removed the references to local/Executive-Summary. + + * local/Executive-Summary: Removed. + 2001-05-08 Not Zed * searches.xml: Reverted Gediminas patch. diff --git a/default_user/local/Executive-Summary/.cvsignore b/default_user/local/Executive-Summary/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/default_user/local/Executive-Summary/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/default_user/local/Executive-Summary/Makefile.am b/default_user/local/Executive-Summary/Makefile.am deleted file mode 100644 index 6fae47d4ab..0000000000 --- a/default_user/local/Executive-Summary/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -defaultcalendardir = $(datadir)/evolution/default_user/local/Executive-Summary - -defaultcalendar_DATA = \ - folder-metadata.xml - -EXTRA_DIST = $(defaultcalendar_DATA) diff --git a/default_user/local/Executive-Summary/folder-metadata.xml b/default_user/local/Executive-Summary/folder-metadata.xml deleted file mode 100644 index 86e9e425e4..0000000000 --- a/default_user/local/Executive-Summary/folder-metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - executive-summary - Executive Summary folder - diff --git a/default_user/local/Makefile.am b/default_user/local/Makefile.am index 9a2bf358d3..a1baef5052 100644 --- a/default_user/local/Makefile.am +++ b/default_user/local/Makefile.am @@ -2,7 +2,6 @@ SUBDIRS = \ Calendar \ Contacts \ Drafts \ - Executive-Summary \ Inbox \ Outbox \ Sent \ diff --git a/default_user/shortcuts.xml b/default_user/shortcuts.xml index 4532b0a17b..32cf2dd096 100644 --- a/default_user/shortcuts.xml +++ b/default_user/shortcuts.xml @@ -1,7 +1,6 @@ - evolution:/local/Executive-Summary evolution:/local/Inbox