[gnome-sound-recorder/dbusfixes] more work on dbus launching

[Meg Ford (Margaret) <megford src gnome org>]

commit b1fae408565c35239523a0c476549269a76963c5
Author: Meg Ford <meg387 gmail com>
Date:   Mon Sep 23 09:48:25 2013 -0500

    more work on dbus launching

 data/Makefile.am                               |    8 ++++----
 data/org.gnome.gnome-sound-recorder.service.in |    2 +-
 src/Makefile.am                                |   14 +++++++-------
 src/gnome-sound-recorder.in                    |    2 +-
 src/main.js                                    |    6 +++---
 src/package.js                                 |    4 +---
 6 files changed, 17 insertions(+), 19 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 0156434..3f53390 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,7 @@
 
 
 appsdir = $(datadir)/applications
-apps_DATA = $(PACKAGE_NAME).desktop
+apps_DATA = org.gnome.SoundRecorder.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
@@ -17,7 +17,7 @@ org.gnome.gnome-sound-recorder.service: org.gnome.gnome-sound-recorder.service.i
                -e "s|[ ]pkglibdir@|$(pkglibdir)|g" \
                $< > $@
 
-gnome-sound-recorder.desktop.in: gnome-sound-recorder.desktop.in.in
+org.gnome.SoundRecorder.desktop.in: org.gnome.SoundRecorder.desktop.in.in
        $(AM_V_GEN) sed \
                -e "s|[ ]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
                -e "s|[ ]pkgdatadir@|$(pkgdatadir)|g" \
@@ -28,14 +28,14 @@ servicedir = $(datadir)/dbus-1/services
 service_DATA = org.gnome.gnome-sound-recorder.service
 
 EXTRA_DIST = \
-       $(PACKAGE_NAME).desktop.in.in \
+       org.gnome.SoundRecorder.desktop.in.in \
        org.gnome.gnome-sound-recorder.service.in \
        $(gsettings_SCHEMAS) \
        $(resource_files) \
        $(NULL)
 
 CLEANFILES = \
-       $(PACKAGE_NAME).desktop.in \
+       org.gnome.SoundRecorder.desktop.in \
        org.gnome.gnome-sound-recorder.service \
        $(apps_DATA) \
        *.valid \
diff --git a/data/org.gnome.gnome-sound-recorder.service.in b/data/org.gnome.gnome-sound-recorder.service.in
index 94cd4c1..54e6e19 100644
--- a/data/org.gnome.gnome-sound-recorder.service.in
+++ b/data/org.gnome.gnome-sound-recorder.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.gnome.SoundRecorder
-Exec= pkgdatadir@/@PACKAGE_NAME@
+Exec= pkgdatadir@/org.gnome.SoundRecorder
diff --git a/src/Makefile.am b/src/Makefile.am
index 35a2b8a..8b82e1c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,11 +3,8 @@
 ## Created by Anjuta 
 NULL = 
  
-nodist_bin_SCRIPTS = $(PACKAGE_TARNAME)
-nodist_pkgdata_SCRIPTS = \
-    org.gnome.SoundRecorder \
-    gnome-sound-recorder \
-    $(NULL)
+nodist_bin_SCRIPTS = gnome-sound-recorder 
+nodist_pkgdata_SCRIPTS = org.gnome.SoundRecorder
     
 
 EXTRA_SCRIPTS = org.gnome.SoundRecorder gnome-sound-recorder
@@ -53,9 +50,12 @@ $(PACKAGE_NAME): $(PACKAGE_NAME).in
 
 EXTRA_DIST = \
     org.gnome.SoundRecorder.in \
-    $(PACKAGE_NAME).in \
+    gnome-sound-recorder.in \
     $(NULL)
     
-CLEANFILES = $(PACKAGE_NAME) 
+CLEANFILES =  \
+    org.gnome.SoundRecorder.in \
+    gnome-sound-recorder.in \
+    $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/gnome-sound-recorder.in b/src/gnome-sound-recorder.in
index 61025e5..0979b97 100644
--- a/src/gnome-sound-recorder.in
+++ b/src/gnome-sound-recorder.in
@@ -1,5 +1,5 @@
 #! GJS@
 imports.searchPath.push("@pkgdatadir@");
-imports.package.launch({ name: "org.gnome.SoundRecorder" })
+imports.package.launch({ name: "org.gnome.SoundRecorder" });
 
 
diff --git a/src/main.js b/src/main.js
index c7b366f..35d87e0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -52,7 +52,9 @@ const Application = new Lang.Class({
     Extends: Gtk.Application,
 
     _init: function() {
-        this.parent({ application_id: "org.gnome.SoundRecorder" }); 
+        this.parent({ application_id: "org.gnome.SoundRecorder",
+                      flags: Gio.ApplicationFlags.IS_SERVICE,
+                      inactivity_timeout: 60000 }); 
         GLib.set_application_name(_("SoundRecorder"));         
     },
     
@@ -101,7 +103,5 @@ const Application = new Lang.Class({
 });
 
 function main(argv) {
-
-
     return (new Application()).run(argv);
 }
diff --git a/src/package.js b/src/package.js
index 6ae687a..3872695 100644
--- a/src/package.js
+++ b/src/package.js
@@ -301,10 +301,8 @@ function initResources() {
 }
 
 function launch(params) {
-    params.flags = params.flags || 0;
     let app = new Gio.Application({ application_id: "org.gnome.SoundRecorder",
-                                    flags: (Gio.ApplicationFlags.IS_LAUNCHER |
-                                            params.flags),
+                                    flags: Gio.ApplicationFlags.IS_LAUNCHER,
                                   });
     return app.run(ARGV);
 }