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

[Brandon Schaefer]

Use a temp buf to poke for the size of string vs passing nullptr. For some reason this was working for most cases, but not greek. Using a temp buf allows us to poke the greeks chars and others that werent working.

Use a temp buf to poke for the size of string vs passing nullptr. For some reason this was working for most cases, but not greek. Using a temp buf allows us to poke the greeks chars and others that werent working.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

LGTM. Greek letters are now getting outputted in the Dash.

review: Approve

=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
--- NuxGraphics/GraphicsDisplayX11.cpp	2013-07-18 23:07:45 +0000
+++ NuxGraphics/GraphicsDisplayX11.cpp	2013-08-28 01:37:40 +0000
@@ -1724,13 +1724,14 @@
         if (!skip)
         {
           int num_char_stored = 0;
+
           if (m_xim_controller->IsXICValid())
           {
             delete[] m_pEvent->dtext;
             m_pEvent->dtext = nullptr;
 
-            num_char_stored = XmbLookupString(m_xim_controller->GetXIC(), &xevent.xkey, nullptr,
-                                              0, (KeySym*) &m_pEvent->x11_keysym, nullptr);
+            num_char_stored = XmbLookupString(m_xim_controller->GetXIC(), &xevent.xkey, buffer,
+                                              NUX_EVENT_TEXT_BUFFER_SIZE, (KeySym*) &m_pEvent->x11_keysym, nullptr);
 
             if (num_char_stored > 0)
             {
@@ -1754,6 +1755,12 @@
           }
         }
 
+        if (m_pEvent->dtext == nullptr)
+        {
+          m_pEvent->dtext = new char[NUX_EVENT_TEXT_BUFFER_SIZE];
+          m_pEvent->dtext[0] = 0;
+        }
+
         break;
       }