summaryrefslogtreecommitdiff
path: root/invest-applet/data
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-12-03 23:48:48 +0100
committerStefano Karapetsas <[email protected]>2012-12-03 23:48:48 +0100
commit540e2e460c8155a22b10c1712eec71c9bf25aea9 (patch)
treefedf92ae6b47340fc4155319c5c978124a17df9e /invest-applet/data
parentba7f835eb79762dd65356a0722aa3e64ad03decb (diff)
downloadmate-applets-540e2e460c8155a22b10c1712eec71c9bf25aea9.tar.bz2
mate-applets-540e2e460c8155a22b10c1712eec71c9bf25aea9.tar.xz
invest-applet: port to gobject introspection
there is an issue to fix with self.applet.window.get_origin in applet.py
Diffstat (limited to 'invest-applet/data')
-rw-r--r--invest-applet/data/Invest_Applet.server.in.in25
-rw-r--r--invest-applet/data/Invest_Applet.xml15
-rw-r--r--invest-applet/data/MATE_GtikApplet.server18
-rw-r--r--invest-applet/data/Makefile.am52
-rw-r--r--invest-applet/data/org.mate.applets.InvestApplet.mate-panel-applet.in.in17
-rw-r--r--invest-applet/data/org.mate.panel.applet.InvestAppletFactory.service.in3
6 files changed, 51 insertions, 79 deletions
diff --git a/invest-applet/data/Invest_Applet.server.in.in b/invest-applet/data/Invest_Applet.server.in.in
deleted file mode 100644
index fe4c6da5..00000000
--- a/invest-applet/data/Invest_Applet.server.in.in
+++ /dev/null
@@ -1,25 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:Invest_Applet_Factory" type="exe" location="@LIBEXECDIR@/invest-applet">
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:MateComponent/GenericFactory:1.0"/>
- <item value="IDL:MateComponent/Unknown:1.0"/>
- </oaf_attribute>
- <oaf_attribute name="name" type="string" _value="Invest"/>
- <oaf_attribute name="description" type="string" _value="Track your invested money."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:Invest_Applet" type="factory" location="OAFIID:Invest_Applet_Factory">
-
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:MATE/Vertigo/MatePanelAppletShell:1.0"/>
- <item value="IDL:MateComponent/Control:1.0"/>
- <item value="IDL:MateComponent/Unknown:1.0"/>
- </oaf_attribute>
- <oaf_attribute name="name" type="string" _value="Invest"/>
- <oaf_attribute name="description" type="string" _value="Track your invested money."/>
- <oaf_attribute name="panel:category" type="string" value="Accessories"/>
- <oaf_attribute name="panel:icon" type="string" value="mate-invest-applet"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/invest-applet/data/Invest_Applet.xml b/invest-applet/data/Invest_Applet.xml
index 832f6b83..d4a3e611 100644
--- a/invest-applet/data/Invest_Applet.xml
+++ b/invest-applet/data/Invest_Applet.xml
@@ -1,10 +1,5 @@
-<Root>
- <popups>
- <popup name="button3">
- <menuitem name="Refresh" verb="Refresh" _label="_Refresh" pixtype="stock" pixname="gtk-refresh"/>
- <menuitem name="Prefs" verb="Prefs" _label="_Preferences" pixtype="stock" pixname="gtk-properties"/>
- <menuitem name="Help" verb="Help" _label="_Help" pixtype="stock" pixname="gtk-help"/>
- <menuitem name="About" verb="About" _label="_About" pixtype="stock" pixname="gtk-about"/>
- </popup>
- </popups>
-</Root>
+<menuitem name="Refresh" action="Refresh" />
+<menuitem name="Prefs" action="Prefs" />
+<separator/>
+<menuitem name="About" action="About" />
+<menuitem name="Help" action="Help" />
diff --git a/invest-applet/data/MATE_GtikApplet.server b/invest-applet/data/MATE_GtikApplet.server
deleted file mode 100644
index 73f0717b..00000000
--- a/invest-applet/data/MATE_GtikApplet.server
+++ /dev/null
@@ -1,18 +0,0 @@
-<oaf_info>
-
-<!-- gtik was replaced by invest-applet, transparently upgrade the user -->
-<oaf_server iid="OAFIID:MATE_GtikApplet"
- type="factory"
- location="OAFIID:Invest_Applet_Factory">
-
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:MATE/Vertigo/MatePanelAppletShell:1.0"/>
- <item value="IDL:MateComponent/Control:1.0"/>
- <item value="IDL:MateComponent/Unknown:1.0"/>
- </oaf_attribute>
- <oaf_attribute name="name" type="string" value="Stock Ticker"/>
- <oaf_attribute name="description" type="string" value="Replaced with invest-applet"/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/invest-applet/data/Makefile.am b/invest-applet/data/Makefile.am
index e304109a..333040df 100644
--- a/invest-applet/data/Makefile.am
+++ b/invest-applet/data/Makefile.am
@@ -1,26 +1,38 @@
SUBDIRS = art
# ******************************************************************************
-# Panel applet matecomponent stuff
+# Panel applet DBUS stuff
# ******************************************************************************
-serverdir = $(libdir)/matecomponent/servers
-server_in_files = Invest_Applet.server.in
-server_DATA = \
- $(server_in_files:.server.in=.server) \
- MATE_GtikApplet.server
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.mate.panel.applet.InvestAppletFactory.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+
+org.mate.panel.applet.InvestAppletFactory.service: $(service_in_files)
+ $(AM_V_GEN)sed \
+ -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+ $< > $@
# ******************************************************************************
-# MateConf Schemas
+# Panel stuff
# ******************************************************************************
-# MateConf Preference Schemas
-#schemadir = $(MATECONF_SCHEMA_FILE_DIR)
-#schema_in_files = deskbar-applet.schemas.in
-#schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+
+appletdir = $(datadir)/mate-panel/applets
+applet_in_files = org.mate.applets.InvestApplet.mate-panel-applet.in
+applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+
+$(applet_in_files): $(applet_in_files).in Makefile
+ $(AM_V_GEN)sed \
+ -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+ -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
+ $< > $@
+
+%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
# ******************************************************************************
# Misc data
# ******************************************************************************
-uidir = $(datadir)/mate-2.0/ui
+
+uidir = $(datadir)/mate-applets
ui_DATA = \
Invest_Applet.xml
builder_DATA = \
@@ -32,26 +44,14 @@ investbindir = $(libdir)/invest-applet
# ******************************************************************************
# Build rules
# ******************************************************************************
-@INTLTOOL_SERVER_RULE@
-@INTLTOOL_SCHEMAS_RULE@
-
-$(server_in_files): $(server_in_files:.server.in=.server.in.in)
- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-
-#if MATECONF_SCHEMAS_INSTALL
-#install-data-local: install-schemas
-#install-schemas:
-# MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) \
-# $(MATECONFTOOL) --makefile-install-rule $(schema_DATA)
-#endif
DISTCLEANFILES = \
$(server_in_files) \
$(server_in_files:.server.in=.server)
EXTRA_DIST = \
- Invest_Applet.server.in.in \
- MATE_GtikApplet.server \
+ org.mate.applets.InvestApplet.mate-panel-applet.in.in \
+ $(service_in_files) \
$(ui_DATA) \
$(builder_DATA)
diff --git a/invest-applet/data/org.mate.applets.InvestApplet.mate-panel-applet.in.in b/invest-applet/data/org.mate.applets.InvestApplet.mate-panel-applet.in.in
new file mode 100644
index 00000000..00a83afb
--- /dev/null
+++ b/invest-applet/data/org.mate.applets.InvestApplet.mate-panel-applet.in.in
@@ -0,0 +1,17 @@
+[Applet Factory]
+Id=InvestAppletFactory
+Location=@LIBEXECDIR@/invest-applet
+_Name=Invest Applet Factory
+_Description=Factory for creating the invest applet.
+
+[InvestApplet]
+_Name=Invest
+_Description=Track your invested money.
+Icon=invest-applet
+BonoboId=OAFIID:Invest_Applet_Factory
+X-MATE-Bugzilla-Bugzilla=MATE
+X-MATE-Bugzilla-Product=mate-applets
+X-MATE-Bugzilla-Component=invest
+X-MATE-Bugzilla-Version=@VERSION@
+X-MATE-Bugzilla-OtherBinaries=invest-applet
+
diff --git a/invest-applet/data/org.mate.panel.applet.InvestAppletFactory.service.in b/invest-applet/data/org.mate.panel.applet.InvestAppletFactory.service.in
new file mode 100644
index 00000000..353c578a
--- /dev/null
+++ b/invest-applet/data/org.mate.panel.applet.InvestAppletFactory.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.mate.panel.applet.InvestAppletFactory
+Exec=@LIBEXECDIR@/invest-applet