/[winpt]/trunk/Src/wptGPGME.cpp
ViewVC logotype

Diff of /trunk/Src/wptGPGME.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 327 by twoaday, Sun Nov 5 08:57:45 2006 UTC revision 328 by twoaday, Fri Sep 25 16:07:38 2009 UTC
# Line 12  Line 12 
12   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * but WITHOUT ANY WARRANTY; without even the implied warranty of
13   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14   * General Public License for more details.   * 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  
15   */   */
16  #ifdef HAVE_CONFIG_H  #ifdef HAVE_CONFIG_H
17  #include <config.h>  #include <config.h>
# Line 38  Line 34 
34    
35  #include "openpgp.h"  #include "openpgp.h"
36    
37  BOOL CALLBACK  keycache_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam);  BOOL CALLBACK  keycache_dlg_proc (HWND dlg, UINT msg, WPARAM wparam,
38                                      LPARAM lparam);
39  void progress_cleanup (progress_filter_s * pfx);  void progress_cleanup (progress_filter_s * pfx);
40    
41  /* Global GPG key cache contexts. */  /* Global GPG key cache contexts. */
# Line 46  static gpg_keycache_t pub = NULL; Line 43  static gpg_keycache_t pub = NULL;
43  static gpg_keycache_t sec = NULL;  static gpg_keycache_t sec = NULL;
44  static char *gpg_secring = NULL;  static char *gpg_secring = NULL;
45    
46    struct keycache_s *key_list = NULL;
47    
48    
49  /* Return 1 if no cache is available.  /* Return 1 if no cache is available.
50     This can be the case if WinPT were run in command line mode. */     This can be the case if WinPT were run in command line mode. */
# Line 104  keycache_init (const char *pubring, cons Line 103  keycache_init (const char *pubring, cons
103  {  {
104      struct progress_filter_s pfx;      struct progress_filter_s pfx;
105      gpgme_error_t err;      gpgme_error_t err;
106      int val = 0;      int val;
107      char *p;      char *p;
108    
109      if (secring != NULL) {      if (secring != NULL) {
# Line 113  keycache_init (const char *pubring, cons Line 112  keycache_init (const char *pubring, cons
112          log_debug ("keycache_init: secring path '%s'\r\n", gpg_secring);          log_debug ("keycache_init: secring path '%s'\r\n", gpg_secring);
113      }      }
114            
115        val = 0;
116      p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "nKeys");      p = get_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "nKeys");
117      if (p && *p != ' ') {      if (p && *p != ' ') {
118          val = atoi (p);          val = atoi (p);
119          free_if_alloc (p);                free_if_alloc (p);
120      }      }
121    
122      memset (&pfx, 0, sizeof (pfx));      memset (&pfx, 0, sizeof (pfx));
# Line 140  keycache_init (const char *pubring, cons Line 140  keycache_init (const char *pubring, cons
140          gpg_keycache_sync (pub, sec);          gpg_keycache_sync (pub, sec);
141      if (val != 0)      if (val != 0)
142          progress_cleanup (&pfx);          progress_cleanup (&pfx);
143        
144      return err;      return err;
145  }  }
146    
Legend:
Removed from v.327  
changed lines
  Added in v.328
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26