Hello community,

here is the log from the commit of package gnome-initial-setup for 
openSUSE:Factory checked in at 2017-11-15 16:59:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-initial-setup (Old)
 and      /work/SRC/openSUSE:Factory/.gnome-initial-setup.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gnome-initial-setup"

Wed Nov 15 16:59:19 2017 rev:21 rq:541785 version:3.26.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-initial-setup/gnome-initial-setup.changes  
2017-09-15 22:31:46.323571438 +0200
+++ 
/work/SRC/openSUSE:Factory/.gnome-initial-setup.new/gnome-initial-setup.changes 
    2017-11-15 16:59:30.896265067 +0100
@@ -1,0 +2,7 @@
+Thu Nov  9 13:29:30 UTC 2017 - qz...@suse.com
+
+- Add gnome-initial-setup-mozc-engine-prioritized.patch: Make the 
+  Mozc input engine as the 1st choice for Japanese environment
+  (boo#1067288,bnc#1029083). 
+
+-------------------------------------------------------------------

New:
----
  gnome-initial-setup-mozc-engine-prioritized.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-initial-setup.spec ++++++
--- /var/tmp/diff_new_pack.iCnyBM/_old  2017-11-15 16:59:31.716235044 +0100
+++ /var/tmp/diff_new_pack.iCnyBM/_new  2017-11-15 16:59:31.716235044 +0100
@@ -30,6 +30,8 @@
 Patch1:         gnome-initial-setup-only-setup-keyboard.patch
 # PATCH-FEATURE-SLE gnome-initial-setup-disable-dep-on-started-docs.patch 
FATE#321126 yfji...@suse.com -- Disable help dialog after g-i-s system to break 
the dependency of gnome-getting-started-docs
 Patch2:         gnome-initial-setup-disable-dep-on-started-docs.patch
+# PATCH-FIX-OPENSUSE gnome-initial-setup-mozc-engine-prioritized.patch 
boo#1067288 bnc#1029083 qz...@suse.com -- Make the Mozc input engine as the 1st 
choice for Japanese environment.
+Patch3:         gnome-initial-setup-mozc-engine-prioritized.patch
 BuildRequires:  intltool >= 0.40
 BuildRequires:  krb5-devel
 BuildRequires:  vala
@@ -75,6 +77,7 @@
 %patch1 -p1
 %patch2 -p1
 %endif
+%patch3 -p1
 
 %build
 %configure

++++++ gnome-initial-setup-mozc-engine-prioritized.patch ++++++
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
--- 
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.26.0_new/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
        2017-11-10 14:43:56.748638684 +0800
@@ -274,6 +274,14 @@
                should_be_visible = FALSE;
        else
                should_be_visible = g_strcmp0 (widget->id, priv->id) == 0 && 
g_strcmp0 (widget->type, priv->type) == 0;
+
+        if ((g_strcmp0 (widget->id, "jp") == 0) && 
+           (g_strcmp0 (priv->id, "jp") == 0))
+                should_be_visible = FALSE;
+
+        if (g_strcmp0 (widget->id, "mozc-jp") == 0)
+                should_be_visible = TRUE;
+
         gtk_widget_set_opacity (widget->checkmark, should_be_visible ? 1.0 : 
0.0);
 
         if (widget->is_extra && should_be_visible)
@@ -452,6 +460,13 @@
 
         widget = get_input_widget (child);
 
+        if((g_strcmp0 (widget->id, "mozc-jp") == 0) ||
+           (g_strcmp0 (widget->id, "anthy") == 0))
+                return TRUE;
+
+        if(g_strcmp0 (widget->id, "Japanese (Mozc)") == 0)
+                return FALSE;
+
         if (!priv->showing_extra && widget->is_extra)
                 return FALSE;
 
@@ -479,6 +494,14 @@
         if (lb == NULL)
                 return -1;
 
+        if (g_strcmp0 (la->id, "mozc-jp") == 0 ||
+            g_strcmp0 (la->id, "anthy")   == 0)
+                return -1;
+
+        if (g_strcmp0 (lb->id, "mozc-jp") == 0 ||
+            g_strcmp0 (lb->id, "anthy")   == 0)
+                return 1;
+
         if (la->is_extra && !lb->is_extra)
                 return 1;
 

Reply via email to