[Winpt-commits] r151 - trunk/Include
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Wed Jan 18 12:53:14 CET 2006
Author: twoaday
Date: 2006-01-18 12:53:10 +0100 (Wed, 18 Jan 2006)
New Revision: 151
Modified:
trunk/Include/wptCommonCtl.h
trunk/Include/wptContext.h
trunk/Include/wptGPG.h
trunk/Include/wptImport.h
trunk/Include/wptKeyCache.h
trunk/Include/wptKeyManager.h
trunk/Include/wptKeyserver.h
trunk/Include/wptW32API.h
Log:
2006-01-13 Timo Schulz <ts at g10code.com>
* wptKeyCache.h (gpg_keycache_next_updated_key): New.
2006-01-11 Timo Schulz <ts at g10code.com>
* wptGPG.h (gpg_data_putc): New.
Modified: trunk/Include/wptCommonCtl.h
===================================================================
--- trunk/Include/wptCommonCtl.h 2006-01-18 11:52:45 UTC (rev 150)
+++ trunk/Include/wptCommonCtl.h 2006-01-18 11:53:10 UTC (rev 151)
@@ -74,7 +74,8 @@
const char *text);
int listview_count_items (listview_ctrl_t ctx, int curr_sel);
int listview_del_item (listview_ctrl_t ctx, int pos);
-int listview_del_all (listview_ctrl_t ctx);
+int listview_del_sel_items (listview_ctrl_t ctx);
+int listview_del_all_items (listview_ctrl_t ctx);
int listview_get_item_state (listview_ctrl_t ctx, int pos);
void* listview_get_item2 (listview_ctrl_t ctx, int pos);
int listview_set_item2 (listview_ctrl_t ctx, int pos, void *magic);
Modified: trunk/Include/wptContext.h
===================================================================
--- trunk/Include/wptContext.h 2006-01-18 11:52:45 UTC (rev 150)
+++ trunk/Include/wptContext.h 2006-01-18 11:53:10 UTC (rev 151)
@@ -46,6 +46,7 @@
int idx; /* selected index. */
int new_val; /* new value */
} callback;
+ char tmp_keyid[8+1];
};
typedef struct winpt_key_s * winpt_key_t;
@@ -106,6 +107,7 @@
gpgme_key_t newkey; /* handle to the new key */
int interactive;
unsigned int first_start:1;
+ unsigned int cancel:1;
char *fpr; /* fingerprint of the key. */
};
Modified: trunk/Include/wptGPG.h
===================================================================
--- trunk/Include/wptGPG.h 2006-01-18 11:52:45 UTC (rev 150)
+++ trunk/Include/wptGPG.h 2006-01-18 11:53:10 UTC (rev 151)
@@ -168,10 +168,8 @@
void keycache_reload( HWND dlg );
void keycache_release (int cleanup);
gpgme_error_t keycache_update (int is_sec, const char *keyid);
-gpgme_error_t keycache_init( const char *pubring, const char * secring );
-void keycache_set_reload( int yes );
-int keycache_get_reload( void );
-gpg_keycache_t keycache_get_ctx( int _pub );
+gpgme_error_t keycache_init (const char *pubring, const char * secring);
+gpg_keycache_t keycache_get_ctx (int _pub);
int count_insecure_elgkeys (void);
Modified: trunk/Include/wptImport.h
===================================================================
--- trunk/Include/wptImport.h 2006-01-18 11:52:45 UTC (rev 150)
+++ trunk/Include/wptImport.h 2006-01-18 11:53:10 UTC (rev 151)
@@ -1,5 +1,5 @@
/* wptImport.h
- * Copyright (C) 2005 Timo Schulz
+ * Copyright (C) 2005, 2006 Timo Schulz
*
* This file is part of WinPT.
*
@@ -39,6 +39,6 @@
WPARAM wparam,
LPARAM lparam);
-void print_import_status (gpgme_import_result_t res);
+int print_import_status (gpgme_import_result_t res);
#endif /*WPT_IMPORT_H*/
Modified: trunk/Include/wptKeyCache.h
===================================================================
--- trunk/Include/wptKeyCache.h 2006-01-18 11:52:45 UTC (rev 150)
+++ trunk/Include/wptKeyCache.h 2006-01-18 11:53:10 UTC (rev 151)
@@ -20,6 +20,11 @@
#ifndef WPT_KEYCACHE_H
#define WPT_KEYCACHE_H
+enum keycache_flag_t {
+ KC_FLAG_ADD = 1,
+ KC_FLAG_UPD = 2
+};
+
struct keycache_s {
struct keycache_s * next;
int flags;
@@ -80,6 +85,7 @@
const char *secr);
gpgme_error_t gpg_keycache_sync (gpg_keycache_t pub, gpg_keycache_t sec);
gpgme_error_t gpg_keycache_next_updated_key (gpg_keycache_t ctx,
- struct keycache_s **r_obj);
+ struct keycache_s **r_obj,
+ int *r_status);
#endif /*WPT_KEYCACHE_H*/
Modified: trunk/Include/wptKeyManager.h
===================================================================
--- trunk/Include/wptKeyManager.h 2006-01-18 11:52:45 UTC (rev 150)
+++ trunk/Include/wptKeyManager.h 2006-01-18 11:53:10 UTC (rev 151)
@@ -1,5 +1,5 @@
/* wptKeyManager.h - Key manager
- * Copyright (C) 2001-2005 Timo Schulz
+ * Copyright (C) 2001-2006 Timo Schulz
*
* This file is part of WinPT.
*
@@ -50,12 +50,13 @@
};
/*-- wptClipImportDlg.cpp --*/
-void print_import_status (gpgme_import_result_t res);
+int print_import_status (gpgme_import_result_t res);
/*-- wptKeyManager.cpp --*/
int km_check_for_seckey (listview_ctrl_t lv, int pos, int * utrust);
int km_check_key_status( listview_ctrl_t lv, int pos );
int km_get_key_status( listview_ctrl_t lv, int pos );
+char* km_key_get_info (gpgme_key_t pk, int is_sec);
int km_clip_export( HWND dlg, listview_ctrl_t lv);
int km_file_export( HWND dlg, listview_ctrl_t lv, const char *fname );
int km_privkey_export(HWND dlg, listview_ctrl_t lv, const char *fname );
Modified: trunk/Include/wptKeyserver.h
===================================================================
--- trunk/Include/wptKeyserver.h 2006-01-18 11:52:45 UTC (rev 150)
+++ trunk/Include/wptKeyserver.h 2006-01-18 11:53:10 UTC (rev 151)
@@ -81,6 +81,7 @@
/*-- Keyserver config --*/
int kserver_load_conf (const char *conf);
+int kserver_save_conf (const char *conf);
const char* kserver_check_keyid (const char *keyid);
const char* kserver_get_proxy (int *r_port);
const char* kserver_get_proxy_info (int id);
Modified: trunk/Include/wptW32API.h
===================================================================
--- trunk/Include/wptW32API.h 2006-01-18 11:52:45 UTC (rev 150)
+++ trunk/Include/wptW32API.h 2006-01-18 11:53:10 UTC (rev 151)
@@ -1,5 +1,5 @@
/* wptW32API.h - Common API interface
- * Copyright (C) 2001-2005 Timo Schulz
+ * Copyright (C) 2001-2006 Timo Schulz
*
* This file is part of WinPT.
*
@@ -31,12 +31,13 @@
/*-- wptMAPI.cpp --*/
int mapi_init (void);
-int mapi_send_pubkey (const char * keyid, char * keyfile);
-int mapi_send_ascfile (char * ascfile);
+int mapi_send_pubkey (const char *keyid, char *keyfile);
+int mapi_send_ascfile (char *ascfile);
void mapi_deinit (void);
/*-- wptW32API.cpp --*/
char* make_filename (const char *path, const char *file, const char *ext);
+char* make_special_filename (int folder, const char *file, const char *ext);
int file_exist_check (const char *fname);
int dir_exist_check (const char *dir);
DWORD get_file_size (const char *fname);
More information about the Winpt-commits
mailing list