[gnome-photos] Use a single-binary setup for DBus activation

[Debarshi Ray <debarshir src gnome org>]

commit 5d91f52ce909c5a28e9d9a1f32020788f6b0801f
Author: Debarshi Ray <debarshir gnome org>
Date:   Thu Mar 20 20:36:34 2014 +0100

    Use a single-binary setup for DBus activation
    
    Bump minimum GLib version to 2.39.3.
    
    Fixes: https://bugzilla.gnome.org/726791

 configure.ac                     |    2 +-
 data/Makefile.am                 |    2 +-
 data/org.gnome.Photos.service.in |    2 +-
 src/Makefile.am                  |   18 ++++++++----------
 src/gnome-photos                 |    3 ---
 src/photos-application.c         |    1 -
 6 files changed, 11 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 28c2951..dd5e936 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ GLIB_GSETTINGS
 
 EXEMPI_MIN_VERSION=1.99.5
 GFBGRAPH_MIN_VERSION=0.2.1
-GLIB_MIN_VERSION=2.35.1
+GLIB_MIN_VERSION=2.39.3
 GOA_MIN_VERSION=3.8.0
 GRILO_MIN_VERSION=0.2.6
 GTK_MIN_VERSION=3.11.5
diff --git a/data/Makefile.am b/data/Makefile.am
index 3caac18..f6f5087 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -57,6 +57,6 @@ check-local: desktop-file-validate
 org.gnome.Photos.service: org.gnome.Photos.service.in
        $(AM_V_GEN)     \
                [ -d $(@D) ] || $(mkdir_p) $(@D) ; \
-               sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $  tmp && mv $  tmp $@
+               sed -e "s|\ bindir\@|$(bindir)|" $< > $  tmp && mv $  tmp $@
 
 -include $(top_srcdir)/git.mk
diff --git a/data/org.gnome.Photos.service.in b/data/org.gnome.Photos.service.in
index 5d9d881..2cf0403 100644
--- a/data/org.gnome.Photos.service.in
+++ b/data/org.gnome.Photos.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.gnome.Photos
-Exec= libexecdir@/gnome-photos-service
+Exec= bindir@/gnome-photos --gapplication-service
diff --git a/src/Makefile.am b/src/Makefile.am
index 32b0d60..8ca30ca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,6 @@
-dist_bin_SCRIPTS = gnome-photos
+bin_PROGRAMS = gnome-photos
 
-libexec_PROGRAMS = gnome-photos-service
-
-gnome_photos_service_built_sources = \
+gnome_photos_built_sources = \
        gegl-gtk-enums.c \
        gegl-gtk-marshal.c \
        gegl-gtk-marshal.h \
@@ -30,11 +28,11 @@ gnome_photos_service_built_sources = \
        photos-tracker-resources.h \
        $(NULL)
 
-nodist_gnome_photos_service_SOURCES = \
-       $(gnome_photos_service_built_sources) \
+nodist_gnome_photos_SOURCES = \
+       $(gnome_photos_built_sources) \
        $(NULL)
 
-gnome_photos_service_SOURCES = \
+gnome_photos_SOURCES = \
        eog-debug.c \
        eog-debug.h \
        eog-enums.h \
@@ -235,7 +233,7 @@ gnome_photos_service_SOURCES = \
        $(NULL)
 
 BUILT_SOURCES = \
-       $(gnome_photos_service_built_sources) \
+       $(gnome_photos_built_sources) \
        $(NULL)
 
 EXTRA_DIST = \
@@ -282,9 +280,9 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/libgd \
        $(NULL)
 
-gnome_photos_service_LDFLAGS = 
+gnome_photos_LDFLAGS =
 
-gnome_photos_service_LDADD = \
+gnome_photos_LDADD = \
        $(BABL_LIBS) \
        $(CAIRO_LIBS) \
        $(EXEMPI_LIBS) \
diff --git a/src/photos-application.c b/src/photos-application.c
index 1a90d34..9ed6d88 100644
--- a/src/photos-application.c
+++ b/src/photos-application.c
@@ -883,7 +883,6 @@ photos_application_new (void)
 {
   return g_object_new (PHOTOS_TYPE_APPLICATION,
                        "application-id", "org.gnome." PACKAGE_NAME,
-                       "flags", G_APPLICATION_IS_SERVICE,
                        NULL);
 }