Merge lp:~brandontschaefer/nux/input-method-memory-leak-fix into lp:nux

[Brandon Schaefer]

Need to unref the bus, and need to free the keybindings when we are done.

Need to unref the bus, and need to free the keybindings when we are done.

[lp:~brandontschaefer/nux/input-method-memory-leak-fix]

858. By Brandon Schaefer on 2015-04-22

* Clean up the memory leak fixes to be better. Thanks Trevinho!

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

Good catch.
+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:857
http://jenkins.qa.ubuntu.com/job/nux-ci/117/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-vivid-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-vivid-i386-ci/3

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

review: Approve (continuous-integration)

=== modified file 'Nux/InputMethodIBus.cpp'
--- Nux/InputMethodIBus.cpp	2014-03-23 09:59:47 +0000
+++ Nux/InputMethodIBus.cpp	2015-04-22 16:48:57 +0000
@@ -32,7 +32,6 @@
 {
   DECLARE_LOGGER(logger, "nux.inputmethod.ibus");
 }
-
   std::vector<Event> IBusIMEContext::hotkeys_;
 
   IBusBus* IBusIMEContext::bus_ = NULL;
@@ -44,10 +43,15 @@
     , is_focused_(false)
   {
     // init ibus
-    if (!bus_)
+    if (!G_OBJECT(bus_))
     {
       ibus_init();
       bus_ = ibus_bus_new();
+      g_object_add_weak_pointer(G_OBJECT(bus_), reinterpret_cast<gpointer*>(&bus_));
+    }
+    else
+    {
+      g_object_ref(bus_);
     }
 
     // connect bus signals
@@ -69,6 +73,7 @@
     DestroyContext();
     g_signal_handlers_disconnect_by_data(bus_, this);
     g_object_unref(cancellable_);
+    g_object_unref(bus_);
   }
 
   void IBusIMEContext::Focus()
@@ -503,6 +508,7 @@
       hotkeys_ = ParseIBusHotkeys(keybindings);
 
       g_variant_unref(val);
+      g_free(keybindings);
     }
   }