Merge lp:~attente/unity-settings-daemon/1430971 into lp:unity-settings-daemon

[William Hua]

Remove fcitx-data from Recommends and check if the required file, config.desc, is available at runtime. Trying to dist-upgrade currently pulls in the fcitx-bin which is higher priority than ibus.

Remove fcitx-data from Recommends and check if the required file, config.desc, is available at runtime. Trying to dist-upgrade currently pulls in the fcitx-bin which is higher priority than ibus.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4071
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/59/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-vivid-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-vivid-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/59/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-02-12 15:37:32 +0000
+++ debian/control	2015-03-12 22:01:50 +0000
@@ -58,8 +58,7 @@
          nautilus-data (>= 2.91.3-1),
          gnome-settings-daemon-schemas (>= 3.8), 
          gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140224),
-Recommends: fcitx-data,
-            ibus (>= 1.5.0),
+Recommends: ibus (>= 1.5.0),
             pulseaudio,
             systemd-services
 Pre-Depends: ${misc:Pre-Depends}

=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
--- plugins/keyboard/gsd-keyboard-manager.c	2015-02-12 15:37:32 +0000
+++ plugins/keyboard/gsd-keyboard-manager.c	2015-03-12 22:01:50 +0000
@@ -1566,32 +1566,36 @@
 static void
 update_share_state_from_per_window (GsdKeyboardManager *manager)
 {
-        /* Set Fcitx' share state setting based on the GSettings per-window option. */
-        GSettings *settings = g_settings_new ("org.gnome.libgnomekbd.desktop");
-        gboolean per_window = g_settings_get_boolean (settings, "group-per-window");
-
-        FcitxShareStateConfig config = { { NULL } };
-
-        /* Load the user's Fcitx configuration. */
-        FILE *file = FcitxXDGGetFileUserWithPrefix (NULL, "config", "r", NULL);
-        FcitxConfigFile *config_file = FcitxConfigParseConfigFileFp (file, get_fcitx_config_desc ());
-        FcitxShareStateConfigConfigBind (&config, config_file, get_fcitx_config_desc ());
-
-        if (file)
-                fclose (file);
-
-        config.share_state = per_window ? 0 : 1;
-
-        /* Save the user's Fcitx configuration. */
-        file = FcitxXDGGetFileUserWithPrefix (NULL, "config", "w", NULL);
-        FcitxConfigSaveConfigFileFp (file, &config.config, get_fcitx_config_desc ());
-
-        if (file)
-                fclose (file);
-
-        fcitx_input_method_reload_config (manager->priv->fcitx);
-
-        g_object_unref (settings);
+        FcitxConfigFileDesc *config_file_desc = get_fcitx_config_desc ();
+
+        if (config_file_desc) {
+                /* Set Fcitx' share state setting based on the GSettings per-window option. */
+                GSettings *settings = g_settings_new ("org.gnome.libgnomekbd.desktop");
+                gboolean per_window = g_settings_get_boolean (settings, "group-per-window");
+
+                FcitxShareStateConfig config = { { NULL } };
+
+                /* Load the user's Fcitx configuration. */
+                FILE *file = FcitxXDGGetFileUserWithPrefix (NULL, "config", "r", NULL);
+                FcitxConfigFile *config_file = FcitxConfigParseConfigFileFp (file, config_file_desc);
+                FcitxShareStateConfigConfigBind (&config, config_file, config_file_desc);
+
+                if (file)
+                        fclose (file);
+
+                config.share_state = per_window ? 0 : 1;
+
+                /* Save the user's Fcitx configuration. */
+                file = FcitxXDGGetFileUserWithPrefix (NULL, "config", "w", NULL);
+                FcitxConfigSaveConfigFileFp (file, &config.config, config_file_desc);
+
+                if (file)
+                        fclose (file);
+
+                fcitx_input_method_reload_config (manager->priv->fcitx);
+
+                g_object_unref (settings);
+        }
 }
 
 static void