[gnome-initial-setup/shell/4765: 345/362] summary: forward current user language to the tutorial



commit 062231d1c7ef06ae07329a27c60f6a25510a4ff3
Author: Cosimo Cecchi <cosimo endlessm com>
Date:   Fri Feb 20 18:54:53 2015 -0800

    summary: forward current user language to the tutorial
    
    [endlessm/eos-shell#4620]
    
    Conflicts:
        gnome-initial-setup/pages/summary/com.endlessm.Tutorial.FBERemote.xml
        gnome-initial-setup/pages/summary/gis-summary-page.c

 .../summary/com.endlessm.Tutorial.FBERemote.xml    |    4 +++-
 .../pages/summary/gis-summary-page.c               |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gnome-initial-setup/pages/summary/com.endlessm.Tutorial.FBERemote.xml 
b/gnome-initial-setup/pages/summary/com.endlessm.Tutorial.FBERemote.xml
index ff4d38d..a2b2a63 100644
--- a/gnome-initial-setup/pages/summary/com.endlessm.Tutorial.FBERemote.xml
+++ b/gnome-initial-setup/pages/summary/com.endlessm.Tutorial.FBERemote.xml
@@ -2,6 +2,8 @@
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";>
 <node>
   <interface name="com.endlessm.Tutorial.FBERemote">
-    <method name="PlayTutorial" />
+    <method name="PlayTutorial">
+      <arg type="s" direction="in" name="language"/>
+    </method>
   </interface>
 </node>
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c 
b/gnome-initial-setup/pages/summary/gis-summary-page.c
index e8ad213..8aebbdb 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -263,7 +263,8 @@ launch_tutorial (GisSummaryPage *summary)
   /* use g_dbus_proxy_call() to specify a custom timeout */
   g_dbus_proxy_call (G_DBUS_PROXY (fbe_remote),
                      "PlayTutorial",
-                     g_variant_new ("()"),
+                     g_variant_new ("(s)",
+                                    gis_driver_get_user_language (GIS_PAGE (summary)->driver)),
                      G_DBUS_CALL_FLAGS_NONE,
                      G_MAXINT,
                      NULL, /* cancellable */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]