sync with 0.9.10cvs11

[claws.git] / src / passphrase.c

diff --git a/src/passphrase.c b/src/passphrase.c
index 3bdae4e04d3540657d84ca97671fbc3306d23f4c..8daad3e777eec090b3fd056aae7f507d0fd8117a 100644 (file)
--- a/src/passphrase.c
+++ b/src/passphrase.c
@@ -153,6 +153,9 @@ passphrase_mbox (const gchar *desc)
     
     gtk_widget_show_all(window);
 
+    /* don't use XIM on entering passphrase */
+    gtkut_editable_disable_im(GTK_EDITABLE(pass_entry));
+
     if (grab_all) {
         XGrabServer(GDK_DISPLAY());
         if ( gdk_pointer_grab ( window->window, TRUE, 0,
@@ -319,7 +322,7 @@ gpgmegtk_passphrase_cb (void *opaque, const char *desc, void **r_hd)
     return pass;
 }
 
-void gpgmegtk_free_passphrase()
+void gpgmegtk_free_passphrase(void)
 {
     (void)free_passphrase(NULL); /* could be inline */
 }