Merge lp:~amigadave/gnome-control-center-signon/optional-panel into lp:gnome-control-center-signon

[David King]

Make the GNOME Control Center support optional

This is helpful for other distributions, which do not patch the control center to allow the building of external panels. Plenty of build changes here, so needs some careful testing.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:121
http://s-jenkins:8080/job/online-accounts-gnome-control-center-ci/62/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/online-accounts-gnome-control-center-ci/./label=quantal/62/console

review: Needs Fixing (continuous-integration)

[Alberto Mardegan (mardy)]

Works like a charm!

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-07-05 06:12:29 +0000
+++ .bzrignore	2012-10-26 06:58:39 +0000
@@ -13,11 +13,14 @@
 /autom4te.cache
 /build-aux
 /aclocal.m4
-/cc-credentials-application
+/credentials-preferences
 /config.*
 /configure
 /credentials-lcov
 /credentials-lcov.info
+/data/com.canonical.webcredentials.capture.service
+/data/credentials-preferences.desktop
+/data/credentials-preferences.desktop.in
 /data/gnome-credentials-panel.desktop
 /data/gnome-credentials-panel.desktop.in
 /data/update-accounts.desktop

=== modified file 'Makefile.am'
--- Makefile.am	2012-09-26 06:37:40 +0000
+++ Makefile.am	2012-10-26 06:58:39 +0000
@@ -2,7 +2,8 @@
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-gtk-doc \
-	--enable-introspection=yes
+	--enable-introspection=yes \
+	--with-gnome-control-center
 
 # libaccount-plugin.
 lib_LTLIBRARIES = libaccount-plugin-@LIBACCOUNT_PLUGIN_API_VERSION@.la
@@ -41,8 +42,10 @@
 # Credentials control center applet.
 cappletname = credentials
 
-ccpanelsdir = $(libdir)/control-center-1/panels
+if WITH_GNOME_CONTROL_CENTER
+ccpanelsdir = $(CCPANELDIR)
 ccpanels_LTLIBRARIES = libcredentials.la
+endif
 
 common_cppflags = \
 	$(CREDENTIALS_PANEL_CFLAGS) \
@@ -94,19 +97,24 @@
 	-no-undefined \
 	-export-symbols-regex '^g_io_module_(load|unload)'
 
-noinst_PROGRAMS = cc-credentials-application
+if WITH_GNOME_CONTROL_CENTER
+noinst_PROGRAMS = credentials-preferences
+preferences_ldadd = libcredentials.la
+else
+bin_PROGRAMS = credentials-preferences
+endif
 
-cc_credentials_application_CPPFLAGS = \
+credentials_preferences_CPPFLAGS = \
 	$(common_cppflags)
 
-cc_credentials_application_SOURCES = \
+credentials_preferences_SOURCES = \
 	$(common_vala_sources) \
 	src/cc-credentials-application.vala
 
-cc_credentials_application_LDADD = \
+credentials_preferences_LDADD = \
 	$(CREDENTIALS_PANEL_LIBS) \
 	libaccount-plugin-@LIBACCOUNT_PLUGIN_API_VERSION@.la \
-	libcredentials.la
+	$(preferences_ldadd)
 
 # Account update tool for enabling new services
 libexec_PROGRAMS = update-accounts
@@ -337,17 +345,32 @@
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
+if WITH_GNOME_CONTROL_CENTER
 desktop_in_files = \
 	data/gnome-credentials-panel.desktop.in \
 	data/update-accounts.desktop.in
+else # !WITH_GNOME_CONTROL_CENTER
+desktop_in_files = \
+	data/credentials-preferences.desktop.in \
+	data/update-accounts.desktop.in
+endif
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 data/update-accounts.desktop: data/update-accounts.desktop.in
 	$(AM_V_GEN)$(SED) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
 
 dbus_servicedir = $(datadir)/dbus-1/services
-dist_dbus_service_DATA = \
-	data/com.canonical.webcredentials.capture.service
+dbus_service_in_files = data/com.canonical.webcredentials.capture.service.in
+dbus_service_DATA = $(dbus_service_in_files:.service.in=.service)
+
+if WITH_GNOME_CONTROL_CENTER
+service_executable = $(bindir)/gnome-control-center credentials
+else
+service_executable = $(bindir)/credentials-preferences
+endif
+
+data/com.canonical.webcredentials.capture.service: data/com.canonical.webcredentials.capture.service.in
+	$(AM_V_GEN)$(SED) -e "s|\@SERVICE_EXECUTABLE\@|$service_executable|" $< > $@
 
 iconthemedir = $(datadir)/icons/hicolor
 credentialsicon = credentials-preferences.png
@@ -415,6 +438,7 @@
 	autogen.sh
 
 dist_noinst_DATA = \
+	$(dbus_service_in_files) \
 	$(gtkdoc_srcdir)/account-plugin-docs.xml \
 	$(gtkdoc_srcdir)/account-plugin-sections.txt \
 	$(gtkdoc_srcdir)/version.xml.in \
@@ -429,6 +453,7 @@
 	src/signon.vapi
 
 CLEANFILES = \
+	$(dbus_service_DATA) \
 	$(desktop_in_files) \
 	$(desktop_DATA)
 

=== modified file 'configure.ac'
--- configure.ac	2012-10-17 12:58:21 +0000
+++ configure.ac	2012-10-26 06:58:39 +0000
@@ -1,8 +1,8 @@
 AC_INIT([Credentials Control Center],
         [0.0.20],
-        [https://bugs.launchpad.net/opensesame-gnome-control-center],
+        [https://bugs.launchpad.net/online-accounts-gnome-control-center],
         [credentials-control-center],
-        [https://launchpad.net/opensesame-gnome-control-center])
+        [https://launchpad.net/online-accounts-gnome-control-center])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/cc-credentials-panel.c])
@@ -40,13 +40,37 @@
 
 PKG_PROG_PKG_CONFIG([0.24])
 
-# Libraries
+# Libraries.
 LIBACCOUNTS_GLIB_REQUIRED="libaccounts-glib"
 LIBSIGNON_GLIB_REQUIRED="libsignon-glib >= 1.7"
 GLIB_REQUIRED="glib-2.0 gio-2.0 gio-unix-2.0 >= 2.29.5"
 GTK_REQUIRED="gtk+-3.0 >= 3.0.0"
 GNOME_CONTROL_CENTER_REQUIRED="libgnome-control-center"
 
+AC_ARG_VAR([control_center_extensiondir],
+  [Install control center panel to the given extension dir. Alternatively, get the installation path from pkg-config.])
+
+AC_ARG_WITH([gnome-control-center],
+  [AS_HELP_STRING([--without-gnome-control-center],
+    [Ignore the presence of gnome-control-center and disable it])])
+
+AS_IF([test "x$with_gnome_control_center" != "xno"],
+  [PKG_CHECK_EXISTS([$GNOME_CONTROL_CENTER_REQUIRED],
+    [have_gnome_control_center=yes],
+    [have_gnome_control_center=no])],
+  [have_gnome_control_center=no])
+
+AS_IF([test "x$have_gnome_control_center" = "xyes"],
+  [AS_IF([test -n "$control_center_extensiondir"],
+    [AC_SUBST([CCPANELDIR], [$control_center_extensiondir])],
+    [AC_SUBST([CCPANELDIR], [`$PKG_CONFIG --variable=extensiondir $GNOME_CONTROL_CENTER_REQUIRED`])])],
+  [GNOME_CONTROL_CENTER_REQUIRED=""
+   AS_IF([test "x$with_gnome_control_center" = "xyes"],
+    [AC_MSG_ERROR([gnome-control-center support requested but not found])])])
+
+AM_CONDITIONAL([WITH_GNOME_CONTROL_CENTER],
+  [test "x$have_gnome_control_center" = "xyes"])
+
 PKG_CHECK_MODULES([CREDENTIALS_PANEL],
   [$LIBACCOUNTS_GLIB_REQUIRED
    $LIBSIGNON_GLIB_REQUIRED
@@ -109,6 +133,7 @@
 
 AC_CONFIG_FILES([
 Makefile
+data/credentials-preferences.desktop.in
 data/gnome-credentials-panel.desktop.in
 data/update-accounts.desktop.in
 doc/account-plugin/Makefile

=== renamed file 'data/com.canonical.webcredentials.capture.service' => 'data/com.canonical.webcredentials.capture.service.in'
--- data/com.canonical.webcredentials.capture.service	2012-05-31 08:04:51 +0000
+++ data/com.canonical.webcredentials.capture.service.in	2012-10-26 06:58:39 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.canonical.webcredentials.capture
-Exec=/usr/bin/gnome-control-center credentials
+Exec=@SERVICE_EXECUTABLE@

=== added file 'data/credentials-preferences.desktop.in.in'
--- data/credentials-preferences.desktop.in.in	1970-01-01 00:00:00 +0000
+++ data/credentials-preferences.desktop.in.in	2012-10-26 06:58:39 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_Name=Online Accounts
+_Comment=Online account credentials and settings
+Exec=credentials-preferences
+Icon=credentials-preferences
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-03-05 18:43:20 +0000
+++ po/POTFILES.in	2012-10-26 06:58:39 +0000
@@ -1,3 +1,4 @@
+data/credentials-preferences.desktop.in.in
 data/gnome-credentials-panel.desktop.in.in
 src/cc-credentials-account-details-page.vala
 src/cc-credentials-accounts-model.vala

=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2012-03-15 10:54:25 +0000
+++ po/POTFILES.skip	2012-10-26 06:58:39 +0000
@@ -1,3 +1,4 @@
+data/credentials-preferences.desktop.in
 data/gnome-credentials-panel.desktop.in
 src/cc-credentials-account-details-page.c
 src/cc-credentials-accounts-model.c