gnome-commander r2002 - in branches/gcmd-1-3: . doc/C src

[epiotr svn gnome org]

Author: epiotr
Date: Mon Aug 25 21:35:35 2008
New Revision: 2002
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2002&view=rev

Log:
Fixed problem #548961 (support for input method when rename or quicksearch)

Modified:
   branches/gcmd-1-3/ChangeLog
   branches/gcmd-1-3/doc/C/gnome-commander.xml
   branches/gcmd-1-3/src/gnome-cmd-quicksearch-popup.cc
   branches/gcmd-1-3/src/gnome-cmd-rename-dialog.cc

Modified: branches/gcmd-1-3/doc/C/gnome-commander.xml
==============================================================================
--- branches/gcmd-1-3/doc/C/gnome-commander.xml	(original)
+++ branches/gcmd-1-3/doc/C/gnome-commander.xml	Mon Aug 25 21:35:35 2008
@@ -5937,6 +5937,9 @@
                         <listitem>
                             <para>Fixed problem with full file path handling while copying/moving to mounted devices</para>
                         </listitem>
+                        <listitem>
+                            <para>Fixed problem #548961 (support for input method when rename or quicksearch)</para>
+                        </listitem>
                     </itemizedlist>
                 </para>
             </entry>

Modified: branches/gcmd-1-3/src/gnome-cmd-quicksearch-popup.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-quicksearch-popup.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-quicksearch-popup.cc	Mon Aug 25 21:35:35 2008
@@ -126,6 +126,10 @@
 
 static gboolean on_key_pressed (GtkWidget *entry, GdkEventKey *event, GnomeCmdQuicksearchPopup *popup)
 {
+    if (GTK_ENTRY (entry)->editable && event->type == GDK_KEY_PRESS)
+        if (gtk_im_context_filter_keypress (GTK_ENTRY (entry)->im_context, event))
+            return TRUE;
+
     // While in quicksearch, treat "ALT/CTRL + key" as a simple "key"
     event->state &= ~(GDK_CONTROL_MASK | GDK_MOD1_MASK);
 

Modified: branches/gcmd-1-3/src/gnome-cmd-rename-dialog.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-rename-dialog.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-rename-dialog.cc	Mon Aug 25 21:35:35 2008
@@ -43,6 +43,10 @@
 {
     GnomeCmdRenameDialog *dialog = GNOME_CMD_RENAME_DIALOG(widget);
 
+    if (dialog->priv->textbox->editable && event->type == GDK_KEY_PRESS) 
+        if (gtk_im_context_filter_keypress (dialog->priv->textbox->im_context, event))
+            return TRUE;
+
     switch (event->keyval)
     {
         case GDK_Escape: