Merge lp:~robert-ancell/gnome-control-center-signon/unity-control-center into lp:gnome-control-center-signon

[Robert Ancell]

Use unity-control-center instead of gnome-control-center

[Alberto Mardegan (mardy)]

LGTM, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:174
http://jenkins.qa.ubuntu.com/job/gnome-control-center-signon-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gnome-control-center-signon-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gnome-control-center-signon-trusty-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/gnome-control-center-signon-trusty-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gnome-control-center-signon-ci/18/rebuild

review: Approve (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2013-06-17 11:15:46 +0000
+++ .bzrignore	2014-02-06 10:26:03 +0000
@@ -24,16 +24,16 @@
 /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/unity-credentials-panel.desktop
+/data/unity-credentials-panel.desktop.in
 /data/update-accounts.desktop
 /data/update-accounts.desktop.in
 /debian/autoreconf.after
 /debian/autoreconf.before
 /debian/files
 /debian/gir1.2-accountplugin-1.0/
-/debian/gnome-control-center-signon/
-/debian/gnome-control-center-signon-autopilot/
+/debian/unity-control-center-signon/
+/debian/unity-control-center-signon-autopilot/
 /debian/libaccount-plugin-1.0-0/
 /debian/libaccount-plugin-1.0-dev/
 /debian/libaccount-plugin-1.0-doc/
 
=== modified file 'Makefile.am'
--- Makefile.am	2013-06-05 09:01:13 +0000
+++ Makefile.am	2014-02-06 10:26:03 +0000
@@ -3,7 +3,7 @@
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-gtk-doc \
 	--enable-introspection=yes \
-	--with-gnome-control-center
+	--with-unity-control-center
 
 # libaccount-plugin.
 lib_LTLIBRARIES = libaccount-plugin-@LIBACCOUNT_PLUGIN_API_VERSION@.la
@@ -42,7 +42,7 @@
 # Credentials control center applet.
 cappletname = credentials
 
-if WITH_GNOME_CONTROL_CENTER
+if WITH_UNITY_CONTROL_CENTER
 ccpanelsdir = $(CCPANELDIR)
 ccpanels_LTLIBRARIES = libcredentials.la
 endif
@@ -101,7 +101,7 @@
 bin_PROGRAMS = credentials-preferences
 else !ENABLE_STANDALONE_PREFERENCES
 noinst_PROGRAMS = credentials-preferences
-if WITH_GNOME_CONTROL_CENTER
+if WITH_UNITY_CONTROL_CENTER
 preferences_ldadd = libcredentials.la
 endif
 endif
@@ -170,12 +170,12 @@
 	tests/test-control-center.sh
 endif
 
-if WITH_GNOME_CONTROL_CENTER
+if WITH_UNITY_CONTROL_CENTER
 tests_ldadd = \
 	$(CREDENTIALS_PANEL_LIBS) \
 	libaccount-plugin-@LIBACCOUNT_PLUGIN_API_VERSION@.la \
 	libcredentials.la
-else !WITH_GNOME_CONTROL_CENTER
+else !WITH_UNITY_CONTROL_CENTER
 tests_ldadd = \
 	$(CREDENTIALS_PANEL_LIBS) \
 	libaccount-plugin-@LIBACCOUNT_PLUGIN_API_VERSION@.la
@@ -382,18 +382,18 @@
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
-if WITH_GNOME_CONTROL_CENTER
+if WITH_UNITY_CONTROL_CENTER
 if ENABLE_STANDALONE_PREFERENCES
 desktop_in_files = \
 	data/credentials-preferences.desktop.in \
-	data/gnome-credentials-panel.desktop.in \
+	data/unity-credentials-panel.desktop.in \
 	data/update-accounts.desktop.in
 else !ENABLE_STANDALONE_PREFERENCES
 desktop_in_files = \
-	data/gnome-credentials-panel.desktop.in \
+	data/unity-credentials-panel.desktop.in \
 	data/update-accounts.desktop.in
 endif
-else !WITH_GNOME_CONTROL_CENTER
+else !WITH_UNITY_CONTROL_CENTER
 if ENABLE_STANDALONE_PREFERENCES
 desktop_in_files = \
 	data/credentials-preferences.desktop.in \
 
=== modified file 'README'
--- README	2012-10-25 13:36:35 +0000
+++ README	2014-02-06 10:26:03 +0000
@@ -2,10 +2,9 @@
 ------------------------------------------
 
 This project is a configuration interface for the Online Accounts framework in
-Ubuntu. It uses the patched GNOME Control Center in Ubuntu, with support for
-external configuration panels, to show Online Accounts settings in the Control
-Center. Alternatively, a standalone credentials-preferences binary can be
-built, which allows distributions without the patched Control Center to use the
+Ubuntu. Under Unity, it appears as a panel in the Unity Control Center.
+Alternatively, a standalone credentials-preferences binary can be built, which
+allows distributions without the Unity Control Center to use the
 configuration UI.
 
 libaccount-plugin
@@ -34,4 +33,4 @@
 Resources
 ---------
 
-https://launchpad.net/online-accounts-gnome-control-center
+https://launchpad.net/gnome-control-center-signon
 
=== modified file 'configure.ac'
--- configure.ac	2013-06-05 10:46:16 +0000
+++ configure.ac	2014-02-06 10:26:03 +0000
@@ -1,8 +1,8 @@
 AC_INIT([Credentials Control Center],
         [0.1.7],
-        [https://bugs.launchpad.net/online-accounts-gnome-control-center],
+        [https://bugs.launchpad.net/gnome-control-center-signon],
         [credentials-control-center],
-        [https://launchpad.net/online-accounts-gnome-control-center])
+        [https://launchpad.net/gnome-control-center-signon])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/cc-credentials-panel.c])
@@ -46,31 +46,31 @@
 GLIB_REQUIRED="glib-2.0 gio-2.0 gio-unix-2.0 >= 2.29.5"
 GMODULE_REQUIRED="gmodule-2.0"
 GTK_REQUIRED="gtk+-3.0 >= 3.0.0"
-GNOME_CONTROL_CENTER_REQUIRED="libgnome-control-center"
+UNITY_CONTROL_CENTER_REQUIRED="libunity-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"],
+AC_ARG_WITH([unity-control-center],
+  [AS_HELP_STRING([--without-unity-control-center],
+    [Ignore the presence of unity-control-center and disable it])])
+
+AS_IF([test "x$with_unity_control_center" != "xno"],
+  [PKG_CHECK_EXISTS([$UNITY_CONTROL_CENTER_REQUIRED],
+    [have_unity_control_center=yes],
+    [have_unity_control_center=no])],
+  [have_unity_control_center=no])
+
+AS_IF([test "x$have_unity_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])])])
+    [AC_SUBST([CCPANELDIR], [`$PKG_CONFIG --variable=extensiondir $UNITY_CONTROL_CENTER_REQUIRED`])])],
+  [UNITY_CONTROL_CENTER_REQUIRED=""
+   AS_IF([test "x$with_unity_control_center" = "xyes"],
+    [AC_MSG_ERROR([unity-control-center support requested but not found])])])
 
-AM_CONDITIONAL([WITH_GNOME_CONTROL_CENTER],
-  [test "x$have_gnome_control_center" = "xyes"])
+AM_CONDITIONAL([WITH_UNITY_CONTROL_CENTER],
+  [test "x$have_unity_control_center" = "xyes"])
 
 # Standalone preferences binary.
 AC_ARG_ENABLE([standalone-preferences],
@@ -85,15 +85,15 @@
   [test "x$have_standalone_preferences" = "xyes"])
 
 AS_IF([test "x$have_standalone_preferences" = "xno" -a \
-   "x$have_gnome_control_center" = "xno"],
-  [AC_MSG_WARN([Both the standalone preferences panel and the gnome-control-center panel are disabled. Only libaccount-plugin will be built.])])
+   "x$have_unity_control_center" = "xno"],
+  [AC_MSG_WARN([Both the standalone preferences panel and the unity-control-center panel are disabled. Only libaccount-plugin will be built.])])
 
 PKG_CHECK_MODULES([CREDENTIALS_PANEL],
   [$LIBACCOUNTS_GLIB_REQUIRED
    $LIBSIGNON_GLIB_REQUIRED
    $GLIB_REQUIRED
    $GTK_REQUIRED
-   $GNOME_CONTROL_CENTER_REQUIRED])
+   $UNITY_CONTROL_CENTER_REQUIRED])
 
 # libaccount-plugin variables.
 AC_SUBST([LIBACCOUNT_PLUGIN_SO_VERSION], [0:0:0])
@@ -157,7 +157,7 @@
 AC_CONFIG_FILES([
 Makefile
 data/credentials-preferences.desktop.in
-data/gnome-credentials-panel.desktop.in
+data/unity-credentials-panel.desktop.in
 data/update-accounts.desktop.in
 doc/account-plugin/Makefile
 doc/account-plugin/version.xml
 
=== renamed file 'data/gnome-credentials-panel.desktop.in.in' => 'data/unity-credentials-panel.desktop.in.in'
--- data/gnome-credentials-panel.desktop.in.in	2013-02-21 12:18:27 +0000
+++ data/unity-credentials-panel.desktop.in.in	2014-02-06 10:26:03 +0000
@@ -1,10 +1,11 @@
 [Desktop Entry]
 _Name=Online Accounts
 _Comment=Online account credentials and settings
-Exec=gnome-control-center credentials
+Exec=unity-control-center credentials
 Icon=credentials-preferences
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;
-X-GNOME-Settings-Panel=credentials
+Categories=GNOME;GTK;Settings;DesktopSettings;X-Unity-Settings-Panel;X-GNOME-PersonalSettings;
+OnlyShowIn=Unity;
+X-Unity-Settings-Panel=credentials
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-11-26 19:09:04 +0000
+++ debian/changelog	2014-02-06 10:26:03 +0000
@@ -1,3 +1,9 @@
+gnome-control-center-signon (0.1.7~+14.04.20131126.2-0ubuntu1+unity) UNRELEASED; urgency=low
+
+  * Use unity-control-center instead of gnome-control-center
+
+ -- Robert Ancell <[e-mail]>  Mon, 02 Dec 2013 16:15:41 +1300
+
 gnome-control-center-signon (0.1.7~+14.04.20131126.2-0ubuntu1) trusty; urgency=low
 
   [ Ken VanDine ]
 
=== modified file 'debian/control'
--- debian/control	2013-11-25 15:08:23 +0000
+++ debian/control	2014-02-06 10:26:03 +0000
@@ -13,9 +13,9 @@
                gtk-doc-tools,
                libaccounts-glib-dev (>= 1.10),
                libgirepository1.0-dev (>= 0.10),
-               libgnome-control-center-dev,
                libgtk-3-dev,
                libsignon-glib-dev (>= 1.8),
+               libunity-control-center-dev,
                pkg-config,
                python,
                python-distutils-extra,
@@ -29,9 +29,9 @@
 # just go ahead.  ~online-accounts will notice and sync up the code again.
 Vcs-Bzr: https://code.launchpad.net/~online-accounts/gnome-control-center-signon/trunk
 
-Package: gnome-control-center-signon
+Package: unity-control-center-signon
 Architecture: i386 amd64 armhf arm64
-Depends: gnome-control-center (>= 3.4.2-0ubuntu10),
+Depends: unity-control-center,
          libaccount-plugin-1.0-0 (= ${binary:Version}),
          libaccount-plugin-generic-oauth, 
          libaccount-plugin-google,
@@ -39,8 +39,10 @@
          signond,
          ${misc:Depends},
          ${shlibs:Depends},
-Description: GNOME Control Center extension for single signon
- GNOME Control Center extension for single signon
+Conflicts: gnome-control-center-signon
+Replaces: gnome-control-center-signon
+Description: Unity Control Center extension for single signon
+ Unity Control Center extension for single signon
 
 Package: libaccount-plugin-1.0-0
 Section: libs
@@ -49,9 +51,9 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          signond
-Recommends: gnome-control-center-signon
-Description: libaccount-plugin for GNOME Control Center
- GNOME Control Center library for libaccounts
+Recommends: unity-control-center-signon
+Description: libaccount-plugin for Unity Control Center
+ Unity Control Center library for libaccounts
 
 Package: libaccount-plugin-1.0-dev
 Section: libdevel
@@ -64,8 +66,8 @@
          libsignon-glib-dev (>= 1.8),
          ${misc:Depends},
          ${shlibs:Depends},
-Description: libaccount-plugin for GNOME Control Center - devel
- GNOME Control Center library for libaccounts - devel
+Description: libaccount-plugin for Unity Control Center - devel
+ Unity Control Center library for libaccounts - devel
 
 Package: gir1.2-accountplugin-1.0
 Section: introspection
@@ -82,15 +84,15 @@
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Description: libaccount-plugin for GNOME Control Center - Developer Docs
+Description: libaccount-plugin for Unity Control Center - Developer Docs
  .
  This package provides the developer documentation for the libaccount-plugin
  library.
 
-Package: gnome-control-center-signon-autopilot
+Package: unity-control-center-signon-autopilot
 Architecture: all
 Depends: autopilot-desktop (>= 1.4),
-         gnome-control-center-signon (= ${source:Version}),
+         unity-control-center-signon (= ${source:Version}),
          uoa-integration-tests,
          ${misc:Depends},
 Description: Test package for Ubuntu Online Accounts - Desktop
 
=== modified file 'debian/copyright'
--- debian/copyright	2012-11-14 16:12:55 +0000
+++ debian/copyright	2014-02-06 10:26:03 +0000
@@ -1,7 +1,7 @@
 Format: http://dep.debian.net/deps/dep5
-Upstream-Name: online-accounts-gnome-control-center
+Upstream-Name: gnome-control-center-signon
 Upstream-Contact: Alberto Mardegan <[e-mail]>
-Source: https://launchpad.net/online-accounts-gnome-control-center
+Source: https://launchpad.net/gnome-control-center-signon
 
 Files: *
 Copyright: 2012 Canonical Ltd.
 
=== renamed file 'debian/gnome-control-center-signon-autopilot.install' => 'debian/unity-control-center-signon-autopilot.install'
=== renamed file 'debian/gnome-control-center-signon.install' => 'debian/unity-control-center-signon.install'
--- debian/gnome-control-center-signon.install	2013-07-08 22:49:20 +0000
+++ debian/unity-control-center-signon.install	2014-02-06 10:26:03 +0000
@@ -1,7 +1,7 @@
 usr/bin/online-accounts-preferences
 usr/bin/credentials-preferences
 usr/lib/*/update-accounts
-usr/lib/*/control-center-1/panels/*.so
+usr/lib/*/unity-control-center-1/panels/*.so
 usr/share/applications
 usr/share/dbus-1/services/com.canonical.webcredentials.capture.service
 usr/share/help
 
=== modified file 'libaccount-plugin/application-plugin.c'
--- libaccount-plugin/application-plugin.c	2012-05-15 06:38:01 +0000
+++ libaccount-plugin/application-plugin.c	2014-02-06 10:26:03 +0000
@@ -25,7 +25,7 @@
  * @short_description: Base class for application plugins.
  * @include: libaccount-plugin/application-plugin.h
  *
- * Application plugins for the credentials panel of the GNOME control center
+ * Application plugins for the credentials panel of the Unity control center
  * need to subclass #ApApplicationPlugin and implement its build_widget()
  * virtual method.
  * This method will be called by the credentials panel when it needs to show a
 
=== modified file 'libaccount-plugin/plugin.c'
--- libaccount-plugin/plugin.c	2013-03-22 10:37:14 +0000
+++ libaccount-plugin/plugin.c	2014-02-06 10:26:03 +0000
@@ -25,7 +25,7 @@
  * @short_description: Base class for account plugins.
  * @include: libaccount-plugin/plugin.h
  *
- * Account plugins for the credentials panel of the GNOME control center need
+ * Account plugins for the credentials panel of the Unity control center need
  * to subclass #ApPlugin and implement its build_widget() virtual method.
  * This method will be called by the credentials panel when it needs to show a
  * UI to handle some operations on the account, such as creation, editing or
 
=== modified file 'online-accounts-preferences.in'
--- online-accounts-preferences.in	2012-11-21 15:08:53 +0000
+++ online-accounts-preferences.in	2014-02-06 10:26:03 +0000
@@ -1,8 +1,8 @@
 #!/bin/sh -e
 
-if test @DESKTOPDIR@/gnome-credentials-panel.desktop
+if test @DESKTOPDIR@/unity-credentials-panel.desktop
 then
-    gnome-control-center credentials $@
+    unity-control-center credentials $@
 else
     credentials-preferences $@
 fi
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-10-23 06:45:16 +0000
+++ po/POTFILES.in	2014-02-06 10:26:03 +0000
@@ -1,5 +1,5 @@
 data/credentials-preferences.desktop.in.in
-data/gnome-credentials-panel.desktop.in.in
+data/unity-credentials-panel.desktop.in.in
 src/cc-credentials-account-details-page.vala
 src/cc-credentials-accounts-model.vala
 src/cc-credentials-accounts-page.vala
 
=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2012-10-25 10:35:47 +0000
+++ po/POTFILES.skip	2014-02-06 10:26:03 +0000
@@ -1,5 +1,5 @@
 data/credentials-preferences.desktop.in
-data/gnome-credentials-panel.desktop.in
+data/unity-credentials-panel.desktop.in
 src/cc-credentials-account-details-page.c
 src/cc-credentials-accounts-model.c
 src/cc-credentials-accounts-page.c
 
=== modified file 'src/cc-credentials-application.vala'
--- src/cc-credentials-application.vala	2012-09-06 09:39:45 +0000
+++ src/cc-credentials-application.vala	2014-02-06 10:26:03 +0000
@@ -19,7 +19,7 @@
 
 /**
  * Standalone application for configuring web credentials accounts outside of
- * GNOME Control Center.
+ * Unity Control Center.
  */
 public class Cc.Credentials.Application : Gtk.Application
 {
 
=== modified file 'src/cc-credentials-panel.c'
--- src/cc-credentials-panel.c	2013-07-11 19:47:02 +0000
+++ src/cc-credentials-panel.c	2014-02-06 10:26:03 +0000
@@ -19,7 +19,7 @@
  */
 
 #include <gtk/gtk.h>
-#include <libgnome-control-center/cc-panel.h>
+#include <libunity-control-center/cc-panel.h>
 #include <glib/gi18n-lib.h>
 #include <stdlib.h>
 #include "config.h"
 
=== modified file 'src/cc-credentials-preferences.vala'
--- src/cc-credentials-preferences.vala	2012-08-31 12:39:57 +0000
+++ src/cc-credentials-preferences.vala	2014-02-06 10:26:03 +0000
@@ -18,7 +18,7 @@
  */
 
 /**
- * Web credentials preferences widget. This can be packed into the GNOME
+ * Web credentials preferences widget. This can be packed into the Unity
  * Control Center or used in a standalone application.
  */
 public class Cc.Credentials.Preferences : Gtk.Notebook
 
=== modified file 'tests/autopilot/setup.py'
--- tests/autopilot/setup.py	2013-05-03 17:58:21 +0000
+++ tests/autopilot/setup.py	2014-02-06 10:26:03 +0000
@@ -3,11 +3,11 @@
 from distutils.core import setup
 from DistUtilsExtra.command import build_extra
 
-setup(name="gnome-control-center-signon-autopilot",
+setup(name="unity-control-center-signon-autopilot",
       version="0.1",
       author="Alberto Mardegan",
       author_email="[e-mail]",
       url="http://launchpad.net/uoa-integration-tests",
       license="GNU General Public License v3 (GPLv3)",
-      packages=["gnome_control_center_signon"],
+      packages=["unity_control_center_signon"],
       cmdclass={"build": build_extra.build_extra,})
 
=== renamed directory 'tests/autopilot/gnome_control_center_signon' => 'tests/autopilot/unity_control_center_signon'
=== modified file 'tests/autopilot/unity_control_center_signon/test_control_center_signon.py'
--- tests/autopilot/gnome_control_center_signon/test_control_center_signon.py	2013-11-14 09:34:33 +0000
+++ tests/autopilot/unity_control_center_signon/test_control_center_signon.py	2014-02-06 10:26:03 +0000
@@ -81,7 +81,7 @@
 class ControlCenterTests(AutopilotTestCase):
     def setUp(self):
         super(ControlCenterTests, self).setUp()
-        self.app = self.launch_test_application('gnome-control-center', 'credentials', capture_output=True)
+        self.app = self.launch_test_application('unity-control-center', 'credentials', capture_output=True)
 
     def test_title(self):
         """ Checks whether the Online Accounts window title is correct """