Merging trunk

20 files changed, 90 insertions, 132 deletions

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
new file mode 100644
index 0000000..d52d388
--- /dev/null
+++ b/data/CMakeLists.txt
@@ -0,0 +1,74 @@
+include (UseGSettings)
+
+##
+##  GSettings schema
+##
+
+set (SCHEMA_NAME "com.canonical.indicator.session.gschema.xml")
+set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
+set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in")
+
+# generate the .xml file using intltool
+set (ENV{LC_ALL} "C") 
+execute_process (COMMAND intltool-merge -quiet --xml-style --utf8 --no-translations "${SCHEMA_FILE_IN}" "${SCHEMA_FILE}")
+
+# let UseGSettings do the rest
+add_schema (${SCHEMA_FILE})
+
+
+##
+##  Upstart Config File
+##
+
+# where to install
+set (UPSTART_JOB_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/sessions")
+message (STATUS "${UPSTART_JOB_DIR} is the Upstart Job install dir")
+
+set (UPSTART_JOB_NAME "${CMAKE_PROJECT_NAME}.conf")
+set (UPSTART_JOB_FILE "${CMAKE_CURRENT_BINARY_DIR}/${UPSTART_JOB_NAME}")
+set (UPSTART_JOB_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${UPSTART_JOB_NAME}.in")
+
+# build it
+set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
+configure_file ("${UPSTART_JOB_FILE_IN}" "${UPSTART_JOB_FILE}")
+
+# install it
+install (FILES "${UPSTART_JOB_FILE}"
+         DESTINATION "${UPSTART_JOB_DIR}")
+
+
+##
+##  Unity Indicator File
+##
+
+# where to install
+set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/unity/indicators")
+message (STATUS "${UNITY_INDICATOR_DIR} is the Unity Indicator install dir")
+
+set (UNITY_INDICATOR_NAME "com.canonical.indicator.session")
+set (UNITY_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}")
+
+install (FILES "${UNITY_INDICATOR_FILE}"
+         DESTINATION "${UNITY_INDICATOR_DIR}")
+
+
+##
+##  Icons
+##
+
+# where to install
+set (ICON_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/icons/hicolor")
+message (STATUS "${ICON_DIR} is the Icon install dir")
+
+install (DIRECTORY icons
+         icons/16x16
+         icons/22x22
+         icons/24x24
+         icons/32x32
+         icons/scalable
+         DESTINATION "${ICON_DIR}"
+         FILES_MATCHING PATTERN "*.png" PATTERN "*.svg")
+
+install(CODE "execute_process (COMMAND gtk-update-icon-cache -t -f ${ICON_DIR})"
+        CODE "message (STATUS \"Updating icon cache\")")
+
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index a1a1c3b..0000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-SUBDIRS = \
-	icons \
-	extra-sessions
-
-upstart_jobsdir = $(datadir)/upstart/sessions/
-upstart_jobs_in_files = indicator-session.conf.in
-upstart_jobs_DATA = $(upstart_jobs_in_files:.conf.in=.conf)
-
-%.conf: %.conf.in
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-@INTLTOOL_SCHEMAS_RULE@
-@INTLTOOL_XML_NOMERGE_RULE@
-
-@GSETTINGS_RULES@
-gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml
-
-convertdir = $(datadir)/GConf/gsettings
-dist_convert_DATA = indicator-session.convert
-
-EXTRA_DIST =					\
-	$(upstart_jobs_in_files)	\
-	$(gsettings_SCHEMAS:.xml=.xml.in)
-
-CLEANFILES =					\
-	$(upstart_jobs_DATA)		\
-	$(gsettings_SCHEMAS)
diff --git a/data/com.canonical.indicator.session b/data/com.canonical.indicator.session
new file mode 100644
index 0000000..7b1b39e
--- /dev/null
+++ b/data/com.canonical.indicator.session
@@ -0,0 +1,11 @@
+[Indicator Service]
+Name=indicator-session
+ObjectPath=/com/canonical/indicator/session
+Position=10
+
+[desktop]
+ObjectPath=/com/canonical/indicator/session/desktop
+
+[desktop_greeter]
+ObjectPath=/com/canonical/indicator/session/desktop_greeter
+
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
deleted file mode 100644
index c163076..0000000
--- a/data/icons/16x16/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = actions status
diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am
deleted file mode 100644
index 5aa276c..0000000
--- a/data/icons/16x16/actions/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/actions
-
-icons_DATA =  \
-	system-shutdown.png		\
-	system-restart.png		\
-	system-log-out.png
-
-EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am
deleted file mode 100644
index c0af60e..0000000
--- a/data/icons/16x16/status/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status
-
-icons_DATA =  \
-	account-logged-in.png
-
-EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
deleted file mode 100644
index c163076..0000000
--- a/data/icons/22x22/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = actions status
diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am
deleted file mode 100644
index 73cdd09..0000000
--- a/data/icons/22x22/actions/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/actions
-
-icons_DATA =  \
-	system-shutdown.png		\
-	system-restart.png		\
-	system-log-out.png
-
-EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am
deleted file mode 100644
index 1ce0fa1..0000000
--- a/data/icons/22x22/status/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/status
-
-icons_DATA =  \
-	account-logged-in.png
-
-EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
deleted file mode 100644
index c163076..0000000
--- a/data/icons/24x24/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = actions status
diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am
deleted file mode 100644
index 55c63d1..0000000
--- a/data/icons/24x24/actions/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/actions
-
-icons_DATA =  \
-	system-shutdown.png		\
-	system-restart.png		\
-	system-log-out.png
-
-EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am
deleted file mode 100644
index 4fa065a..0000000
--- a/data/icons/24x24/status/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/status
-
-icons_DATA =  \
-	account-logged-in.png
-
-EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
deleted file mode 100644
index c163076..0000000
--- a/data/icons/32x32/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = actions status
diff --git a/data/icons/32x32/actions/Makefile.am b/data/icons/32x32/actions/Makefile.am
deleted file mode 100644
index 74c2c8d..0000000
--- a/data/icons/32x32/actions/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/actions
-
-icons_DATA =  \
-	system-restart.png		\
-	system-log-out.png
-
-EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am
deleted file mode 100644
index b852725..0000000
--- a/data/icons/32x32/status/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/status
-
-icons_DATA =  \
-	account-logged-in.png
-
-EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
deleted file mode 100644
index 7394c73..0000000
--- a/data/icons/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-SUBDIRS = scalable 16x16 22x22 24x24 32x32
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(INDICATORICONSDIR)/hicolor
-
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
-
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
deleted file mode 100644
index c163076..0000000
--- a/data/icons/scalable/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = actions status
diff --git a/data/icons/scalable/actions/Makefile.am b/data/icons/scalable/actions/Makefile.am
deleted file mode 100644
index 39b4177..0000000
--- a/data/icons/scalable/actions/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/actions
-
-icons_DATA =  \
-	system-restart.svg \
-	system-log-out.svg \
-	system-shutdown.svg
-
-EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am
deleted file mode 100644
index cb006e2..0000000
--- a/data/icons/scalable/status/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status
-
-icons_DATA =  \
-	account-logged-in.svg
-
-EXTRA_DIST = $(icons_DATA)
diff --git a/data/indicator-session.conf.in b/data/indicator-session.conf.in
index 3a512df..d5c4c8c 100644
--- a/data/indicator-session.conf.in
+++ b/data/indicator-session.conf.in
@@ -1,15 +1,14 @@
 description "Indicator Session Service"
-author "Ted Gould <ted@canonical.com>"
 
-# NOTE: Limiting only to Unity 7 right now as it's still using
-# dbusmenu.  That can be lifted after it is ported to GMenu
+# NOTE: Limiting only to Unity 7 right now as it's only needed
+# on the desktop
 
-start on indicators-loaded and xsession SESSION=ubuntu
-stop on desktop-end
+start on (indicators-loaded or indicator-services-start) and xsession SESSION=ubuntu
+stop on desktop-end or indicator-services-end
 
 env G_MESSAGES_DEBUG=all
 export G_MESSAGES_DEBUG
 
 respawn
 
-exec @libexecdir@/indicator-session-service
+exec @pkglibexecdir@/indicator-session-service