--- trunk/Src/wptClipSignDlg.cpp	2009/09/25 15:54:57	327
+++ trunk/Src/wptClipSignDlg.cpp	2009/09/25 16:07:38	328
@@ -1,5 +1,5 @@
 /* wptClipSignDlg.cpp - WinPT clipboard sign dialog
- *	Copyright (C) 2000-2006 Timo Schulz
+ *	Copyright (C) 2000-2006, 2009 Timo Schulz
  *	Copyright (C) 2005 g10 Code GmbH
  *
  * This file is part of WinPT.
@@ -13,10 +13,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with WinPT; if not, write to the Free Software Foundation, 
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
 #ifdef HAVE_CONFIG_H
@@ -56,7 +52,7 @@
         return gpg_error (GPG_ERR_INV_ARG);
     
     gpgme_set_armor (ctx, 1);
-    err = gpg_data_new_from_clipboard (&plain, wraplen);
+    err = gpg_data_utf8_new_from_clipboard (&plain, wraplen, NULL);
     if (err)
         return err;
     err = get_pubkey (keyid, &key);
@@ -72,7 +68,7 @@
     if (err)
 	goto leave;
     
-    gpg_data_release_and_set_clipboard (sig, 1);
+    gpg_data_release_to_clipboard (sig, 1);
     sig = NULL;    
 
 leave:
@@ -140,10 +136,10 @@
 }
 
 
-static listview_ctrl_t
+static keylist_ctrl_t
 on_init_dialog (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
 {
-    listview_ctrl_t lv;
+    keylist_ctrl_t kl;
     gpg_keycache_t kc, sec_kc;
     int nkeys;
 
@@ -160,11 +156,11 @@
         one_key_proc (dlg);
 	return NULL;
     }
-    lv = keylist_load (GetDlgItem (dlg, IDC_SIGN_KEYLIST), kc, sec_kc,
+    kl = keylist_load (GetDlgItem (dlg, IDC_SIGN_KEYLIST), kc, sec_kc,
 			KEYLIST_SIGN, KEY_SORT_USERID);
     center_window (dlg, NULL);
     SetForegroundWindow (dlg);
-    return lv;
+    return kl;
 }
 
 
@@ -184,7 +180,7 @@
 BOOL CALLBACK 
 clip_sign_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
 {	
-    static listview_ctrl_t lv = NULL;    
+    static keylist_ctrl_t kl = NULL;
     gpgme_ctx_t ctx;
     gpgme_error_t err;
     passphrase_cb_s pwd;
@@ -194,15 +190,15 @@
     
     switch (msg) {
     case WM_INITDIALOG:
-	lv = on_init_dialog (dlg, msg, wparam, lparam);
-	if (!lv)
+	kl = on_init_dialog (dlg, msg, wparam, lparam);
+	if (!kl)
 	    EndDialog (dlg, TRUE);
         return FALSE;	
         
     case WM_DESTROY:
-        if (lv) {
-            keylist_delete (lv);
-            lv = NULL;
+        if (kl) {
+            keylist_delete (kl);
+            kl = NULL;
         }
         return FALSE;
         
@@ -224,7 +220,7 @@
 			 _("Signing"), MB_ERR);
                 return FALSE;
             }
-            else if ((lv_idx = listview_get_selected_item (lv)) == -1) {
+            else if ((lv_idx = listview_get_selected_item (kl->lv)) == -1) {
 		rc = log_box (_("Signing"), MB_YESNO,
 		              _("No key was chosen.\n"
 			        "Use the GPG default key '%s'?"),
@@ -240,7 +236,7 @@
 		signer = new char[32+1];
 		if (!signer)
 		    BUG (NULL);
-                listview_get_item_text (lv, lv_idx, KM_COL_KEYID, signer, 32);
+                listview_get_item_text (kl->lv, lv_idx, KM_COL_KEYID, signer, 32);
 	    }
             err = gpgme_new (&ctx);
 	    if (err)