Merge lp:~brandontschaefer/unity/fix-867885 into lp:unity

[Brandon Schaefer]

Fixed the problem with the ibus window and text disappearing. Also now the ibus preedit text gets highlighted like it usually does when used else where.

[Neil J. Patel (njpatel)]

review: Approve

=== modified file 'plugins/unityshell/src/DashSearchBar.cpp'
--- plugins/unityshell/src/DashSearchBar.cpp	2011-09-29 08:16:37 +0000
+++ plugins/unityshell/src/DashSearchBar.cpp	2011-10-10 05:53:24 +0000
@@ -184,7 +184,8 @@
                                        (GSourceFunc)&OnLiveSearchTimeout,
                                        this);
 
-  bool is_empty = pango_entry_->GetText() == "";
+ 
+  bool is_empty = pango_entry_->im_active() ? false : pango_entry_->GetText() == ""; 
   hint_->SetVisible(is_empty);
   spinner_->SetState(is_empty ? STATE_READY : STATE_SEARCHING);
 

=== modified file 'plugins/unityshell/src/IMTextEntry.cpp'
--- plugins/unityshell/src/IMTextEntry.cpp	2011-09-29 08:16:37 +0000
+++ plugins/unityshell/src/IMTextEntry.cpp	2011-10-10 05:53:24 +0000
@@ -243,16 +243,6 @@
   LOG_DEBUG(logger) << "Commit: " << str;
   DeleteSelection();
 
-  /* remove preedit text and set cursor to previous position */
-  if (preedit_cursor_) {
-    std::string new_text = GetText();
-    new_text.replace(cursor_, preedit_cursor_, "");
-    int cursor = cursor_;
-    SetText(new_text.c_str());
-    SetCursor(cursor);
-    preedit_cursor_ = 0;
-  }
-
   if (str)
   {
     std::string new_text = GetText();
@@ -270,49 +260,36 @@
   glib::String preedit;
   int cursor_pos = -1;
 
-  gtk_im_context_get_preedit_string(context, &preedit, NULL, &cursor_pos);
+  gtk_im_context_get_preedit_string(context, &preedit, &preedit_attrs_, &cursor_pos);
 
   LOG_DEBUG(logger) << "Preedit changed: " << preedit;
 
-  preedit_string = preedit.Str();
+  _preedit = preedit.Str();
 
   if (strlen(preedit.Str().c_str())) {
-    DeleteSelection();
-    std::string new_text = GetText();
-    new_text.replace(cursor_, preedit_cursor_, preedit.Str());
-    int cursor = cursor_;
-    SetText(new_text.c_str());
-    SetCursor(cursor);
     preedit_cursor_ = preedit.Str().length();
+    QueueRefresh(true, true); 
+    sigTextChanged.emit(this);
     UpdateCursorLocation();
   }
 }
 
 void IMTextEntry::OnPreeditStart(GtkIMContext* context)
 {
-  preedit_string = "";
   im_active = true;
-  preedit_cursor_ = 0;
 
   LOG_DEBUG(logger) << "Preedit start";
 }
 
 void IMTextEntry::OnPreeditEnd(GtkIMContext* context)
 {
-  preedit_string = "";
   im_active = false;
+  ResetPreedit();
   gtk_im_context_reset(im_context_);
 
-  /* remove preedit text and set cursor to previous position */
-  if (preedit_cursor_) {
-    std::string new_text = GetText();
-    new_text.replace(cursor_, preedit_cursor_, "");
-    int cursor = cursor_;
-    SetText(new_text.c_str());
-    SetCursor(cursor);
-    preedit_cursor_ = 0;
-  }
-
+  QueueRefresh(true, true); 
+  sigTextChanged.emit(this);
+  
   LOG_DEBUG(logger) << "Preedit ended";
 }