diff options
| author | Dan Winship <danw@src.gnome.org> | 2000-07-25 09:16:38 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2000-07-25 09:16:38 +0800 |
| commit | dbf077d9dd938f2aeccf6d907e5d87e106a92739 (patch) | |
| tree | def6aa8ce0d739b81c19256163a80ed543365eb3 /shell/e-shell.c | |
| parent | b4fa8e15a8014442a0a21cc121cedda16cdc272a (diff) | |
| download | gsoc2013-evolution-dbf077d9dd938f2aeccf6d907e5d87e106a92739.tar gsoc2013-evolution-dbf077d9dd938f2aeccf6d907e5d87e106a92739.tar.gz gsoc2013-evolution-dbf077d9dd938f2aeccf6d907e5d87e106a92739.tar.bz2 gsoc2013-evolution-dbf077d9dd938f2aeccf6d907e5d87e106a92739.tar.lz gsoc2013-evolution-dbf077d9dd938f2aeccf6d907e5d87e106a92739.tar.xz gsoc2013-evolution-dbf077d9dd938f2aeccf6d907e5d87e106a92739.tar.zst gsoc2013-evolution-dbf077d9dd938f2aeccf6d907e5d87e106a92739.zip | |
Remove GOAD support.
* e-shell.c, main.c: Remove GOAD support.
* evolution-shell-component-client.c: Remove GOAD support.
(evolution_shell_component_client_new): Give the "maybe
OAF_INFO_PATH" message if no oafinfo file was found, and give a
"consult previous error messages" message if the component was
found but not activated. Abort in either case.
svn path=/trunk/; revision=4299
Diffstat (limited to 'shell/e-shell.c')
| -rw-r--r-- | shell/e-shell.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c index 09ff9285fa..fd8807ab64 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -70,15 +70,9 @@ struct _EShellPrivate { #define SHORTCUTS_FILE_NAME "shortcuts.xml" #define LOCAL_STORAGE_DIRECTORY "local" -#ifdef USING_OAF #define MAIL_COMPONENT_ID "OAFIID:evolution-shell-component:evolution-mail:d3cb3ed6-a654-4337-8aa0-f443751d6d1b" #define CALENDAR_COMPONENT_ID "OAFIID:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51" #define ADDRESSBOOK_COMPONENT_ID "OAFIID:evolution-shell-component:addressbook:b7a26547-7014-4bb5-98ab-2bcac2bb55ca" -#else -#define MAIL_COMPONENT_ID "evolution-shell-component:evolution-mail" -#define CALENDAR_COMPONENT_ID "evolution-shell-component:evolution-calendar" -#define ADDRESSBOOK_COMPONENT_ID "evolution-shell-component:addressbook" -#endif enum { |