[gnome-applets/wip/dont-use-deprecated] invest-applet: replaced old server files with new panel-applet and dbus files

[Enrico Minack <eminack src gnome org>]

commit 78018263f879efacfb934fd5fbe378c874d746eb
Author: Enrico Minack <enrico-minack gmx de>
Date:   Sat Apr 9 01:56:27 2011 +0200

    invest-applet: replaced old server files with new panel-applet and dbus files

 invest-applet/data/GNOME_GtikApplet.server    |   18 ---------
 invest-applet/data/Invest_Applet.server.in.in |   25 -------------
 invest-applet/data/Makefile.am                |   48 +++++++++++++------------
 po/POTFILES.in                                |    2 +-
 4 files changed, 26 insertions(+), 67 deletions(-)
---
diff --git a/invest-applet/data/Makefile.am b/invest-applet/data/Makefile.am
index 9a31989..9716b94 100644
--- a/invest-applet/data/Makefile.am
+++ b/invest-applet/data/Makefile.am
@@ -1,21 +1,29 @@
 SUBDIRS = art
 
 # ******************************************************************************
-# Panel applet bonobo stuff
+# Panel Applet stuff
 # ******************************************************************************
-serverdir = $(libdir)/bonobo/servers
-server_in_files = Invest_Applet.server.in
-server_DATA = \
-	$(server_in_files:.server.in=.server) \
-	GNOME_GtikApplet.server
+servicedir       = $(datadir)/dbus-1/services
+service_in_files = org.gnome.panel.applet.InvestAppletFactory.service.in
+service_DATA     = $(service_in_files:.service.in=.service)
+
+org.gnome.panel.applet.InvestAppletFactory.service: $(service_in_files)
+	$(AM_V_GEN)sed \
+            -e "s|\ LIBEXECDIR\@|$(libexecdir)|" \
+            $< > $@
+
+appletdir       = $(LIBPANEL_APPLET_DIR)
+applet_in_files = org.gnome.applets.InvestApplet.panel-applet.in
+applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
+
+$(applet_in_files): $(applet_in_files).in Makefile
+	$(AM_V_GEN)sed \
+            -e "s|\ LIBEXECDIR\@|$(libexecdir)|" \
+            -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
+            $< > $@
+
+%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-# ******************************************************************************
-# GConf Schemas
-# ******************************************************************************
-# GConf Preference Schemas
-#schemadir = $(GCONF_SCHEMA_FILE_DIR)
-#schema_in_files = deskbar-applet.schemas.in
-#schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
 # ******************************************************************************
 # Misc data
@@ -35,23 +43,17 @@ investbindir = $(libdir)/invest-applet
 @INTLTOOL_SERVER_RULE@
 @INTLTOOL_SCHEMAS_RULE@
 
-$(server_in_files): $(server_in_files:.server.in=.server.in.in)
-	sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" $< > $@
 
-#if GCONF_SCHEMAS_INSTALL
-#install-data-local: install-schemas
-#install-schemas:
-#	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-#		$(GCONFTOOL) --makefile-install-rule $(schema_DATA)
-#endif
+
+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
 
 DISTCLEANFILES = \
 	$(server_in_files) \
 	$(server_in_files:.server.in=.server)
 
 EXTRA_DIST = \
-	Invest_Applet.server.in.in \
-	GNOME_GtikApplet.server \
+	org.gnome.applets.InvestApplet.panel-applet.in.in \
+	$(service_in_files) \
 	$(ui_DATA) \
 	$(builder_DATA)
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 46e2ab2..2a8badb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -41,7 +41,7 @@ gweather/gweather-dialog.c
 gweather/gweather-pref.c
 gweather/main.c
 [type: gettext/ini]gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in
-invest-applet/data/Invest_Applet.server.in.in
+invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in
 invest-applet/data/Invest_Applet.xml
 [type: gettext/glade]invest-applet/data/financialchart.ui
 [type: gettext/glade]invest-applet/data/prefs-dialog.ui