Merge lp:~robert-ancell/gnome-control-center-signon/unity-control-center into lp:gnome-control-center-signon
- unity-control-center
- Merge into trunk
Proposed by
Robert Ancell
Status: | Merged |
---|---|
Approved by: | Alberto Mardegan |
Approved revision: | 174 |
Merged at revision: | 173 |
Proposed branch: | lp:~robert-ancell/gnome-control-center-signon/unity-control-center |
Merge into: | lp:gnome-control-center-signon |
Diff against target: |
488 lines (+81/-73) 19 files modified
.bzrignore (+4/-4) Makefile.am (+9/-9) README (+4/-5) configure.ac (+24/-24) data/unity-credentials-panel.desktop.in.in (+4/-3) debian/changelog (+6/-0) debian/control (+15/-13) debian/copyright (+2/-2) debian/unity-control-center-signon.install (+1/-1) libaccount-plugin/application-plugin.c (+1/-1) libaccount-plugin/plugin.c (+1/-1) online-accounts-preferences.in (+2/-2) po/POTFILES.in (+1/-1) po/POTFILES.skip (+1/-1) src/cc-credentials-application.vala (+1/-1) src/cc-credentials-panel.c (+1/-1) src/cc-credentials-preferences.vala (+1/-1) tests/autopilot/setup.py (+2/-2) tests/autopilot/unity_control_center_signon/test_control_center_signon.py (+1/-1) |
To merge this branch: | bzr merge lp:~robert-ancell/gnome-control-center-signon/unity-control-center |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Alberto Mardegan (community) | Approve | ||
Sebastien Bacher | Pending | ||
Review via email: mp+205110@code.launchpad.net |
Commit message
Use unity-control-
Description of the change
To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:174
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file '.bzrignore' |
2 | --- .bzrignore 2013-06-17 11:15:46 +0000 |
3 | +++ .bzrignore 2014-02-06 10:26:03 +0000 |
4 | @@ -24,16 +24,16 @@ |
5 | /data/com.canonical.webcredentials.capture.service |
6 | /data/credentials-preferences.desktop |
7 | /data/credentials-preferences.desktop.in |
8 | -/data/gnome-credentials-panel.desktop |
9 | -/data/gnome-credentials-panel.desktop.in |
10 | +/data/unity-credentials-panel.desktop |
11 | +/data/unity-credentials-panel.desktop.in |
12 | /data/update-accounts.desktop |
13 | /data/update-accounts.desktop.in |
14 | /debian/autoreconf.after |
15 | /debian/autoreconf.before |
16 | /debian/files |
17 | /debian/gir1.2-accountplugin-1.0/ |
18 | -/debian/gnome-control-center-signon/ |
19 | -/debian/gnome-control-center-signon-autopilot/ |
20 | +/debian/unity-control-center-signon/ |
21 | +/debian/unity-control-center-signon-autopilot/ |
22 | /debian/libaccount-plugin-1.0-0/ |
23 | /debian/libaccount-plugin-1.0-dev/ |
24 | /debian/libaccount-plugin-1.0-doc/ |
25 | |
26 | === modified file 'Makefile.am' |
27 | --- Makefile.am 2013-06-05 09:01:13 +0000 |
28 | +++ Makefile.am 2014-02-06 10:26:03 +0000 |
29 | @@ -3,7 +3,7 @@ |
30 | DISTCHECK_CONFIGURE_FLAGS = \ |
31 | --enable-gtk-doc \ |
32 | --enable-introspection=yes \ |
33 | - --with-gnome-control-center |
34 | + --with-unity-control-center |
35 | |
36 | # libaccount-plugin. |
37 | lib_LTLIBRARIES = libaccount-plugin-@LIBACCOUNT_PLUGIN_API_VERSION@.la |
38 | @@ -42,7 +42,7 @@ |
39 | # Credentials control center applet. |
40 | cappletname = credentials |
41 | |
42 | -if WITH_GNOME_CONTROL_CENTER |
43 | +if WITH_UNITY_CONTROL_CENTER |
44 | ccpanelsdir = $(CCPANELDIR) |
45 | ccpanels_LTLIBRARIES = libcredentials.la |
46 | endif |
47 | @@ -101,7 +101,7 @@ |
48 | bin_PROGRAMS = credentials-preferences |
49 | else !ENABLE_STANDALONE_PREFERENCES |
50 | noinst_PROGRAMS = credentials-preferences |
51 | -if WITH_GNOME_CONTROL_CENTER |
52 | +if WITH_UNITY_CONTROL_CENTER |
53 | preferences_ldadd = libcredentials.la |
54 | endif |
55 | endif |
56 | @@ -170,12 +170,12 @@ |
57 | tests/test-control-center.sh |
58 | endif |
59 | |
60 | -if WITH_GNOME_CONTROL_CENTER |
61 | +if WITH_UNITY_CONTROL_CENTER |
62 | tests_ldadd = \ |
63 | $(CREDENTIALS_PANEL_LIBS) \ |
64 | libaccount-plugin-@LIBACCOUNT_PLUGIN_API_VERSION@.la \ |
65 | libcredentials.la |
66 | -else !WITH_GNOME_CONTROL_CENTER |
67 | +else !WITH_UNITY_CONTROL_CENTER |
68 | tests_ldadd = \ |
69 | $(CREDENTIALS_PANEL_LIBS) \ |
70 | libaccount-plugin-@LIBACCOUNT_PLUGIN_API_VERSION@.la |
71 | @@ -382,18 +382,18 @@ |
72 | @INTLTOOL_DESKTOP_RULE@ |
73 | |
74 | desktopdir = $(datadir)/applications |
75 | -if WITH_GNOME_CONTROL_CENTER |
76 | +if WITH_UNITY_CONTROL_CENTER |
77 | if ENABLE_STANDALONE_PREFERENCES |
78 | desktop_in_files = \ |
79 | data/credentials-preferences.desktop.in \ |
80 | - data/gnome-credentials-panel.desktop.in \ |
81 | + data/unity-credentials-panel.desktop.in \ |
82 | data/update-accounts.desktop.in |
83 | else !ENABLE_STANDALONE_PREFERENCES |
84 | desktop_in_files = \ |
85 | - data/gnome-credentials-panel.desktop.in \ |
86 | + data/unity-credentials-panel.desktop.in \ |
87 | data/update-accounts.desktop.in |
88 | endif |
89 | -else !WITH_GNOME_CONTROL_CENTER |
90 | +else !WITH_UNITY_CONTROL_CENTER |
91 | if ENABLE_STANDALONE_PREFERENCES |
92 | desktop_in_files = \ |
93 | data/credentials-preferences.desktop.in \ |
94 | |
95 | === modified file 'README' |
96 | --- README 2012-10-25 13:36:35 +0000 |
97 | +++ README 2014-02-06 10:26:03 +0000 |
98 | @@ -2,10 +2,9 @@ |
99 | ------------------------------------------ |
100 | |
101 | This project is a configuration interface for the Online Accounts framework in |
102 | -Ubuntu. It uses the patched GNOME Control Center in Ubuntu, with support for |
103 | -external configuration panels, to show Online Accounts settings in the Control |
104 | -Center. Alternatively, a standalone credentials-preferences binary can be |
105 | -built, which allows distributions without the patched Control Center to use the |
106 | +Ubuntu. Under Unity, it appears as a panel in the Unity Control Center. |
107 | +Alternatively, a standalone credentials-preferences binary can be built, which |
108 | +allows distributions without the Unity Control Center to use the |
109 | configuration UI. |
110 | |
111 | libaccount-plugin |
112 | @@ -34,4 +33,4 @@ |
113 | Resources |
114 | --------- |
115 | |
116 | -https://launchpad.net/online-accounts-gnome-control-center |
117 | +https://launchpad.net/gnome-control-center-signon |
118 | |
119 | === modified file 'configure.ac' |
120 | --- configure.ac 2013-06-05 10:46:16 +0000 |
121 | +++ configure.ac 2014-02-06 10:26:03 +0000 |
122 | @@ -1,8 +1,8 @@ |
123 | AC_INIT([Credentials Control Center], |
124 | [0.1.7], |
125 | - [https://bugs.launchpad.net/online-accounts-gnome-control-center], |
126 | + [https://bugs.launchpad.net/gnome-control-center-signon], |
127 | [credentials-control-center], |
128 | - [https://launchpad.net/online-accounts-gnome-control-center]) |
129 | + [https://launchpad.net/gnome-control-center-signon]) |
130 | |
131 | AC_CONFIG_AUX_DIR([build-aux]) |
132 | AC_CONFIG_SRCDIR([src/cc-credentials-panel.c]) |
133 | @@ -46,31 +46,31 @@ |
134 | GLIB_REQUIRED="glib-2.0 gio-2.0 gio-unix-2.0 >= 2.29.5" |
135 | GMODULE_REQUIRED="gmodule-2.0" |
136 | GTK_REQUIRED="gtk+-3.0 >= 3.0.0" |
137 | -GNOME_CONTROL_CENTER_REQUIRED="libgnome-control-center" |
138 | +UNITY_CONTROL_CENTER_REQUIRED="libunity-control-center" |
139 | |
140 | AC_ARG_VAR([control_center_extensiondir], |
141 | [Install control center panel to the given extension dir. Alternatively, get the installation path from pkg-config.]) |
142 | |
143 | -AC_ARG_WITH([gnome-control-center], |
144 | - [AS_HELP_STRING([--without-gnome-control-center], |
145 | - [Ignore the presence of gnome-control-center and disable it])]) |
146 | - |
147 | -AS_IF([test "x$with_gnome_control_center" != "xno"], |
148 | - [PKG_CHECK_EXISTS([$GNOME_CONTROL_CENTER_REQUIRED], |
149 | - [have_gnome_control_center=yes], |
150 | - [have_gnome_control_center=no])], |
151 | - [have_gnome_control_center=no]) |
152 | - |
153 | -AS_IF([test "x$have_gnome_control_center" = "xyes"], |
154 | +AC_ARG_WITH([unity-control-center], |
155 | + [AS_HELP_STRING([--without-unity-control-center], |
156 | + [Ignore the presence of unity-control-center and disable it])]) |
157 | + |
158 | +AS_IF([test "x$with_unity_control_center" != "xno"], |
159 | + [PKG_CHECK_EXISTS([$UNITY_CONTROL_CENTER_REQUIRED], |
160 | + [have_unity_control_center=yes], |
161 | + [have_unity_control_center=no])], |
162 | + [have_unity_control_center=no]) |
163 | + |
164 | +AS_IF([test "x$have_unity_control_center" = "xyes"], |
165 | [AS_IF([test -n "$control_center_extensiondir"], |
166 | [AC_SUBST([CCPANELDIR], [$control_center_extensiondir])], |
167 | - [AC_SUBST([CCPANELDIR], [`$PKG_CONFIG --variable=extensiondir $GNOME_CONTROL_CENTER_REQUIRED`])])], |
168 | - [GNOME_CONTROL_CENTER_REQUIRED="" |
169 | - AS_IF([test "x$with_gnome_control_center" = "xyes"], |
170 | - [AC_MSG_ERROR([gnome-control-center support requested but not found])])]) |
171 | + [AC_SUBST([CCPANELDIR], [`$PKG_CONFIG --variable=extensiondir $UNITY_CONTROL_CENTER_REQUIRED`])])], |
172 | + [UNITY_CONTROL_CENTER_REQUIRED="" |
173 | + AS_IF([test "x$with_unity_control_center" = "xyes"], |
174 | + [AC_MSG_ERROR([unity-control-center support requested but not found])])]) |
175 | |
176 | -AM_CONDITIONAL([WITH_GNOME_CONTROL_CENTER], |
177 | - [test "x$have_gnome_control_center" = "xyes"]) |
178 | +AM_CONDITIONAL([WITH_UNITY_CONTROL_CENTER], |
179 | + [test "x$have_unity_control_center" = "xyes"]) |
180 | |
181 | # Standalone preferences binary. |
182 | AC_ARG_ENABLE([standalone-preferences], |
183 | @@ -85,15 +85,15 @@ |
184 | [test "x$have_standalone_preferences" = "xyes"]) |
185 | |
186 | AS_IF([test "x$have_standalone_preferences" = "xno" -a \ |
187 | - "x$have_gnome_control_center" = "xno"], |
188 | - [AC_MSG_WARN([Both the standalone preferences panel and the gnome-control-center panel are disabled. Only libaccount-plugin will be built.])]) |
189 | + "x$have_unity_control_center" = "xno"], |
190 | + [AC_MSG_WARN([Both the standalone preferences panel and the unity-control-center panel are disabled. Only libaccount-plugin will be built.])]) |
191 | |
192 | PKG_CHECK_MODULES([CREDENTIALS_PANEL], |
193 | [$LIBACCOUNTS_GLIB_REQUIRED |
194 | $LIBSIGNON_GLIB_REQUIRED |
195 | $GLIB_REQUIRED |
196 | $GTK_REQUIRED |
197 | - $GNOME_CONTROL_CENTER_REQUIRED]) |
198 | + $UNITY_CONTROL_CENTER_REQUIRED]) |
199 | |
200 | # libaccount-plugin variables. |
201 | AC_SUBST([LIBACCOUNT_PLUGIN_SO_VERSION], [0:0:0]) |
202 | @@ -157,7 +157,7 @@ |
203 | AC_CONFIG_FILES([ |
204 | Makefile |
205 | data/credentials-preferences.desktop.in |
206 | -data/gnome-credentials-panel.desktop.in |
207 | +data/unity-credentials-panel.desktop.in |
208 | data/update-accounts.desktop.in |
209 | doc/account-plugin/Makefile |
210 | doc/account-plugin/version.xml |
211 | |
212 | === renamed file 'data/gnome-credentials-panel.desktop.in.in' => 'data/unity-credentials-panel.desktop.in.in' |
213 | --- data/gnome-credentials-panel.desktop.in.in 2013-02-21 12:18:27 +0000 |
214 | +++ data/unity-credentials-panel.desktop.in.in 2014-02-06 10:26:03 +0000 |
215 | @@ -1,10 +1,11 @@ |
216 | [Desktop Entry] |
217 | _Name=Online Accounts |
218 | _Comment=Online account credentials and settings |
219 | -Exec=gnome-control-center credentials |
220 | +Exec=unity-control-center credentials |
221 | Icon=credentials-preferences |
222 | Terminal=false |
223 | Type=Application |
224 | StartupNotify=true |
225 | -Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings; |
226 | -X-GNOME-Settings-Panel=credentials |
227 | +Categories=GNOME;GTK;Settings;DesktopSettings;X-Unity-Settings-Panel;X-GNOME-PersonalSettings; |
228 | +OnlyShowIn=Unity; |
229 | +X-Unity-Settings-Panel=credentials |
230 | |
231 | === modified file 'debian/changelog' |
232 | --- debian/changelog 2013-11-26 19:09:04 +0000 |
233 | +++ debian/changelog 2014-02-06 10:26:03 +0000 |
234 | @@ -1,3 +1,9 @@ |
235 | +gnome-control-center-signon (0.1.7~+14.04.20131126.2-0ubuntu1+unity) UNRELEASED; urgency=low |
236 | + |
237 | + * Use unity-control-center instead of gnome-control-center |
238 | + |
239 | + -- Robert Ancell <robert.ancell@canonical.com> Mon, 02 Dec 2013 16:15:41 +1300 |
240 | + |
241 | gnome-control-center-signon (0.1.7~+14.04.20131126.2-0ubuntu1) trusty; urgency=low |
242 | |
243 | [ Ken VanDine ] |
244 | |
245 | === modified file 'debian/control' |
246 | --- debian/control 2013-11-25 15:08:23 +0000 |
247 | +++ debian/control 2014-02-06 10:26:03 +0000 |
248 | @@ -13,9 +13,9 @@ |
249 | gtk-doc-tools, |
250 | libaccounts-glib-dev (>= 1.10), |
251 | libgirepository1.0-dev (>= 0.10), |
252 | - libgnome-control-center-dev, |
253 | libgtk-3-dev, |
254 | libsignon-glib-dev (>= 1.8), |
255 | + libunity-control-center-dev, |
256 | pkg-config, |
257 | python, |
258 | python-distutils-extra, |
259 | @@ -29,9 +29,9 @@ |
260 | # just go ahead. ~online-accounts will notice and sync up the code again. |
261 | Vcs-Bzr: https://code.launchpad.net/~online-accounts/gnome-control-center-signon/trunk |
262 | |
263 | -Package: gnome-control-center-signon |
264 | +Package: unity-control-center-signon |
265 | Architecture: i386 amd64 armhf arm64 |
266 | -Depends: gnome-control-center (>= 3.4.2-0ubuntu10), |
267 | +Depends: unity-control-center, |
268 | libaccount-plugin-1.0-0 (= ${binary:Version}), |
269 | libaccount-plugin-generic-oauth, |
270 | libaccount-plugin-google, |
271 | @@ -39,8 +39,10 @@ |
272 | signond, |
273 | ${misc:Depends}, |
274 | ${shlibs:Depends}, |
275 | -Description: GNOME Control Center extension for single signon |
276 | - GNOME Control Center extension for single signon |
277 | +Conflicts: gnome-control-center-signon |
278 | +Replaces: gnome-control-center-signon |
279 | +Description: Unity Control Center extension for single signon |
280 | + Unity Control Center extension for single signon |
281 | |
282 | Package: libaccount-plugin-1.0-0 |
283 | Section: libs |
284 | @@ -49,9 +51,9 @@ |
285 | Depends: ${misc:Depends}, |
286 | ${shlibs:Depends}, |
287 | signond |
288 | -Recommends: gnome-control-center-signon |
289 | -Description: libaccount-plugin for GNOME Control Center |
290 | - GNOME Control Center library for libaccounts |
291 | +Recommends: unity-control-center-signon |
292 | +Description: libaccount-plugin for Unity Control Center |
293 | + Unity Control Center library for libaccounts |
294 | |
295 | Package: libaccount-plugin-1.0-dev |
296 | Section: libdevel |
297 | @@ -64,8 +66,8 @@ |
298 | libsignon-glib-dev (>= 1.8), |
299 | ${misc:Depends}, |
300 | ${shlibs:Depends}, |
301 | -Description: libaccount-plugin for GNOME Control Center - devel |
302 | - GNOME Control Center library for libaccounts - devel |
303 | +Description: libaccount-plugin for Unity Control Center - devel |
304 | + Unity Control Center library for libaccounts - devel |
305 | |
306 | Package: gir1.2-accountplugin-1.0 |
307 | Section: introspection |
308 | @@ -82,15 +84,15 @@ |
309 | Section: doc |
310 | Architecture: all |
311 | Depends: ${misc:Depends} |
312 | -Description: libaccount-plugin for GNOME Control Center - Developer Docs |
313 | +Description: libaccount-plugin for Unity Control Center - Developer Docs |
314 | . |
315 | This package provides the developer documentation for the libaccount-plugin |
316 | library. |
317 | |
318 | -Package: gnome-control-center-signon-autopilot |
319 | +Package: unity-control-center-signon-autopilot |
320 | Architecture: all |
321 | Depends: autopilot-desktop (>= 1.4), |
322 | - gnome-control-center-signon (= ${source:Version}), |
323 | + unity-control-center-signon (= ${source:Version}), |
324 | uoa-integration-tests, |
325 | ${misc:Depends}, |
326 | Description: Test package for Ubuntu Online Accounts - Desktop |
327 | |
328 | === modified file 'debian/copyright' |
329 | --- debian/copyright 2012-11-14 16:12:55 +0000 |
330 | +++ debian/copyright 2014-02-06 10:26:03 +0000 |
331 | @@ -1,7 +1,7 @@ |
332 | Format: http://dep.debian.net/deps/dep5 |
333 | -Upstream-Name: online-accounts-gnome-control-center |
334 | +Upstream-Name: gnome-control-center-signon |
335 | Upstream-Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
336 | -Source: https://launchpad.net/online-accounts-gnome-control-center |
337 | +Source: https://launchpad.net/gnome-control-center-signon |
338 | |
339 | Files: * |
340 | Copyright: 2012 Canonical Ltd. |
341 | |
342 | === renamed file 'debian/gnome-control-center-signon-autopilot.install' => 'debian/unity-control-center-signon-autopilot.install' |
343 | === renamed file 'debian/gnome-control-center-signon.install' => 'debian/unity-control-center-signon.install' |
344 | --- debian/gnome-control-center-signon.install 2013-07-08 22:49:20 +0000 |
345 | +++ debian/unity-control-center-signon.install 2014-02-06 10:26:03 +0000 |
346 | @@ -1,7 +1,7 @@ |
347 | usr/bin/online-accounts-preferences |
348 | usr/bin/credentials-preferences |
349 | usr/lib/*/update-accounts |
350 | -usr/lib/*/control-center-1/panels/*.so |
351 | +usr/lib/*/unity-control-center-1/panels/*.so |
352 | usr/share/applications |
353 | usr/share/dbus-1/services/com.canonical.webcredentials.capture.service |
354 | usr/share/help |
355 | |
356 | === modified file 'libaccount-plugin/application-plugin.c' |
357 | --- libaccount-plugin/application-plugin.c 2012-05-15 06:38:01 +0000 |
358 | +++ libaccount-plugin/application-plugin.c 2014-02-06 10:26:03 +0000 |
359 | @@ -25,7 +25,7 @@ |
360 | * @short_description: Base class for application plugins. |
361 | * @include: libaccount-plugin/application-plugin.h |
362 | * |
363 | - * Application plugins for the credentials panel of the GNOME control center |
364 | + * Application plugins for the credentials panel of the Unity control center |
365 | * need to subclass #ApApplicationPlugin and implement its build_widget() |
366 | * virtual method. |
367 | * This method will be called by the credentials panel when it needs to show a |
368 | |
369 | === modified file 'libaccount-plugin/plugin.c' |
370 | --- libaccount-plugin/plugin.c 2013-03-22 10:37:14 +0000 |
371 | +++ libaccount-plugin/plugin.c 2014-02-06 10:26:03 +0000 |
372 | @@ -25,7 +25,7 @@ |
373 | * @short_description: Base class for account plugins. |
374 | * @include: libaccount-plugin/plugin.h |
375 | * |
376 | - * Account plugins for the credentials panel of the GNOME control center need |
377 | + * Account plugins for the credentials panel of the Unity control center need |
378 | * to subclass #ApPlugin and implement its build_widget() virtual method. |
379 | * This method will be called by the credentials panel when it needs to show a |
380 | * UI to handle some operations on the account, such as creation, editing or |
381 | |
382 | === modified file 'online-accounts-preferences.in' |
383 | --- online-accounts-preferences.in 2012-11-21 15:08:53 +0000 |
384 | +++ online-accounts-preferences.in 2014-02-06 10:26:03 +0000 |
385 | @@ -1,8 +1,8 @@ |
386 | #!/bin/sh -e |
387 | |
388 | -if test @DESKTOPDIR@/gnome-credentials-panel.desktop |
389 | +if test @DESKTOPDIR@/unity-credentials-panel.desktop |
390 | then |
391 | - gnome-control-center credentials $@ |
392 | + unity-control-center credentials $@ |
393 | else |
394 | credentials-preferences $@ |
395 | fi |
396 | |
397 | === modified file 'po/POTFILES.in' |
398 | --- po/POTFILES.in 2012-10-23 06:45:16 +0000 |
399 | +++ po/POTFILES.in 2014-02-06 10:26:03 +0000 |
400 | @@ -1,5 +1,5 @@ |
401 | data/credentials-preferences.desktop.in.in |
402 | -data/gnome-credentials-panel.desktop.in.in |
403 | +data/unity-credentials-panel.desktop.in.in |
404 | src/cc-credentials-account-details-page.vala |
405 | src/cc-credentials-accounts-model.vala |
406 | src/cc-credentials-accounts-page.vala |
407 | |
408 | === modified file 'po/POTFILES.skip' |
409 | --- po/POTFILES.skip 2012-10-25 10:35:47 +0000 |
410 | +++ po/POTFILES.skip 2014-02-06 10:26:03 +0000 |
411 | @@ -1,5 +1,5 @@ |
412 | data/credentials-preferences.desktop.in |
413 | -data/gnome-credentials-panel.desktop.in |
414 | +data/unity-credentials-panel.desktop.in |
415 | src/cc-credentials-account-details-page.c |
416 | src/cc-credentials-accounts-model.c |
417 | src/cc-credentials-accounts-page.c |
418 | |
419 | === modified file 'src/cc-credentials-application.vala' |
420 | --- src/cc-credentials-application.vala 2012-09-06 09:39:45 +0000 |
421 | +++ src/cc-credentials-application.vala 2014-02-06 10:26:03 +0000 |
422 | @@ -19,7 +19,7 @@ |
423 | |
424 | /** |
425 | * Standalone application for configuring web credentials accounts outside of |
426 | - * GNOME Control Center. |
427 | + * Unity Control Center. |
428 | */ |
429 | public class Cc.Credentials.Application : Gtk.Application |
430 | { |
431 | |
432 | === modified file 'src/cc-credentials-panel.c' |
433 | --- src/cc-credentials-panel.c 2013-07-11 19:47:02 +0000 |
434 | +++ src/cc-credentials-panel.c 2014-02-06 10:26:03 +0000 |
435 | @@ -19,7 +19,7 @@ |
436 | */ |
437 | |
438 | #include <gtk/gtk.h> |
439 | -#include <libgnome-control-center/cc-panel.h> |
440 | +#include <libunity-control-center/cc-panel.h> |
441 | #include <glib/gi18n-lib.h> |
442 | #include <stdlib.h> |
443 | #include "config.h" |
444 | |
445 | === modified file 'src/cc-credentials-preferences.vala' |
446 | --- src/cc-credentials-preferences.vala 2012-08-31 12:39:57 +0000 |
447 | +++ src/cc-credentials-preferences.vala 2014-02-06 10:26:03 +0000 |
448 | @@ -18,7 +18,7 @@ |
449 | */ |
450 | |
451 | /** |
452 | - * Web credentials preferences widget. This can be packed into the GNOME |
453 | + * Web credentials preferences widget. This can be packed into the Unity |
454 | * Control Center or used in a standalone application. |
455 | */ |
456 | public class Cc.Credentials.Preferences : Gtk.Notebook |
457 | |
458 | === modified file 'tests/autopilot/setup.py' |
459 | --- tests/autopilot/setup.py 2013-05-03 17:58:21 +0000 |
460 | +++ tests/autopilot/setup.py 2014-02-06 10:26:03 +0000 |
461 | @@ -3,11 +3,11 @@ |
462 | from distutils.core import setup |
463 | from DistUtilsExtra.command import build_extra |
464 | |
465 | -setup(name="gnome-control-center-signon-autopilot", |
466 | +setup(name="unity-control-center-signon-autopilot", |
467 | version="0.1", |
468 | author="Alberto Mardegan", |
469 | author_email="alberto.mardegan@canonical.com", |
470 | url="http://launchpad.net/uoa-integration-tests", |
471 | license="GNU General Public License v3 (GPLv3)", |
472 | - packages=["gnome_control_center_signon"], |
473 | + packages=["unity_control_center_signon"], |
474 | cmdclass={"build": build_extra.build_extra,}) |
475 | |
476 | === renamed directory 'tests/autopilot/gnome_control_center_signon' => 'tests/autopilot/unity_control_center_signon' |
477 | === modified file 'tests/autopilot/unity_control_center_signon/test_control_center_signon.py' |
478 | --- tests/autopilot/gnome_control_center_signon/test_control_center_signon.py 2013-11-14 09:34:33 +0000 |
479 | +++ tests/autopilot/unity_control_center_signon/test_control_center_signon.py 2014-02-06 10:26:03 +0000 |
480 | @@ -81,7 +81,7 @@ |
481 | class ControlCenterTests(AutopilotTestCase): |
482 | def setUp(self): |
483 | super(ControlCenterTests, self).setUp() |
484 | - self.app = self.launch_test_application('gnome-control-center', 'credentials', capture_output=True) |
485 | + self.app = self.launch_test_application('unity-control-center', 'credentials', capture_output=True) |
486 | |
487 | def test_title(self): |
488 | """ Checks whether the Online Accounts window title is correct """ |
LGTM, thanks!