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

Proposed by William Hua on 2015-03-27
Status: Merged
Approved by: Sebastien Bacher on 2015-04-03
Approved revision: 12814
Merged at revision: 12812
Proposed branch: lp:~attente/unity-control-center/1431811
Merge into: lp:unity-control-center
Diff against target: 25 lines (+5/-2)
1 file modified
panels/region/gnome-region-panel-input.c (+5/-2)
To merge this branch: bzr merge lp:~attente/unity-control-center/1431811
Reviewer Review Type Date Requested Status
Sebastien Bacher 2015-03-27 Approve on 2015-04-03
Review via email: mp+254403@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

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

review: Needs Fixing
12814. By William Hua on 2015-03-31

Undo deprecation fixes.

Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panels/region/gnome-region-panel-input.c'
2--- panels/region/gnome-region-panel-input.c 2015-03-12 21:12:22 +0000
3+++ panels/region/gnome-region-panel-input.c 2015-03-31 16:40:28 +0000
4@@ -1610,7 +1610,8 @@
5 static void
6 clear_fcitx (void)
7 {
8- FcitxConfigFree (&fcitx_config.config);
9+ if (fcitx_config.config_valid)
10+ FcitxConfigFree (&fcitx_config.config);
11
12 if (fcitx_cancellable)
13 g_cancellable_cancel (fcitx_cancellable);
14@@ -1864,8 +1865,10 @@
15 #endif
16
17 #ifdef HAVE_FCITX
18- fcitx_init ();
19 is_fcitx_active = g_strcmp0 (module, GTK_IM_MODULE_FCITX) == 0;
20+
21+ if (is_fcitx_active)
22+ fcitx_init ();
23 #endif
24
25 populate_with_active_sources (store);

Subscribers

People subscribed via source and target branches