Merge lp:~brandontschaefer/nux/ibus-active-reset into lp:nux/2.0

[Brandon Schaefer]

ime_active was not getting reset when the ime context was getting destroyed, that is fixed.

=== Problem ===
TextEntry::ime_active was not getting reset when ibus context gets destroyed. This would leave the bool ime_active in the incorrect state.

=== Fix ===
Reset the value the context gets created.

=== Test ===
This was caught by a new ibus ap test, so that test will cover this.

[Thomi Richards (thomir-deactivatedaccount)]

+1 from me.

review: Approve

[Jay Taoko (jaytaoko)]

+1

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'Nux/InputMethodIBus.cpp'
--- Nux/InputMethodIBus.cpp	2012-04-02 19:57:53 +0000
+++ Nux/InputMethodIBus.cpp	2012-04-19 23:00:26 +0000
@@ -29,7 +29,7 @@
 {
   IBusBus* IBusIMEContext::bus_ = NULL;
 
-  IBusIMEContext::IBusIMEContext(TextEntry* text_entry) 
+  IBusIMEContext::IBusIMEContext(TextEntry* text_entry)
     : text_entry_(text_entry),
       context_(NULL),
       is_focused_(false)
@@ -139,6 +139,8 @@
       return;
     }
 
+    text_entry_->ime_active_ = false;
+
     // connect input context signals
     g_signal_connect(context_, "commit-text",         G_CALLBACK(OnCommitText_),        this);
     g_signal_connect(context_, "update-preedit-text", G_CALLBACK(OnUpdatePreeditText_), this);
@@ -165,6 +167,7 @@
     if (!context_)
       return;
 
+    text_entry_->ResetPreedit();
     ibus_proxy_destroy(reinterpret_cast<IBusProxy *>(context_));
 
     nuxAssert(!context_);
@@ -174,7 +177,7 @@
   {
     nux::Rect strong, weak;
     text_entry_->GetCursorRects(&strong, &weak);
-    
+
     // Get the position of the TextEntry in the Window.
     nux::Geometry geo = text_entry_->GetAbsoluteGeometry();
 
@@ -215,7 +218,7 @@
     nuxAssert(context_ == context);
 
     text_entry_->DeleteSelection();
-    
+
     if (text->text)
     {
       int cursor = text_entry_->cursor_;
@@ -320,7 +323,6 @@
   {
     //nuxDebugMsg("***IBusIMEContext::OnDisable***");
     nuxAssert(context_ == context);
-
     text_entry_->ime_active_ = false;
     text_entry_->ResetPreedit();
     text_entry_->QueueRefresh (true, true);
@@ -348,7 +350,7 @@
 
       if (error != NULL)
       {
-        g_warning ("Process Key Event failed: %s.", error->message); 
+        g_warning ("Process Key Event failed: %s.", error->message);
         g_error_free (error);
       }