diff options
| author | Zeeshan Ali (Khattak) <zeeshanak@gnome.org> | 2014-01-15 17:07:54 +0000 |
|---|---|---|
| committer | Zeeshan Ali (Khattak) <zeeshanak@gnome.org> | 2014-01-15 17:13:19 +0000 |
| commit | fd82f4adc3e6612f4821dc456e9e7dccef9c4989 (patch) | |
| tree | c7611d9138bc192d3918305a0ef6ab20a0fbd74c /demo | |
| parent | e0c688c5228bb9db3ea86552ed0da26cb893ed3f (diff) | |
| download | geoclue-fd82f4adc3e6612f4821dc456e9e7dccef9c4989.tar.gz | |
demo: Install a desktop file for demo app
Diffstat (limited to 'demo')
| -rw-r--r-- | demo/Makefile.am | 17 | ||||
| -rw-r--r-- | demo/geoclue-where-am-i.desktop.in.in | 10 | ||||
| -rw-r--r-- | demo/where-am-i.c | 4 |
3 files changed, 28 insertions, 3 deletions
diff --git a/demo/Makefile.am b/demo/Makefile.am index 3f45fb5..0a12396 100644 --- a/demo/Makefile.am +++ b/demo/Makefile.am @@ -8,6 +8,14 @@ where_am_i_CFLAGS = $(GEOCLUE_CFLAGS) \ -DLOCALEDIR="\"$(datadir)/locale\"" where_am_i_LDADD = $(GEOCLUE_LIBS) +appsdir = $(datadir)/applications +apps_DATA = geoclue-where-am-i.desktop + +@INTLTOOL_DESKTOP_RULE@ + +geoclue-where-am-i.desktop.in: geoclue-where-am-i.desktop.in.in + $(AM_V_GEN) sed -e "s|[@]datadir@|$(datadir)|g" $< > $@ + if BUILD_DEMO_AGENT demo_PROGRAMS += agent endif # BUILD_DEMO_AGENT @@ -37,3 +45,12 @@ agent_CFLAGS = $(DEMO_AGENT_CFLAGS) \ agent_LDADD = $(DEMO_AGENT_LIBS) -include $(top_srcdir)/git.mk + +EXTRA_DIST = \ + geoclue-where-am-i.desktop.in.in \ + $(NULL) + +CLEANFILES = \ + geoclue-where-am-i.desktop.in \ + $(NULL) + diff --git a/demo/geoclue-where-am-i.desktop.in.in b/demo/geoclue-where-am-i.desktop.in.in new file mode 100644 index 0000000..8816d4f --- /dev/null +++ b/demo/geoclue-where-am-i.desktop.in.in @@ -0,0 +1,10 @@ +[Desktop Entry] +_Name=Where am I? +_GenericName=Demo geolocation application +_Comment=Find your current location +_Keywords=geolocation; +Exec=@datadir@/geoclue-2.0/demos/where-am-i +Icon=mark-location-symbolic +NoDisplay=true +Terminal=true +Type=Application diff --git a/demo/where-am-i.c b/demo/where-am-i.c index 10cd44b..605ee4f 100644 --- a/demo/where-am-i.c +++ b/demo/where-am-i.c @@ -190,8 +190,7 @@ on_client_props_proxy_ready (GObject *source_object, exit (-3); } - /* FIXME: We should provide a desktop file? */ - desktop_id = g_variant_new ("s", "geoclue-demo-app"); + desktop_id = g_variant_new ("s", "geoclue-where-am-i"); g_dbus_proxy_call (client_props, "Set", @@ -272,7 +271,6 @@ main (gint argc, gchar *argv[]) textdomain (GETTEXT_PACKAGE); bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - g_set_application_name (_("Where Am I")); g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, |