diff options
| -rw-r--r-- | shell/ChangeLog | 7 | ||||
| -rw-r--r-- | shell/GNOME_Evolution_Shell.server.in.in | 6 | ||||
| -rw-r--r-- | shell/Makefile.am | 2 | ||||
| -rw-r--r-- | shell/e-shell.h | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 7470b7bae5..d8e81c61e1 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2003-10-22 Ettore Perazzoli <ettore@ximian.com> + + * GNOME_Evolution_Shell.server.in.in: Append a _2 to all the IIDs. + + * e-shell.h (E_SHELL_OAFIID): Change to "GNOME_Evolution_Shell_2" + so it does not conflict with the old IID. + 2003-10-22 Jeffrey Stedfast <fejj@ximian.com> * e-shell-window.c (e_shell_window_new): Change to "evolution-1.5" diff --git a/shell/GNOME_Evolution_Shell.server.in.in b/shell/GNOME_Evolution_Shell.server.in.in index 960ae4ee07..a54a7b4d7b 100644 --- a/shell/GNOME_Evolution_Shell.server.in.in +++ b/shell/GNOME_Evolution_Shell.server.in.in @@ -1,6 +1,6 @@ <oaf_info> - <oaf_server iid="OAFIID:GNOME_Evolution_Shell" + <oaf_server iid="OAFIID:GNOME_Evolution_Shell_2" type="exe" location="@BINDIR@/evolution-@VERSION@"> @@ -12,7 +12,7 @@ _value="Evolution Shell"/> </oaf_server> - <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_Factory" + <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_Factory_2" type="exe" location="evolution-exchange-storage"> @@ -21,7 +21,7 @@ </oaf_attribute> </oaf_server> - <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_FolderSettings_Control" + <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_FolderSettings_Control_2" type="factory" location="OAFIID:GNOME_Evolution_Shell_Config_Factory"> diff --git a/shell/Makefile.am b/shell/Makefile.am index a427d280d9..5696b278a8 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -218,6 +218,8 @@ evolution_SOURCES = \ e-shell-window.h \ e-shell.c \ e-shell.h \ + e-sidebar.c \ + e-sidebar.h \ e-task-bar.c \ e-task-bar.h \ e-task-widget.c \ diff --git a/shell/e-shell.h b/shell/e-shell.h index afd1f33e1b..1d17581067 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -81,7 +81,7 @@ struct _EShellClass { /* ID for registering the shell in the OAF name service. */ -#define E_SHELL_OAFIID "OAFIID:GNOME_Evolution_Shell" +#define E_SHELL_OAFIID "OAFIID:GNOME_Evolution_Shell_2" enum _EShellConstructResult { E_SHELL_CONSTRUCT_RESULT_OK, |