Merge lp:~attente/unity-control-center/1430971 into lp:unity-control-center

[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.

[Sebastien Bacher (seb128)]

thanks

review: Approve

[lp:~attente/unity-control-center/1430971]

12810. By William Hua on 2015-03-13

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. Fixes: #1430971
Approved by: Sebastien Bacher

=== modified file 'debian/control'
--- debian/control	2015-02-12 14:09:23 +0000
+++ debian/control	2015-03-12 22:02:03 +0000
@@ -68,7 +68,6 @@
          accountsservice,
          apg,
          desktop-file-utils,
-         fcitx-data,
          gkbd-capplet (>= 3.5.90),
          gnome-desktop3-data,
          adwaita-icon-theme,
@@ -109,7 +108,7 @@
           gnome-user-guide | ubuntu-docs,
           gstreamer0.10-pulseaudio,
           libcanberra-gtk-module,
-          x11-xserver-utils
+          x11-xserver-utils,
 Provides: unity-control-center-datetime,
           gnome-control-center-unity,
 Description: utilities to configure the GNOME desktop
 
=== modified file 'panels/region/gnome-region-panel-input.c'
--- panels/region/gnome-region-panel-input.c	2014-09-17 15:29:58 +0000
+++ panels/region/gnome-region-panel-input.c	2015-03-12 22:02:03 +0000
@@ -120,6 +120,7 @@
 struct _FcitxShareStateConfig
 {
   FcitxGenericConfig config;
+  gboolean config_valid;
   gint share_state;
 };
 
@@ -1733,6 +1734,9 @@
 static void
 save_fcitx_config (void)
 {
+  if (!fcitx_config.config_valid)
+    return;
+
   FILE *file = FcitxXDGGetFileUserWithPrefix (NULL, "config", "w", NULL);
   FcitxConfigSaveConfigFileFp (file, &fcitx_config.config, get_fcitx_config_desc ());
 
@@ -1745,20 +1749,27 @@
 static void
 load_fcitx_config (void)
 {
-  static gboolean loaded = FALSE;
+  static gboolean attempted = FALSE;
 
-  if (loaded)
+  if (attempted)
     return;
 
-  FILE *file = FcitxXDGGetFileUserWithPrefix (NULL, "config", "r", NULL);
-  FcitxConfigFile *config_file = FcitxConfigParseConfigFileFp (file, get_fcitx_config_desc ());
-  FcitxShareStateConfigConfigBind (&fcitx_config, config_file, get_fcitx_config_desc ());
-  FcitxConfigBindSync (&fcitx_config.config);
-
-  if (file)
-    fclose (file);
-
-  loaded = TRUE;
+  FcitxConfigFileDesc *config_file_desc = get_fcitx_config_desc ();
+
+  if (config_file_desc)
+    {
+      FILE *file = FcitxXDGGetFileUserWithPrefix (NULL, "config", "r", NULL);
+
+      FcitxConfigFile *config_file = FcitxConfigParseConfigFileFp (file, config_file_desc);
+      FcitxShareStateConfigConfigBind (&fcitx_config, config_file, config_file_desc);
+      FcitxConfigBindSync (&fcitx_config.config);
+      fcitx_config.config_valid = TRUE;
+
+      if (file)
+        fclose (file);
+    }
+
+  attempted = TRUE;
 }
 
 static void