From 0ab19c2a00018a03369d483b4bc77837d29c93d901ee7e6e309c1ded3b58cf3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 17 Aug 2018 18:52:29 +0000 Subject: [PATCH] Accepting request 629657 from home:yfjiang:branches:GNOME:Factory - Add gnome-control-center-remove-implicit-language-setting.patch: user-accounts: remove implicit language setting when a new user navigating the user panel at the first time (bsc#1078968, commit a1066a2). OBS-URL: https://build.opensuse.org/request/show/629657 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=396 --- ...-center-remove-implicit-language-setting.patch | 15 +++++++++++++++ gnome-control-center.changes | 8 ++++++++ gnome-control-center.spec | 3 +++ 3 files changed, 26 insertions(+) create mode 100644 gnome-control-center-remove-implicit-language-setting.patch diff --git a/gnome-control-center-remove-implicit-language-setting.patch b/gnome-control-center-remove-implicit-language-setting.patch new file mode 100644 index 0000000..7194aac --- /dev/null +++ b/gnome-control-center-remove-implicit-language-setting.patch @@ -0,0 +1,15 @@ +Index: gnome-control-center-3.28.2/panels/user-accounts/um-user-panel.c +=================================================================== +--- gnome-control-center-3.28.2.orig/panels/user-accounts/um-user-panel.c ++++ gnome-control-center-3.28.2/panels/user-accounts/um-user-panel.c +@@ -840,10 +840,6 @@ show_user (ActUser *user, CcUserPanelPri + + name = NULL; + lang = g_strdup (act_user_get_language (user)); +- if ((!lang || *lang == '\0') && act_user_get_uid (user) == getuid ()) { +- lang = cc_common_language_get_current_language (); +- act_user_set_language (user, lang); +- } + + if (lang && *lang != '\0') { + name = gnome_get_language_from_locale (lang, NULL); diff --git a/gnome-control-center.changes b/gnome-control-center.changes index d4e8893..f2810a0 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Aug 17 01:08:50 UTC 2018 - yfjiang@suse.com + +- Add gnome-control-center-remove-implicit-language-setting.patch: + user-accounts: remove implicit language setting when a new user + navigating the user panel at the first time (bsc#1078968, commit + a1066a2). + ------------------------------------------------------------------- Mon Jul 23 10:31:30 UTC 2018 - dimstar@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index ec45e84..90f9263 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -42,6 +42,8 @@ Patch1: control-center-network-add-domain-suffix-match.patch Patch2: control-center-ignore-unmanaged-wifi-devices.patch # PATCH-FIX-UPSTREAM gcc-user-accounts-Force-symlink-creation.patch -- user-accounts: Force symlink creation Patch3: gcc-user-accounts-Force-symlink-creation.patch +# PATCH-FIX-UPSTREAM gnome-control-center-remove-implicit-language-setting.patch bsc#1078968 yfjiang@suse.com -- user-accounts: remove implicit language setting when a new user navigating the user panel at the first time (commit a1066a2) +Patch4: gnome-control-center-remove-implicit-language-setting.patch ### patches for Leap >= 15 plus SLE >= 15, but not TW # PATCH-FEATURE-SLE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer. Patch1001: gnome-control-center-info-never-use-gnome-software.patch @@ -184,6 +186,7 @@ GNOME control center. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 translation-update-upstream po gnome-control-center-2.0 # patches for Leap >= 15 plus SLE >= 15, but not TW