pool/gnome-initial-setup
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 760971 from GNOME:Next

Browse Source 
New stable release

OBS-URL: https://build.opensuse.org/request/show/760971
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-initial-setup?expand=0&rev=73
This commit is contained in:
Bjørn Lie 2020-01-06 18:03:40 +00:00 committed by Git OBS Bridge
parent dc82b8cbd1
commit 8e368044cd
5 changed files with 151 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-initial-setup-3.34.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e71f10ef6b631cd92ffde774e4130b32b2494b4df5ef288375d8b1957eeabfa1
size 1362240

3
gnome-initial-setup-3.34.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:33f9ceb2d65800644c6d6430bbb1d0f4387a062684014cba836d9fbc593d88b5
size 1364488

287
gnome-initial-setup-smarter.patch
View File

@ -1,15 +1,15 @@
diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/gis-driver.c gnome-initial-setup-3.26.0_new/gnome-initial-setup/gis-driver.c diff -Nura gnome-initial-setup-3.34.1/gnome-initial-setup/gis-driver.c gnome-initial-setup-3.34.1_new/gnome-initial-setup/gis-driver.c
--- gnome-initial-setup-3.26.0/gnome-initial-setup/gis-driver.c 2017-06-14 21:39:03.000000000 +0800 --- gnome-initial-setup-3.34.1/gnome-initial-setup/gis-driver.c 2019-10-06 05:03:38.000000000 +0800
+++ gnome-initial-setup-3.26.0_new/gnome-initial-setup/gis-driver.c 2019-02-27 18:51:00.329103410 +0800 +++ gnome-initial-setup-3.34.1_new/gnome-initial-setup/gis-driver.c 2019-11-26 16:05:58.390308663 +0800
@@ -27,6 +27,7 @@ @@ -30,6 +30,7 @@
#include <locale.h>
#include "cc-common-language.h"
#include "gis-assistant.h" #include "gis-assistant.h"
+#include "language-setting.h" +#include "language-setting.h"
#define GIS_TYPE_DRIVER_MODE (gis_driver_mode_get_type ()) #define GIS_TYPE_DRIVER_MODE (gis_driver_mode_get_type ())
@@ -83,6 +84,32 @@ @@ -92,6 +93,32 @@
G_DEFINE_TYPE_WITH_PRIVATE(GisDriver, gis_driver, GTK_TYPE_APPLICATION) G_DEFINE_TYPE_WITH_PRIVATE(GisDriver, gis_driver, GTK_TYPE_APPLICATION)
@ -40,9 +40,9 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/gis-driver.c gnome-ini
+} +}
+ +
static void static void
gis_driver_finalize (GObject *object) gis_driver_dispose (GObject *object)
{ {
@@ -319,7 +346,16 @@ @@ -387,7 +414,16 @@
G_APPLICATION_CLASS (gis_driver_parent_class)->activate (app); G_APPLICATION_CLASS (gis_driver_parent_class)->activate (app);
@ -60,7 +60,7 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/gis-driver.c gnome-ini
} }
static gboolean static gboolean
@@ -436,6 +472,7 @@ @@ -555,6 +591,7 @@
"icon-name", "preferences-system", "icon-name", "preferences-system",
"deletable", FALSE, "deletable", FALSE,
NULL); NULL);
@ -68,18 +68,18 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/gis-driver.c gnome-ini
g_signal_connect (priv->main_window, g_signal_connect (priv->main_window,
"realize", "realize",
diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup.c gnome-initial-setup-3.26.0_new/gnome-initial-setup/gnome-initial-setup.c diff -Nura gnome-initial-setup-3.34.1/gnome-initial-setup/gnome-initial-setup.c gnome-initial-setup-3.34.1_new/gnome-initial-setup/gnome-initial-setup.c
--- gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup.c 2017-09-05 00:35:30.000000000 +0800 --- gnome-initial-setup-3.34.1/gnome-initial-setup/gnome-initial-setup.c 2019-10-06 05:03:38.000000000 +0800
+++ gnome-initial-setup-3.26.0_new/gnome-initial-setup/gnome-initial-setup.c 2019-02-27 16:05:26.596328724 +0800 +++ gnome-initial-setup-3.34.1_new/gnome-initial-setup/gnome-initial-setup.c 2019-11-26 19:19:43.238641813 +0800
@@ -48,6 +48,7 @@ @@ -44,6 +44,7 @@
#include "pages/account/gis-account-pages.h" #include "pages/account/gis-account-pages.h"
#include "pages/password/gis-password-page.h" #include "pages/password/gis-password-page.h"
#include "pages/summary/gis-summary-page.h" #include "pages/summary/gis-summary-page.h"
+#include "language-setting.h" +#include "language-setting.h"
#define VENDOR_PAGES_GROUP "pages" #define VENDOR_PAGES_GROUP "pages"
#define VENDOR_PAGES_SKIP_KEY "skip" #define VENDOR_SKIP_KEY "skip"
@@ -82,6 +83,16 @@ @@ -84,6 +85,16 @@
#undef PAGE #undef PAGE
@ -94,28 +94,47 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup.c
+ }; + };
+ +
static gboolean static gboolean
should_skip_page (GisDriver *driver, should_skip_page (const gchar *page_id,
const gchar *page_id, gchar **skip_pages)
@@ -100,42 +111,6 @@ @@ -101,73 +112,6 @@
return FALSE; return FALSE;
} }
-static gchar ** -static gchar **
-pages_to_skip_from_file (void) -strv_append (gchar **a,
- gchar **b)
-{
- guint n = g_strv_length (a);
- guint m = g_strv_length (b);
-
- a = g_renew (gchar *, a, n + m + 1);
- for (guint i = 0; i < m; i++)
- a[n + i] = g_strdup (b[i]);
- a[n + m] = NULL;
-
- return a;
-}
-
-static gchar **
-pages_to_skip_from_file (gboolean is_new_user)
-{ -{
- GKeyFile *skip_pages_file; - GKeyFile *skip_pages_file;
- gchar **skip_pages = NULL; - gchar **skip_pages = NULL;
- gchar **additional_skip_pages = NULL;
- GError *error = NULL; - GError *error = NULL;
- -
- /* VENDOR_CONF_FILE points to a keyfile containing vendor customization - /* VENDOR_CONF_FILE points to a keyfile containing vendor customization
- * options. This code will look for options under the "pages" group, and - * options. This code will look for options under the "pages" group, and
- * supports the following keys: - * supports the following keys:
- * - skip (optional): list of pages to be skipped. - * - skip (optional): list of pages to be skipped always
- * - new_user_only (optional): list of pages to be skipped in existing user mode
- * - existing_user_only (optional): list of pages to be skipped in new user mode
- * - *
- * This is how this file would look on a vendor image: - * This is how this file might look on a vendor image:
- * - *
- * [pages] - * [pages]
- * skip=language - * skip=timezone
- * existing_user_only=language;keyboard
- */ - */
- skip_pages_file = g_key_file_new (); - skip_pages_file = g_key_file_new ();
- if (!g_key_file_load_from_file (skip_pages_file, VENDOR_CONF_FILE, - if (!g_key_file_load_from_file (skip_pages_file, VENDOR_CONF_FILE,
@ -127,8 +146,20 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup.c
- goto out; - goto out;
- } - }
- -
- skip_pages = g_key_file_get_string_list (skip_pages_file, VENDOR_PAGES_GROUP, - skip_pages = g_key_file_get_string_list (skip_pages_file,
- VENDOR_PAGES_SKIP_KEY, NULL, NULL); - VENDOR_PAGES_GROUP,
- VENDOR_SKIP_KEY, NULL, NULL);
- additional_skip_pages = g_key_file_get_string_list (skip_pages_file,
- VENDOR_PAGES_GROUP,
- is_new_user ? VENDOR_EXISTING_USER_ONLY_KEY : VENDOR_NEW_USER_ONLY_KEY,
- NULL, NULL);
-
- if (!skip_pages && additional_skip_pages) {
- skip_pages = additional_skip_pages;
- } else if (skip_pages && additional_skip_pages) {
- skip_pages = strv_append (skip_pages, additional_skip_pages);
- g_strfreev (additional_skip_pages);
- }
- -
- out: - out:
- g_key_file_free (skip_pages_file); - g_key_file_free (skip_pages_file);
@ -139,56 +170,41 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup.c
static void static void
destroy_pages_after (GisAssistant *assistant, destroy_pages_after (GisAssistant *assistant,
GisPage *page) GisPage *page)
@@ -161,14 +136,11 @@ @@ -194,7 +138,6 @@
PageData *page_data; GisPage *page;
GisAssistant *assistant; GisAssistant *assistant;
GisPage *current_page; GisPage *current_page;
- gchar **skip_pages; - gchar **skip_pages;
gboolean is_new_user; gboolean is_new_user, skipped;
assistant = gis_driver_get_assistant (driver); assistant = gis_driver_get_assistant (driver);
current_page = gis_assistant_get_current_page (assistant); @@ -215,13 +158,12 @@
}
- skip_pages = pages_to_skip_from_file (); is_new_user = (gis_driver_get_mode (driver) == GIS_DRIVER_MODE_NEW_USER);
- - skip_pages = pages_to_skip_from_file (is_new_user);
page_data = page_table;
if (current_page != NULL) { for (; page_data->page_id != NULL; ++page_data) {
@@ -186,13 +158,11 @@ skipped = FALSE;
if (page_data->new_user_only && !is_new_user)
continue;
- if (should_skip_page (driver, page_data->page_id, skip_pages)) if ((page_data->new_user_only && !is_new_user) ||
+ if (should_skip_page (driver, page_data->page_id, SUSE_skip_pages)) - (should_skip_page (page_data->page_id, skip_pages)))
continue; + (should_skip_page (page_data->page_id, SUSE_skip_pages)))
skipped = TRUE;
page_data->prepare_page_func (driver); page = page_data->prepare_page_func (driver);
@@ -233,8 +175,6 @@
else
gis_driver_add_page (driver, page);
} }
- -
- g_strfreev (skip_pages); - g_strfreev (skip_pages);
} }
static GisDriverMode static GisDriverMode
@@ -208,7 +178,7 @@ diff -Nura gnome-initial-setup-3.34.1/gnome-initial-setup/gnome-initial-setup.h gnome-initial-setup-3.34.1_new/gnome-initial-setup/gnome-initial-setup.h
main (int argc, char *argv[]) --- gnome-initial-setup-3.34.1/gnome-initial-setup/gnome-initial-setup.h 2019-10-06 05:03:38.000000000 +0800
{ +++ gnome-initial-setup-3.34.1_new/gnome-initial-setup/gnome-initial-setup.h 2019-11-25 19:53:10.482353002 +0800
GisDriver *driver;
- int status;
+ int status = 0;
GOptionContext *context;
GisDriverMode mode;
@@ -254,6 +224,7 @@
driver = gis_driver_new (mode);
g_signal_connect (driver, "rebuild-pages", G_CALLBACK (rebuild_pages_cb), NULL);
+
status = g_application_run (G_APPLICATION (driver), argc, argv);
g_object_unref (driver);
diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup.h gnome-initial-setup-3.26.0_new/gnome-initial-setup/gnome-initial-setup.h
--- gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup.h 2017-06-14 21:39:03.000000000 +0800
+++ gnome-initial-setup-3.26.0_new/gnome-initial-setup/gnome-initial-setup.h 2019-02-27 18:35:26.507047546 +0800
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
#include "gis-keyring.h" #include "gis-keyring.h"
@ -197,9 +213,9 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup.h
#endif /* __GNOME_INITIAL_SETUP_H__ */ #endif /* __GNOME_INITIAL_SETUP_H__ */
diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/language-setting.c gnome-initial-setup-3.26.0_new/gnome-initial-setup/language-setting.c diff -Nura gnome-initial-setup-3.34.1/gnome-initial-setup/language-setting.c gnome-initial-setup-3.34.1_new/gnome-initial-setup/language-setting.c
--- gnome-initial-setup-3.26.0/gnome-initial-setup/language-setting.c 1970-01-01 08:00:00.000000000 +0800 --- gnome-initial-setup-3.34.1/gnome-initial-setup/language-setting.c 1970-01-01 08:00:00.000000000 +0800
+++ gnome-initial-setup-3.26.0_new/gnome-initial-setup/language-setting.c 2019-02-27 16:05:26.596328724 +0800 +++ gnome-initial-setup-3.34.1_new/gnome-initial-setup/language-setting.c 2019-11-25 19:53:10.482353002 +0800
@@ -0,0 +1,289 @@ @@ -0,0 +1,289 @@
+#include "config.h" +#include "config.h"
+ +
@ -490,9 +506,9 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/language-setting.c gno
+ +
+ return ht; + return ht;
+} +}
diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/language-setting.h gnome-initial-setup-3.26.0_new/gnome-initial-setup/language-setting.h diff -Nura gnome-initial-setup-3.34.1/gnome-initial-setup/language-setting.h gnome-initial-setup-3.34.1_new/gnome-initial-setup/language-setting.h
--- gnome-initial-setup-3.26.0/gnome-initial-setup/language-setting.h 1970-01-01 08:00:00.000000000 +0800 --- gnome-initial-setup-3.34.1/gnome-initial-setup/language-setting.h 1970-01-01 08:00:00.000000000 +0800
+++ gnome-initial-setup-3.26.0_new/gnome-initial-setup/language-setting.h 2019-02-27 16:05:26.596328724 +0800 +++ gnome-initial-setup-3.34.1_new/gnome-initial-setup/language-setting.h 2019-11-25 19:53:10.482353002 +0800
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+#ifndef __CC_COMMON_LANGUAGE_H__ +#ifndef __CC_COMMON_LANGUAGE_H__
+#define __CC_COMMON_LANGUAGE_H__ +#define __CC_COMMON_LANGUAGE_H__
@ -507,10 +523,10 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/language-setting.h gno
+G_END_DECLS +G_END_DECLS
+ +
+#endif +#endif
diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/cc-input-chooser.c gnome-initial-setup-3.26.0_new/gnome-initial-setup/pages/keyboard/cc-input-chooser.c diff -Nura gnome-initial-setup-3.34.1/gnome-initial-setup/pages/keyboard/cc-input-chooser.c gnome-initial-setup-3.34.1_new/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
--- gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/cc-input-chooser.c 2016-10-22 15:09:29.000000000 +0800 --- gnome-initial-setup-3.34.1/gnome-initial-setup/pages/keyboard/cc-input-chooser.c 2019-10-06 05:03:38.000000000 +0800
+++ gnome-initial-setup-3.26.0_new/gnome-initial-setup/pages/keyboard/cc-input-chooser.c 2019-02-27 16:05:26.596328724 +0800 +++ gnome-initial-setup-3.34.1_new/gnome-initial-setup/pages/keyboard/cc-input-chooser.c 2019-11-25 19:53:10.483353011 +0800
@@ -59,6 +59,7 @@ @@ -58,6 +58,7 @@
gboolean showing_extra; gboolean showing_extra;
gchar *locale; gchar *locale;
@ -518,7 +534,7 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/cc-inpu
gchar *id; gchar *id;
gchar *type; gchar *type;
GnomeXkbInfo *xkb_info; GnomeXkbInfo *xkb_info;
@@ -272,8 +273,14 @@ @@ -271,8 +272,14 @@
if (priv->id == NULL || priv->type == NULL) if (priv->id == NULL || priv->type == NULL)
should_be_visible = FALSE; should_be_visible = FALSE;
@ -533,7 +549,7 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/cc-inpu
gtk_widget_set_opacity (widget->checkmark, should_be_visible ? 1.0 : 0.0); gtk_widget_set_opacity (widget->checkmark, should_be_visible ? 1.0 : 0.0);
if (widget->is_extra && should_be_visible) if (widget->is_extra && should_be_visible)
@@ -452,6 +459,14 @@ @@ -451,6 +458,14 @@
widget = get_input_widget (child); widget = get_input_widget (child);
@ -548,7 +564,7 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/cc-inpu
if (!priv->showing_extra && widget->is_extra) if (!priv->showing_extra && widget->is_extra)
return FALSE; return FALSE;
@@ -468,6 +483,9 @@ @@ -467,6 +482,9 @@
GtkListBoxRow *b, GtkListBoxRow *b,
gpointer data) gpointer data)
{ {
@ -558,7 +574,7 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/cc-inpu
InputWidget *la, *lb; InputWidget *la, *lb;
la = get_input_widget (gtk_bin_get_child (GTK_BIN (a))); la = get_input_widget (gtk_bin_get_child (GTK_BIN (a)));
@@ -479,6 +497,18 @@ @@ -478,6 +496,18 @@
if (lb == NULL) if (lb == NULL)
return -1; return -1;
@ -577,7 +593,7 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/cc-inpu
if (la->is_extra && !lb->is_extra) if (la->is_extra && !lb->is_extra)
return 1; return 1;
@@ -751,9 +781,13 @@ @@ -752,9 +782,13 @@
gtk_list_box_set_selection_mode (GTK_LIST_BOX (priv->input_list), gtk_list_box_set_selection_mode (GTK_LIST_BOX (priv->input_list),
GTK_SELECTION_NONE); GTK_SELECTION_NONE);
@ -593,18 +609,18 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/cc-inpu
get_locale_infos (chooser); get_locale_infos (chooser);
#ifdef HAVE_IBUS #ifdef HAVE_IBUS
diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c gnome-initial-setup-3.26.0_new/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c diff -Nura gnome-initial-setup-3.34.1/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c gnome-initial-setup-3.34.1_new/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
--- gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c 2017-06-14 21:39:03.000000000 +0800 --- gnome-initial-setup-3.34.1/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c 2019-10-06 05:03:38.000000000 +0800
+++ gnome-initial-setup-3.26.0_new/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c 2019-02-27 16:05:26.596328724 +0800 +++ gnome-initial-setup-3.34.1_new/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c 2019-11-25 19:53:10.483353011 +0800
@@ -33,6 +33,7 @@ @@ -36,6 +36,7 @@
#include "gis-keyboard-page.h" #include "gis-keyboard-page.h"
#include "keyboard-resources.h" #include "keyboard-resources.h"
#include "cc-input-chooser.h" #include "cc-input-chooser.h"
+#include "cc-common-language.h" +#include "cc-common-language.h"
#define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.gnome.desktop.input-sources" #include "cc-common-language.h"
#define KEY_CURRENT_INPUT_SOURCE "current"
@@ -45,6 +46,7 @@ @@ -52,6 +53,7 @@
GCancellable *cancellable; GCancellable *cancellable;
GPermission *permission; GPermission *permission;
GSettings *input_settings; GSettings *input_settings;
@ -612,7 +628,7 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/gis-key
GSList *system_sources; GSList *system_sources;
}; };
@@ -318,6 +320,29 @@ @@ -437,6 +439,29 @@
update_page_complete (self); update_page_complete (self);
} }
@ -642,7 +658,7 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/gis-key
static void static void
gis_keyboard_page_constructed (GObject *object) gis_keyboard_page_constructed (GObject *object)
{ {
@@ -337,6 +362,7 @@ @@ -456,6 +481,7 @@
g_settings_delay (priv->input_settings); g_settings_delay (priv->input_settings);
priv->cancellable = g_cancellable_new (); priv->cancellable = g_cancellable_new ();
@ -650,7 +666,7 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/gis-key
g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES, G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
@@ -354,7 +380,10 @@ @@ -473,7 +499,10 @@
update_page_complete (self); update_page_complete (self);
@ -662,9 +678,9 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/gis-key
} }
static void static void
diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/language/gis-language-page.c gnome-initial-setup-3.26.0_new/gnome-initial-setup/pages/language/gis-language-page.c diff -Nura gnome-initial-setup-3.34.1/gnome-initial-setup/pages/language/gis-language-page.c gnome-initial-setup-3.34.1_new/gnome-initial-setup/pages/language/gis-language-page.c
--- gnome-initial-setup-3.26.0/gnome-initial-setup/pages/language/gis-language-page.c 2017-06-14 21:39:03.000000000 +0800 --- gnome-initial-setup-3.34.1/gnome-initial-setup/pages/language/gis-language-page.c 2019-10-06 05:03:38.000000000 +0800
+++ gnome-initial-setup-3.26.0_new/gnome-initial-setup/pages/language/gis-language-page.c 2019-02-27 18:41:40.070361981 +0800 +++ gnome-initial-setup-3.34.1_new/gnome-initial-setup/pages/language/gis-language-page.c 2019-11-27 11:11:18.491358283 +0800
@@ -28,17 +28,33 @@ @@ -28,17 +28,33 @@
#define GNOME_SYSTEM_LOCALE_DIR "org.gnome.system.locale" #define GNOME_SYSTEM_LOCALE_DIR "org.gnome.system.locale"
@ -707,7 +723,7 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/language/gis-lan
GCancellable *cancellable; GCancellable *cancellable;
}; };
@@ -103,62 +120,16 @@ @@ -103,11 +120,17 @@
GParamSpec *pspec, GParamSpec *pspec,
gpointer user_data) gpointer user_data)
{ {
@ -718,64 +734,16 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/language/gis-lan
act_user_set_language (ACT_USER (object), new_locale_id); act_user_set_language (ACT_USER (object), new_locale_id);
- -
g_free (new_locale_id); g_free (new_locale_id);
-} +
+ if (!gis_cjk_region)
-static void + {
-language_changed (CcLanguageChooser *chooser,
- GParamSpec *pspec,
- GisLanguagePage *page)
-{
- GisLanguagePagePrivate *priv = gis_language_page_get_instance_private (page);
- GisDriver *driver;
- GSettings *region_settings;
- ActUser *user;
-
- priv->new_locale_id = cc_language_chooser_get_language (chooser);
- driver = GIS_PAGE (page)->driver;
-
- setlocale (LC_MESSAGES, priv->new_locale_id);
- gtk_widget_set_default_direction (gtk_get_locale_direction ());
-
- if (gis_driver_get_mode (driver) == GIS_DRIVER_MODE_NEW_USER) {
- if (g_permission_get_allowed (priv->permission)) {
- set_localed_locale (page);
- }
- else if (g_permission_get_can_acquire (priv->permission)) {
- g_permission_acquire_async (priv->permission,
- NULL,
- change_locale_permission_acquired,
- page);
- }
+ if (!gis_cjk_region) {
+ gis_ensure_stamp_files (); + gis_ensure_stamp_files ();
+ g_application_quit (G_APPLICATION (GIS_PAGE (user_data)->driver)); + g_application_quit (G_APPLICATION (GIS_PAGE (user_data)->driver));
} + }
-
- /* Ensure we won't override the selected language for format strings */
- region_settings = g_settings_new (GNOME_SYSTEM_LOCALE_DIR);
- g_settings_reset (region_settings, REGION_KEY);
- g_object_unref (region_settings);
-
- user = act_user_manager_get_user (act_user_manager_get_default (),
- g_get_user_name ());
- if (act_user_is_loaded (user))
- act_user_set_language (user, priv->new_locale_id);
- else
- g_signal_connect (user,
- "notify::is-loaded",
- G_CALLBACK (user_loaded),
- g_strdup (priv->new_locale_id));
-
- gis_driver_set_user_language (driver, priv->new_locale_id);
-
- gis_welcome_widget_show_locale (GIS_WELCOME_WIDGET (priv->welcome_widget),
- priv->new_locale_id);
-
- gis_driver_locale_changed (driver);
} }
static void static void
@@ -183,67 +154,162 @@ @@ -179,85 +202,161 @@
priv->localed = proxy; priv->localed = proxy;
} }
@ -862,6 +830,20 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/language/gis-lan
- GisLanguagePagePrivate *priv = gis_language_page_get_instance_private (page); - GisLanguagePagePrivate *priv = gis_language_page_get_instance_private (page);
- char *buffer; - char *buffer;
- char *id; - char *id;
- gsize i;
-
- static const struct {
- const char *id;
- const char *logo;
- } id_to_logo[] = {
- { "debian", "emblem-debian" },
- { "fedora", "fedora-logo-icon" },
- { "ubuntu", "ubuntu-logo-icon" },
- { "openSUSE Tumbleweed", "opensuse-logo-icon" },
- { "openSUSE Leap", "opensuse-logo-icon" },
- { "SLED", "suse-logo-icon" },
- { "SLES", "suse-logo-icon" },
- };
+ g_autoptr (GDBusConnection) bus = NULL; + g_autoptr (GDBusConnection) bus = NULL;
+ g_autoptr (GError) error = NULL; + g_autoptr (GError) error = NULL;
+ GDBusProxy *proxy; + GDBusProxy *proxy;
@ -902,7 +884,7 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/language/gis-lan
} }
+} +}
- if (g_strcmp0 (id, "fedora") == 0) - for (i = 0; i < G_N_ELEMENTS (id_to_logo); i++)
+static gboolean +static gboolean
+get_system_language (GisPage *page) +get_system_language (GisPage *page)
+{ +{
@ -926,7 +908,11 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/language/gis-lan
+ get_language_from_config_file (self); + get_language_from_config_file (self);
+ if (self->language != NULL) + if (self->language != NULL)
{ {
- g_object_set (priv->logo, "icon-name", "fedora-logo-icon", NULL); - if (g_strcmp0 (id, id_to_logo[i].id) == 0)
- {
- g_object_set (priv->logo, "icon-name", id_to_logo[i].logo, NULL);
- break;
- }
+ language_acquire = TRUE; + language_acquire = TRUE;
+ priv-> system_language = g_strdup(self->language); + priv-> system_language = g_strdup(self->language);
+ priv->new_locale_id = g_strdup(self->language); + priv->new_locale_id = g_strdup(self->language);
@ -972,24 +958,21 @@ diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/pages/language/gis-lan
+ "notify::is-loaded", + "notify::is-loaded",
+ G_CALLBACK (user_loaded), + G_CALLBACK (user_loaded),
+ page); + page);
+ + gis_driver_set_user_language (driver, priv->new_locale_id, FALSE);
+ gis_driver_set_user_language (driver, priv->new_locale_id);
} }
static void static void
@@ -257,10 +323,6 @@ @@ -271,8 +370,6 @@
G_OBJECT_CLASS (gis_language_page_parent_class)->constructed (object); G_OBJECT_CLASS (gis_language_page_parent_class)->constructed (object);
- update_distro_logo (page); - update_distro_logo (page);
- -
- g_signal_connect (priv->language_chooser, "notify::language", g_signal_connect (priv->language_chooser, "notify::language",
- G_CALLBACK (language_changed), page); G_CALLBACK (language_changed), page);
g_signal_connect (priv->language_chooser, "confirm", g_signal_connect (priv->language_chooser, "confirm",
G_CALLBACK (language_confirmed), page); @@ -297,6 +394,12 @@
}
@@ -283,6 +345,12 @@
}
gis_page_set_complete (GIS_PAGE (page), TRUE); gis_page_set_complete (GIS_PAGE (page), TRUE);
+ +

12
gnome-initial-setup.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sun Jan 5 14:19:39 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 3.34.3:
+ Updated translations.
-------------------------------------------------------------------
Tue Nov 26 06:55:54 UTC 2019 - Cliff Zhao <qzhao@suse.com>
- Update gnome-initial-setup-smarter.patch: Rebase to
gnome-initial-setup-3.34.1 for SLE-15-SP2 build(bnc#1156952).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 24 09:47:45 UTC 2019 - Cliff Zhao <qzhao@suse.com> Thu Oct 24 09:47:45 UTC 2019 - Cliff Zhao <qzhao@suse.com>

2
gnome-initial-setup.spec
View File

@ -17,7 +17,7 @@
Name: gnome-initial-setup Name: gnome-initial-setup
Version: 3.34.1 Version: 3.34.3
Release: 0 Release: 0
Summary: GNOME Initial Setup Assistant Summary: GNOME Initial Setup Assistant
License: GPL-2.0-or-later License: GPL-2.0-or-later