Merge lp:~brandontschaefer/nux/remove-gconf-ibus-1.5 into lp:nux

[Brandon Schaefer]

Get nux ready for ibus 1.5.

ibus 1.5 does not use gconf any more to store its settings. It uses gsettings, so we need to move over to using its scheme.

For now remove the gconf stuff, to be later added back in.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:804
http://jenkins.qa.ubuntu.com/job/nux-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-armhf-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/62/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

I was looking at the new API, while the most things hould be the same, shoulnd't just be enough to call ibus_config_watch (to filter out the unwanted values) and connect to the "value-changed" signal?

I'd prefer to replace this code at the same time we remove the legacy one...

[Marco Trevisan (Treviño) (3v1n0)]

There's really no dependency on gconf here, just reading the new org.freedesktop.ibus.general.hotkey value should be enough now...

review: Needs Fixing

[Brandon Schaefer (brandontschaefer)]

Yes you are right, new branch here:
https://code.launchpad.net/~brandontschaefer/nux/fix-ibus1.5-changes/+merge/177971

Unmerged revisions

804. By Brandon Schaefer on 2013-07-26

* Remove ibus gconf usage. To get ready for ibus 1.5

=== modified file 'Nux/InputMethodIBus.cpp'
--- Nux/InputMethodIBus.cpp	2012-10-18 22:14:37 +0000
+++ Nux/InputMethodIBus.cpp	2013-07-26 17:47:29 +0000
@@ -163,23 +163,12 @@
       ibus_input_context_focus_in(context_);
 
     UpdateCursorLocation();
-
-    IBusConfig* bus_conf = ibus_bus_get_config(bus_);
-    g_signal_handlers_disconnect_by_func(bus_conf, reinterpret_cast<gpointer>(OnConfigChanged_), this);
-    g_signal_connect(bus_conf, "value-changed", G_CALLBACK(OnConfigChanged_), this);
-    UpdateHotkeys();
   }
 
   void IBusIMEContext::DestroyContext()
   {
     //nuxDebugMsg("***IBusIMEContext::DestroyContext***");
 
-    if (ibus_bus_is_connected(bus_))
-    {
-      IBusConfig* bus_conf = ibus_bus_get_config(bus_);
-      g_signal_handlers_disconnect_by_func(bus_conf, reinterpret_cast<gpointer>(OnConfigChanged_), this);
-    }
-
     if (!context_)
       return;
 
@@ -232,11 +221,7 @@
 
   void IBusIMEContext::OnConfigChanged(IBusConfig* /* config */, gchar* section, gchar* name, GVariant* /* value */)
   {
-    if (g_strcmp0(section, "general/hotkey") == 0)
-    {
-      if (g_strcmp0(name, "trigger") == 0)
-        UpdateHotkeys();
-    }
+    // FIXME Move over to gsettings as ibus 1.5 no longer uses gconf
   }
 
   void IBusIMEContext::OnCommitText(IBusInputContext * /* context */, IBusText* text)
@@ -480,13 +465,7 @@
 
   void IBusIMEContext::UpdateHotkeys()
   {
-    IBusConfig* conf = ibus_bus_get_config(bus_);
-    GVariant* val = ibus_config_get_value(conf, "general", "hotkey/trigger");
-    const gchar** keybindings = g_variant_get_strv(val, NULL);
-
-    hotkeys_ = ParseIBusHotkeys(keybindings);
-
-    g_variant_unref(val);
+    // FIXME Move over to use gsettings, as ibus 1.5 no longer uses gconf
   }
 
   bool IBusIMEContext::IsHotkeyEvent(EventType type, unsigned long keysym, unsigned long modifiers) const