Merge lp:~thumper/nux/dont-leak-ibus into lp:nux/2.0

[Tim Penhey]

= Problem description =

Unity failed to compile cleanly as nux was exposing the ibus.h header through the includes.

Also make check failed if I didn't have ibus set up with at least one language.

= The fix =

Only include the IM header in the source file.
Early exit in the tests.

= Test coverage =

Existing xtest-text-entry test for ibus input.

[Brandon Schaefer (brandontschaefer)]

+1

review: Approve

=== modified file 'Nux/TextEntry.cpp'
--- Nux/TextEntry.cpp	2012-02-23 05:13:46 +0000
+++ Nux/TextEntry.cpp	2012-02-23 08:59:49 +0000
@@ -30,6 +30,7 @@
 
 #if defined(NUX_OS_LINUX)
 #include <X11/cursorfont.h>
+#include "InputMethodIBus.h"
 #endif
 
 namespace nux

=== modified file 'Nux/TextEntry.h'
--- Nux/TextEntry.h	2012-02-23 05:13:46 +0000
+++ Nux/TextEntry.h	2012-02-23 08:59:49 +0000
@@ -25,9 +25,6 @@
 #include "pango/pango.h"
 #include "pango/pangocairo.h"
 #include "NuxImage/CairoGraphics.h"
-#if defined(NUX_OS_LINUX)
-#include "InputMethodIBus.h"
-#endif
 
 namespace nux
 {

=== modified file 'tests/xtest-text-entry.cpp'
--- tests/xtest-text-entry.cpp	2012-02-23 05:13:46 +0000
+++ tests/xtest-text-entry.cpp	2012-02-23 08:59:49 +0000
@@ -22,6 +22,7 @@
 #include "Nux/WindowThread.h"
 #include "Nux/VLayout.h"
 #include "Nux/TextEntry.h"
+#include "Nux/InputMethodIBus.h"
 #include "Nux/ProgramFramework/ProgramTemplate.h"
 #include "Nux/ProgramFramework/TestView.h"
 #include <X11/extensions/XTest.h>
@@ -90,8 +91,10 @@
 bool SetEngineActive (IBusBus* bus_, std::string engine)
 {
     GList* engines = ibus_bus_list_active_engines(bus_);
+    if (!engines)
+      return false;
+
     GList* start = engines;
-
     bool found = false;
     gboolean global_flag = ibus_bus_get_use_global_engine(bus_);
 
@@ -101,21 +104,27 @@
       IBusEngineDesc *engine_desc = IBUS_ENGINE_DESC (engines->data);
 
       // Found Engine, make it active!
-      if (g_strcmp0(ibus_engine_desc_get_name(engine_desc), engine.c_str()) == 0)
+      if (engine == ibus_engine_desc_get_name(engine_desc))
       {
-        found = true; 
+        found = true;
 
         // Set ibus to use global engines
         if (!global_flag)
-          ibus_config_set_value (ibus_bus_get_config(bus_), "general", "use_global_engine", g_variant_new_boolean(true));
+          ibus_config_set_value(ibus_bus_get_config(bus_),
+                                "general",
+                                "use_global_engine",
+                                g_variant_new_boolean(true));
 
         // Set and activate the engine
-        ibus_bus_set_global_engine(bus_,engine.c_str());
+        ibus_bus_set_global_engine(bus_, engine.c_str());
       }
     } while ((engines = g_list_next(engines)) != NULL);
 
-    // Restores the global setting back to what it was 
-    ibus_config_set_value (ibus_bus_get_config(bus_), "general", "use_global_engine", g_variant_new_boolean(global_flag));
+    // Restores the global setting back to what it was
+    ibus_config_set_value(ibus_bus_get_config(bus_),
+                          "general",
+                          "use_global_engine",
+                          g_variant_new_boolean(global_flag));
 
     g_list_free(start);
     return found;
@@ -255,7 +264,7 @@
     bool active = false;
   
     // Test for ibus-pinyin 
-    if (SetEngineActive(bus_,"pinyin"))
+    if (bus_ && SetEngineActive(bus_,"pinyin"))
     {
       // Type random stuff
       {
@@ -305,7 +314,7 @@
     }
 
     // Test for ibus-hangul    
-    if (SetEngineActive(bus_,"hangul"))
+    if (bus_ && SetEngineActive(bus_,"hangul"))
     {   
       // Test for the the space in ibus-hangul working correctlly 
       {
@@ -328,8 +337,8 @@
     }
 
     // Checking for ibus-anthy - Japanese
-    if (SetEngineActive(bus_,"anthy"))
-    {   
+    if (bus_ && SetEngineActive(bus_,"anthy"))
+    {
       {
         test.ViewSendString("shisutemu ");
         nux::SleepForMilliseconds(500);
@@ -344,6 +353,7 @@
         nux::SleepForMilliseconds(500);
 
         test.ViewSendDelete();
+
         nux::SleepForMilliseconds(500);
       }