Merge lp:~brandontschaefer/nux/lp.1047944-fix into lp:nux

[Brandon Schaefer]

Gracefully handle ibus_bus_get_config returning NULL

ibus_bus_get_config can return NULL in two cases:
1) !ibus_bus_is_connected
2) The configuration daemon at dbus name org.freedesktop.IBus.Config is
   not available

The current nux code does not gracefully handle NULL being returned, and
crashes, as can be seen in bug 1047944.

Fixed by mterry in this branch:
https://code.launchpad.net/~mterry/nux/null-ibus-config/+merge/129212

Outdated, as we missed reviewing it :(, re-did the branch!

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

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/nux-autolanding/38/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2256
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-amd64-autolanding/18
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-armhf-autolanding/18/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-i386-autolanding/19

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Seems to be some transient issue. Re-approving.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Nux/InputMethodIBus.cpp'
--- Nux/InputMethodIBus.cpp	2013-08-01 00:05:21 +0000
+++ Nux/InputMethodIBus.cpp	2013-09-17 17:57:19 +0000
@@ -165,8 +165,14 @@
     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);
+
+    // may be null if not connected to bus or can't get ibus name
+    if (bus_conf)
+    {
+      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();
   }
 
@@ -177,7 +183,12 @@
     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);
+
+      // may be null if not connected to bus or can't get ibus name
+      if (bus_conf)
+      {
+        g_signal_handlers_disconnect_by_func(bus_conf, reinterpret_cast<gpointer>(OnConfigChanged_), this);
+      }
     }
 
     if (!context_)
@@ -481,12 +492,17 @@
   void IBusIMEContext::UpdateHotkeys()
   {
     IBusConfig* conf = ibus_bus_get_config(bus_);
-    GVariant* val = ibus_config_get_value(conf, "general/hotkey", "triggers");
-    const gchar** keybindings = g_variant_get_strv(val, NULL);
-
-    hotkeys_ = ParseIBusHotkeys(keybindings);
-
-    g_variant_unref(val);
+
+    // may be null if not connected to bus or can't get ibus name
+    if (conf)
+    {
+      GVariant* val = ibus_config_get_value(conf, "general/hotkey", "triggers");
+      const gchar** keybindings = g_variant_get_strv(val, NULL);
+
+      hotkeys_ = ParseIBusHotkeys(keybindings);
+
+      g_variant_unref(val);
+    }
   }
 
   bool IBusIMEContext::IsHotkeyEvent(EventType type, unsigned long keysym, unsigned long modifiers) const