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

[William Hua]

Don't free the Fcitx config proxy if we haven't ever initialized it.

Don't free the Fcitx config proxy if we haven't ever initialized it.

[Sebastien Bacher (seb128)]

thanks, can you split the deprecation warning fix in another request?

review: Needs Fixing

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

12814. By William Hua on 2015-03-31

Undo deprecation fixes.

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'panels/region/gnome-region-panel-input.c'
--- panels/region/gnome-region-panel-input.c	2015-03-12 21:12:22 +0000
+++ panels/region/gnome-region-panel-input.c	2015-03-31 16:40:28 +0000
@@ -1610,7 +1610,8 @@
 static void
 clear_fcitx (void)
 {
-  FcitxConfigFree (&fcitx_config.config);
+  if (fcitx_config.config_valid)
+    FcitxConfigFree (&fcitx_config.config);
 
   if (fcitx_cancellable)
     g_cancellable_cancel (fcitx_cancellable);
@@ -1864,8 +1865,10 @@
 #endif
 
 #ifdef HAVE_FCITX
-  fcitx_init ();
   is_fcitx_active = g_strcmp0 (module, GTK_IM_MODULE_FCITX) == 0;
+
+  if (is_fcitx_active)
+    fcitx_init ();
 #endif
 
   populate_with_active_sources (store);