From 8d858ef399ef70a2c9efb391242e8c8be70e2109 Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Tue, 05 Jul 2005 17:02:52 +0000
Subject: Marco Pesenti Gritti <mpg@redhat.com>

2005-07-05  Carlos Garcia Campos  <carlosgc@gnome.org>
            Marco Pesenti Gritti  <mpg@redhat.com>

        * shell/Makefile.am: Add --prefix for dbus-binding-tool script

        * shell/ev-application.[ch], shell/ev-window.c: change dbus RPC
        functions to the format required by dbus

        * shell/main.c: use G_TYPE instead of DBUS_TYPE to fix compilation
        errors. Use the RPC parameters in the expected way
---
(limited to 'shell/Makefile.am')

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 2b88796..24e3ab6 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -130,7 +130,8 @@ if ENABLE_DBUS
 BUILT_SOURCES += ev-application-service.h
 endif
 
-EXTRA_DIST = ev-marshal.list
+EXTRA_DIST = ev-marshal.list \
+	     ev-application-service.h
 
 ev-marshal.h: ev-marshal.list
 	glib-genmarshal --prefix=ev_marshal ev-marshal.list --header > ev-marshal.h
@@ -139,5 +140,10 @@ ev-marshal.c: ev-marshal.list
 	echo '#include "ev-marshal.h"' > ev-marshal.c
 	glib-genmarshal --prefix=ev_marshal ev-marshal.list --body >> ev-marshal.c
 
+if DBUS_TOOL_NO_PREFIX
 ev-application-service.h: ev-application-service.xml
 	dbus-binding-tool --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml
+else
+ev-application-service.h: ev-application-service.xml
+	dbus-binding-tool --prefix=ev_application --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml
+endif
--
cgit v0.9.1