Commit 0f8da0b9 authored by Jeremy Bicha's avatar Jeremy Bicha Committed by Jonas Smedegaard

Import Debian changes 3.25.4-1

gnome-initial-setup (3.25.4-1) unstable; urgency=medium

  * New upstream release
  * Drop all patches, applied in new release
  * debian/links:
    + Symlink the gdm greeter .desktop to /usr/share/applications
      so that "Initial Setup" has a proper window title
  * Bump Standards-Version to 4.1.0
parents 06ee8b69 f8d29e3d
......@@ -315,6 +315,7 @@ SOFTWARE_SOURCES_CFLAGS = @SOFTWARE_SOURCES_CFLAGS@
SOFTWARE_SOURCES_LIBS = @SOFTWARE_SOURCES_LIBS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VENDOR_CONF_FILE = @VENDOR_CONF_FILE@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
......
3.24.2
3.25.4
* Use Unicode in translatable strings
* Adjust to g-s-d's plugin removals
* Translation updates
3.25.3
* Support a vendor configuration file
* Update text direction when the locale changes
* Allow configuring network connections
* Copy monitor configuration to user session
* Sync user account page with control-center
* Show strength indicator for passwords
* Translation updates
3.24.0
......
This diff is collapsed.
This diff is collapsed.
#! /bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2016 Free Software Foundation, Inc.
# Copyright 1992-2015 Free Software Foundation, Inc.
timestamp='2016-09-05'
timestamp='2015-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -33,7 +33,7 @@ timestamp='2016-09-05'
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
......@@ -53,7 +53,8 @@ timestamp='2016-09-05'
me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
Usage: $0 [OPTION] CPU-MFR-OPSYS
$0 [OPTION] ALIAS
Canonicalize a configuration name.
......@@ -67,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright 1992-2016 Free Software Foundation, Inc.
Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -116,8 +117,8 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
kopensolaris*-gnu* | cloudabi*-eabi* | \
knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
......@@ -254,12 +255,11 @@ case $basic_machine in
| arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
| ba \
| be32 | be64 \
| bfin \
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
| e2k | epiphany \
| epiphany \
| fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
......@@ -305,7 +305,7 @@ case $basic_machine in
| riscv32 | riscv64 \
| rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
......@@ -376,13 +376,12 @@ case $basic_machine in
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| ba-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| e2k-* | elxsi-* \
| elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
......@@ -429,13 +428,12 @@ case $basic_machine in
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
| riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile*-* \
......@@ -520,9 +518,6 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
asmjs)
basic_machine=asmjs-unknown
;;
aux)
basic_machine=m68k-apple
os=-aux
......@@ -643,14 +638,6 @@ case $basic_machine in
basic_machine=m68k-bull
os=-sysv3
;;
e500v[12])
basic_machine=powerpc-unknown
os=$os"spe"
;;
e500v[12]-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
os=$os"spe"
;;
ebmon29k)
basic_machine=a29k-amd
os=-ebmon
......@@ -1030,7 +1017,7 @@ case $basic_machine in
ppc-* | ppcbe-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle)
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
......@@ -1040,7 +1027,7 @@ case $basic_machine in
;;
ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little)
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
......@@ -1386,18 +1373,18 @@ case $os in
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* | -cloudabi* | -sortix* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
| -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
| -bitrig* | -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
......@@ -1406,8 +1393,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
| -onefs* | -tirtos* | -phoenix*)
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
......@@ -1539,8 +1525,6 @@ case $os in
;;
-nacl*)
;;
-ios)
;;
-none)
;;
*)
......
This diff is collapsed.
AC_INIT([gnome-initial-setup],[3.24.2])
AC_INIT([gnome-initial-setup],[3.25.4])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([dist-xz no-dist-gzip foreign])
AM_INIT_AUTOMAKE([dist-xz no-dist-gzip foreign tar-ustar])
AM_MAINTAINER_MODE([enable])
AM_SILENT_RULES([yes])
......@@ -18,9 +18,20 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
AM_GLIB_GNU_GETTEXT
AC_ARG_WITH(vendor-conf-file,
AS_HELP_STRING([--with-vendor-conf-file=<file>],
[vendor conf file]))
if ! test -z "$with_vendor_conf_file"; then
VENDOR_CONF_FILE=$with_vendor_conf_file
else
VENDOR_CONF_FILE=${localstatedir}/lib/gnome-initial-setup/vendor.conf
fi
AC_SUBST(VENDOR_CONF_FILE)
LIBNM_REQUIRED_VERSION=1.2
LIBNMA_REQUIRED_VERSION=1.0
GLIB_REQUIRED_VERSION=2.46.0
GLIB_REQUIRED_VERSION=2.53.0
GTK_REQUIRED_VERSION=3.11.3
PANGO_REQUIRED_VERSION=1.32.5
IBUS_REQUIRED_VERSION=1.4.99
......@@ -48,7 +59,7 @@ PKG_CHECK_MODULES(INITIAL_SETUP,
pango >= $PANGO_REQUIRED_VERSION
rest-0.7
json-glib-1.0
libsecret-1
libsecret-1
pwquality
webkit2gtk-4.0)
......
......@@ -11,6 +11,7 @@ polkit.addRule(function(action, subject) {
var actionMatches = (action.id === 'org.freedesktop.udisks2.filesystem-mount-system' ||
action.id.indexOf('org.freedesktop.hostname1.') === 0 ||
action.id.indexOf('org.freedesktop.NetworkManager.') === 0 ||
action.id.indexOf('org.freedesktop.locale1.') === 0 ||
action.id.indexOf('org.freedesktop.packagekit.system-sources-configure') === 0 ||
action.id.indexOf('org.freedesktop.accounts.') === 0 ||
......
......@@ -268,6 +268,7 @@ SOFTWARE_SOURCES_CFLAGS = @SOFTWARE_SOURCES_CFLAGS@
SOFTWARE_SOURCES_LIBS = @SOFTWARE_SOURCES_LIBS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VENDOR_CONF_FILE = @VENDOR_CONF_FILE@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
......
[GNOME Session]
Name=GNOME Initial Setup
RequiredComponents=setup-shell;gnome-initial-setup;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Orientation;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XRANDR;org.gnome.SettingsDaemon.XSettings;
RequiredComponents=setup-shell;gnome-initial-setup;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
......@@ -3,6 +3,6 @@
"components": ["networkAgent"],
"panel": { "left": [],
"center": [],
"right": ["a11yGreeter", "keyboard", "volume", "battery"]
"right": ["a11yGreeter", "keyboard", "aggregateMenu"]
}
}
gnome-initial-setup (3.25.4-1) unstable; urgency=medium
* New upstream release
* Drop all patches, applied in new release
* debian/links:
+ Symlink the gdm greeter .desktop to /usr/share/applications
so that "Initial Setup" has a proper window title
* Bump Standards-Version to 4.1.0
-- Jeremy Bicha <jbicha@debian.org> Wed, 30 Aug 2017 12:11:56 -0400
gnome-initial-setup (3.24.2-1) unstable; urgency=medium
* New upstream release (Closes: #869942)
......
......@@ -6,7 +6,7 @@ Source: gnome-initial-setup
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: Jeremy Bicha <jbicha@ubuntu.com>, Jordi Mallach <jordi@debian.org>, Laurent Bigonville <bigon@debian.org>
Uploaders: Jeremy Bicha <jbicha@debian.org>, Jordi Mallach <jordi@debian.org>, Laurent Bigonville <bigon@debian.org>
Build-Depends: debhelper (>= 10),
geoclue-2.0 (>= 2.3.1),
gnome-common,
......@@ -37,7 +37,7 @@ Build-Depends: debhelper (>= 10),
librest-dev,
libsecret-1-dev,
libwebkit2gtk-4.0-dev
Standards-Version: 3.9.8
Standards-Version: 4.1.0
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-initial-setup
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-initial-setup/
Homepage: https://git.gnome.org/browse/gnome-initial-setup/
......
......@@ -33,7 +33,7 @@ Build-Depends: debhelper (>= 10),
librest-dev,
libsecret-1-dev,
libwebkit2gtk-4.0-dev
Standards-Version: 3.9.8
Standards-Version: 4.1.0
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-initial-setup
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-initial-setup/
Homepage: https://git.gnome.org/browse/gnome-initial-setup/
......
usr/share/gdm/greeter/applications/gnome-initial-setup.desktop usr/share/applications/gnome-initial-setup.desktop
From 5de6661a071741fd3debbb5136e15a8c9d80659b Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Fri, 9 Jun 2017 15:14:22 +0200
Subject: data: Adjust to g-s-d's plugin removals
The orientation and xrandr plugins have been removed.
---
data/gnome-initial-setup.session | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/gnome-initial-setup.session b/data/gnome-initial-setup.session
index 0d81bb1..80d2475 100644
--- a/data/gnome-initial-setup.session
+++ b/data/gnome-initial-setup.session
@@ -1,3 +1,3 @@
[GNOME Session]
Name=GNOME Initial Setup
-RequiredComponents=setup-shell;gnome-initial-setup;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Orientation;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XRANDR;org.gnome.SettingsDaemon.XSettings;
+RequiredComponents=setup-shell;gnome-initial-setup;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
Index: gnome-initial-setup-3.22.0/data/20-gnome-initial-setup.rules
===================================================================
--- gnome-initial-setup-3.22.0.orig/data/20-gnome-initial-setup.rules
+++ gnome-initial-setup-3.22.0/data/20-gnome-initial-setup.rules
@@ -11,6 +11,7 @@ polkit.addRule(function(action, subject)
var actionMatches = (action.id === 'org.freedesktop.udisks2.filesystem-mount-system' ||
action.id.indexOf('org.freedesktop.hostname1.') === 0 ||
+ action.id.indexOf('org.freedesktop.NetworkManager.') === 0 ||
action.id.indexOf('org.freedesktop.locale1.') === 0 ||
action.id.indexOf('org.freedesktop.packagekit.system-sources-configure') === 0 ||
action.id.indexOf('org.freedesktop.accounts.') === 0 ||
polkit-allow-NM.patch
adapt-to-gsd325.patch
......@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
$(INITIAL_SETUP_CFLAGS) \
-DSECRET_API_SUBJECT_TO_CHANGE \
-DGCR_API_SUBJECT_TO_CHANGE \
-DVENDOR_CONF_FILE="\"$(VENDOR_CONF_FILE)\"" \
-DUIDIR="\"$(uidir)\"" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
......
......@@ -348,6 +348,7 @@ SOFTWARE_SOURCES_CFLAGS = @SOFTWARE_SOURCES_CFLAGS@
SOFTWARE_SOURCES_LIBS = @SOFTWARE_SOURCES_LIBS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VENDOR_CONF_FILE = @VENDOR_CONF_FILE@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
......@@ -412,6 +413,7 @@ AM_CPPFLAGS = \
$(INITIAL_SETUP_CFLAGS) \
-DSECRET_API_SUBJECT_TO_CHANGE \
-DGCR_API_SUBJECT_TO_CHANGE \
-DVENDOR_CONF_FILE="\"$(VENDOR_CONF_FILE)\"" \
-DUIDIR="\"$(uidir)\"" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
......
......@@ -225,6 +225,11 @@ static void
gis_driver_real_locale_changed (GisDriver *driver)
{
GisDriverPrivate *priv = gis_driver_get_instance_private (driver);
GtkTextDirection direction;
direction = gtk_get_locale_direction ();
gtk_widget_set_default_direction (direction);
rebuild_pages (driver);
gis_assistant_locale_changed (priv->assistant);
}
......
......@@ -92,6 +92,7 @@ main (int argc,
FILE (".config/run-welcome-tour");
FILE (".config/dconf/user");
FILE (".config/goa-1.0/accounts.conf");
FILE (".config/monitors.xml");
FILE (".local/share/keyrings/login.keyring");
return EXIT_SUCCESS;
......
......@@ -49,6 +49,9 @@
#include "pages/password/gis-password-page.h"
#include "pages/summary/gis-summary-page.h"
#define VENDOR_PAGES_GROUP "pages"
#define VENDOR_PAGES_SKIP_KEY "skip"
static gboolean force_existing_user_mode;
typedef void (*PreparePage) (GisDriver *driver);
......@@ -101,21 +104,36 @@ static gchar **
pages_to_skip_from_file (void)
{
GKeyFile *skip_pages_file;
gchar **skip_pages;
gchar **skip_pages = NULL;
GError *error = NULL;
/* VENDOR_CONF_FILE points to a keyfile containing vendor customization
* options. This code will look for options under the "pages" group, and
* supports the following keys:
* - skip (optional): list of pages to be skipped.
*
* This is how this file would look on a vendor image:
*
* [pages]
* skip=language
*/
skip_pages_file = g_key_file_new ();
/* TODO: put the skipfile somewhere sensible */
if (g_key_file_load_from_file (skip_pages_file, "/tmp/skip_pages_file",
G_KEY_FILE_NONE,
NULL)) {
skip_pages = g_key_file_get_string_list (skip_pages_file, "pages", "skip",
NULL, NULL);
g_key_file_free (skip_pages_file);
return skip_pages;
if (!g_key_file_load_from_file (skip_pages_file, VENDOR_CONF_FILE,
G_KEY_FILE_NONE, &error)) {
if (!g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
g_warning ("Could not read file %s: %s", VENDOR_CONF_FILE, error->message);
g_error_free (error);
goto out;
}
return NULL;
skip_pages = g_key_file_get_string_list (skip_pages_file, VENDOR_PAGES_GROUP,
VENDOR_PAGES_SKIP_KEY, NULL, NULL);
out:
g_key_file_free (skip_pages_file);
return skip_pages;
}
static void
......@@ -202,7 +220,7 @@ main (int argc, char *argv[])
g_unsetenv ("GIO_USE_VFS");
context = g_option_context_new (_("- GNOME initial setup"));
context = g_option_context_new (_(" GNOME initial setup"));
g_option_context_add_main_entries (context, entries, NULL);
g_option_context_parse (context, &argc, &argv, NULL);
......
......@@ -292,6 +292,7 @@ SOFTWARE_SOURCES_CFLAGS = @SOFTWARE_SOURCES_CFLAGS@
SOFTWARE_SOURCES_LIBS = @SOFTWARE_SOURCES_LIBS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VENDOR_CONF_FILE = @VENDOR_CONF_FILE@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
......
......@@ -296,6 +296,7 @@ SOFTWARE_SOURCES_CFLAGS = @SOFTWARE_SOURCES_CFLAGS@
SOFTWARE_SOURCES_LIBS = @SOFTWARE_SOURCES_LIBS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VENDOR_CONF_FILE = @VENDOR_CONF_FILE@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
......
......@@ -42,7 +42,7 @@
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="margin_bottom">26</property>
<property name="label" translatable="yes">Enterprise login allows an existing centrally managed user account to be used on this device.</property>
<property name="label" translatable="yes">Enterprise login allows an existing centrally managed user account to be used on this device. You can also use this account to access company resources on the internet.</property>
<property name="justify">center</property>
<property name="wrap">True</property>
<property name="max-width-chars">45</property>
......
......@@ -48,6 +48,7 @@ struct _GisAccountPageLocalPrivate
GtkWidget *subtitle;
GtkWidget *fullname_entry;
GtkWidget *username_combo;
gboolean has_custom_username;
GtkWidget *username_explanation;
UmPhotoDialog *photo_dialog;
......@@ -181,12 +182,12 @@ prepopulate_account_page (GisAccountPageLocal *page)
GError *error = NULL;
if (!goa_oauth2_based_call_get_access_token_sync (oa2, &token, NULL, NULL, &error))
{
g_warning ("Couldn't get oauth2 token: %s\n", error->message);
g_warning ("Couldn't get oauth2 token: %s", error->message);
g_error_free (error);
}
else if (!get_profile_sync (token, &name, &picture, NULL, &error))
{
g_warning ("Couldn't get profile information: %s\n", error->message);
g_warning ("Couldn't get profile information: %s", error->message);
g_error_free (error);
}
/* FIXME: collect information from more than one account
......@@ -211,7 +212,7 @@ prepopulate_account_page (GisAccountPageLocal *page)
stream = g_file_read (file, NULL, &error);
if (!stream)
{
g_warning ("Failed to read picture: %s\n", error->message);
g_warning ("Failed to read picture: %s", error->message);
g_error_free (error);
}
else
......@@ -298,12 +299,13 @@ fullname_changed (GtkWidget *w,
gtk_list_store_clear (GTK_LIST_STORE (model));
if (strlen (name) == 0) {
if ((name == NULL || strlen (name) == 0) && !priv->has_custom_username) {
gtk_entry_set_text (GTK_ENTRY (entry), "");
}
else {
else if (name != NULL && strlen (name) != 0) {
generate_username_choices (name, GTK_LIST_STORE (model));
gtk_combo_box_set_active (GTK_COMBO_BOX (priv->username_combo), 0);
if (!priv->has_custom_username)
gtk_combo_box_set_active (GTK_COMBO_BOX (priv->username_combo), 0);
}
clear_entry_validation_error (GTK_ENTRY (w));
......@@ -319,8 +321,16 @@ username_changed (GtkComboBoxText *combo,
{
GisAccountPageLocalPrivate *priv = gis_account_page_local_get_instance_private (page);
GtkWidget *entry;
const gchar *username;
entry = gtk_bin_get_child (GTK_BIN (combo));
username = gtk_entry_get_text (GTK_ENTRY (entry));
if (*username == '\0')
priv->has_custom_username = FALSE;
else if (gtk_widget_has_focus (entry) ||
gtk_combo_box_get_active (GTK_COMBO_BOX (priv->username_combo)) > 0)
priv->has_custom_username = TRUE;
clear_entry_validation_error (GTK_ENTRY (entry));
priv->valid_username = FALSE;
......@@ -403,6 +413,7 @@ gis_account_page_local_constructed (GObject *object)
gtk_label_set_text (GTK_LABEL (priv->subtitle), _("We need a few details to complete setup."));
gtk_entry_set_text (GTK_ENTRY (priv->fullname_entry), "");
gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (priv->username_combo))));
priv->has_custom_username = FALSE;
gtk_image_set_pixel_size (GTK_IMAGE (priv->avatar_image), 96);
gtk_image_set_from_icon_name (GTK_IMAGE (priv->avatar_image), "avatar-default-symbolic", 1);
......
/*
* Generated by gdbus-codegen 2.53.1. DO NOT EDIT.
* Generated by gdbus-codegen 2.53.3. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
......
/*
* Generated by gdbus-codegen 2.53.1. DO NOT EDIT.
* Generated by gdbus-codegen 2.53.3. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
......
......@@ -242,17 +242,16 @@ is_valid_username (const gchar *username, gchar **tip)
if (!empty && (in_use || too_long || !valid)) {
if (in_use) {
*tip = g_strdup_printf (_("A user with the username ‘%s’ already exists."),
username);
*tip = g_strdup (_("Sorry, that user name isn’t available. Please try another."));
}
else if (too_long) {
*tip = g_strdup_printf (_("The username is too long."));
}
else if (username[0] == '-') {
*tip = g_strdup (_("The username cannot start with a ‘-’."));
*tip = g_strdup (_("The username cannot start with a “-”."));
}
else {
*tip = g_strdup (_("The username should only consist of lower and upper case letters from a-z, digits and any of characters ‘.’, ‘-’ and ‘_’."));
*tip = g_strdup (_("The username should only consist of upper and lower case letters from a-z, digits and the following characters: . - _"));
}
}
else {
......
......@@ -289,6 +289,7 @@ SOFTWARE_SOURCES_CFLAGS = @SOFTWARE_SOURCES_CFLAGS@
SOFTWARE_SOURCES_LIBS = @SOFTWARE_SOURCES_LIBS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VENDOR_CONF_FILE = @VENDOR_CONF_FILE@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
......
......@@ -287,6 +287,7 @@ SOFTWARE_SOURCES_CFLAGS = @SOFTWARE_SOURCES_CFLAGS@
SOFTWARE_SOURCES_LIBS = @SOFTWARE_SOURCES_LIBS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VENDOR_CONF_FILE = @VENDOR_CONF_FILE@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
......
......@@ -89,7 +89,7 @@ add_account_to_provider (ProviderWidget *provider_widget)
GTK_DIALOG_MODAL
| GTK_DIALOG_DESTROY_WITH_PARENT
| GTK_DIALOG_USE_HEADER_BAR,
NULL);
NULL, NULL);
goa_provider_add_account (provider_widget->provider,
priv->goa_client,
......@@ -102,7 +102,7 @@ add_account_to_provider (ProviderWidget *provider_widget)
if (error) {
if (!g_error_matches (error, GOA_ERROR, GOA_ERROR_DIALOG_DISMISSED))
g_warning ("fart %s\n", error->message);
g_warning ("fart %s", error->message);
goto out;
}
......
......@@ -291,6 +291,7 @@ SOFTWARE_SOURCES_CFLAGS = @SOFTWARE_SOURCES_CFLAGS@
SOFTWARE_SOURCES_LIBS = @SOFTWARE_SOURCES_LIBS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VENDOR_CONF_FILE = @VENDOR_CONF_FILE@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
......
......@@ -172,7 +172,7 @@ change_locale_permission_acquired (GObject *source,
allowed = g_permission_acquire_finish (priv->permission, res, &error);
if (error) {
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
g_warning ("Failed to acquire permission: %s\n", error->message);
g_warning ("Failed to acquire permission: %s", error->message);
g_error_free (error);
return;
}
......@@ -293,7 +293,7 @@ localed_proxy_ready (GObject *source,
if (!proxy) {
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
g_warning ("Failed to contact localed: %s\n", error->message);
g_warning ("Failed to contact localed: %s", error->message);
g_error_free (error);
return;
}
......
......@@ -291,6 +291,7 @@ SOFTWARE_SOURCES_CFLAGS = @SOFTWARE_SOURCES_CFLAGS@
SOFTWARE_SOURCES_LIBS = @SOFTWARE_SOURCES_LIBS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VENDOR_CONF_FILE = @VENDOR_CONF_FILE@
VERSION = @VERSION@
WARN_CFLAGS = @WARN_CFLAGS@
XGETTEXT = @XGETTEXT@
......
......@@ -119,8 +119,10 @@ language_widget_new (const char *locale_id,
{
GtkWidget *label;
gchar *locale_name, *locale_current_name, *locale_untranslated_name;
gchar *language, *language_name;
gchar *country, *country_name;
gchar *language = NULL;
gchar *language_name;
gchar *country = NULL;
gchar *country_name = NULL;
gchar *sort_key;
LanguageWidget *widget = g_new0 (LanguageWidget, 1);
......@@ -128,7 +130,9 @@ language_widget_new (const char *locale_id,