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

Added rule to generate GNOME_Evolution_Shell.server.in from

Browse Source 
* Makefile.am: Added rule to generate
GNOME_Evolution_Shell.server.in from
GNOME_Evolution_Shell.server.in.in, substituting @BINDIR@.

* GNOME_Evolution_Shell.server.in.in: Renamed from
GNOME_Evolution_Shell.server.in.  Prepend @BINDIR@ to the location
of the executable.

svn path=/trunk/; revision=18792
This commit is contained in:
Ettore Perazzoli
2002-11-15 22:06:22 +00:00
parent e0edfe0bca
commit 44f482262c
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
shell/ChangeLog
View File

@ -1,3 +1,13 @@
2002-11-15 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am: Added rule to generate
GNOME_Evolution_Shell.server.in from
GNOME_Evolution_Shell.server.in.in, substituting @BINDIR@.
* GNOME_Evolution_Shell.server.in.in: Renamed from
GNOME_Evolution_Shell.server.in. Prepend @BINDIR@ to the location
of the executable.
2002-11-15 Ettore Perazzoli <ettore@ximian.com>
* evolution-storage.c (impl_finalize): Fix typo; p -> sp.

2
shell/GNOME_Evolution_Shell.server.in → shell/GNOME_Evolution_Shell.server.in.in
View File

@ -2,7 +2,7 @@
<oaf_server iid="OAFIID:GNOME_Evolution_Shell"
type="exe"
location="evolution">
location="@BINDIR@/evolution">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Evolution/Shell:1.0"/>

6
shell/Makefile.am
View File

@ -255,8 +255,10 @@ install-test-component: evolution-test-component
# Misc stuff
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_Evolution_Shell.server.in
server_DATA = $(server_in_files:.server.in=.server)
server_in_files = GNOME_Evolution_Shell.server.in.in
server_DATA = $(server_in_files:.server.in.in=.server)
$(server_in_files:.server.in.in=.server.in): $(server_in_files)
sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@
etspecdir = $(datadir)/evolution/etspec/
etspec_DATA = \

4
shell/e-shell.c
View File

@ -961,14 +961,14 @@ notify_no_views_left_idle_cb (void *data)
{
EShell *shell;
puts (__FUNCTION__);
shell = E_SHELL (data);
set_interactive (shell, FALSE);
bonobo_object_ref (BONOBO_OBJECT (shell));
g_signal_emit (shell, signals [NO_VIEWS_LEFT], 0);
bonobo_object_unref (BONOBO_OBJECT (shell));
return FALSE;