callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Append a _2 to all the IIDs.

Browse Source 
* 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.

svn path=/trunk/; revision=22987
This commit is contained in:
Ettore Perazzoli
2003-10-22 17:05:54 +00:00
parent 9267c86198
commit f34b946559
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shell/ChangeLog
View File

@ -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"

6
shell/GNOME_Evolution_Shell.server.in.in
View File

@ -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">

2
shell/Makefile.am
View File

@ -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 \

2
shell/e-shell.h
View File

@ -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,