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

Diff of /trunk/Src/wptRegistry.cpp

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

revision 129 by twoaday, Fri Dec 30 13:56:10 2005 UTC revision 167 by twoaday, Thu Jan 26 10:17:17 2006 UTC
# Line 204  start: Line 204  start:
204      if (rc_ok (rc)) {      if (rc_ok (rc)) {
205          RegCloseKey (reg);          RegCloseKey (reg);
206          rc = RegOpenKeyEx (HKEY_CURRENT_USER, WINPT_REG"\\Keyserver", 0, KEY_READ, &reg);          rc = RegOpenKeyEx (HKEY_CURRENT_USER, WINPT_REG"\\Keyserver", 0, KEY_READ, &reg);
207          if( !rc_ok (rc)) {          if (!rc_ok (rc)) {
208              RegCreateKey (HKEY_CURRENT_USER, WINPT_REG"\\Keyserver", &reg);              RegCreateKey (HKEY_CURRENT_USER, WINPT_REG"\\Keyserver", &reg);
209              RegCloseKey (reg);              RegCloseKey (reg);
210          }          }
# Line 426  set_reg_entry_mo (const char * value) Line 426  set_reg_entry_mo (const char * value)
426  }  }
427    
428    
429  char *  char*
430  get_reg_entry_gpg (const char *key)  get_reg_entry_gpg (const char *key)
431  {  {
432      return get_reg_entry (HKEY_CURRENT_USER, "Software\\GNU\\GnuPG", key);      char *p;
433        p = get_reg_entry (HKEY_CURRENT_USER, "Software\\GNU\\GnuPG", key);
434        if (!p || strlen (p) == 0) {
435            free_if_alloc (p);
436            return NULL;
437        }
438        return p;
439  }  }
440    
441    
# Line 587  set_reg_winpt_prefs (winpt_reg_prefs_s * Line 593  set_reg_winpt_prefs (winpt_reg_prefs_s *
593          if (rc)          if (rc)
594              goto leave;              goto leave;
595      }      }
     if (opt->kserv_conf) {  
         rc = set_reg_entry (HKEY_CURRENT_USER, WINPT_REG, "KeyserverConfig",  
                             opt->kserv_conf);  
         if (rc)  
             goto leave;  
     }  
596    
597      for (i=0; reg_hotkeys[i].reg_entry; i++) {      for (i=0; reg_hotkeys[i].reg_entry; i++) {
598          strcpy (buf, " ");          strcpy (buf, " ");
# Line 703  get_reg_winpt_prefs (winpt_reg_prefs_s * Line 703  get_reg_winpt_prefs (winpt_reg_prefs_s *
703      if (val && val[0] != ' ')      if (val && val[0] != ' ')
704          opt->backup.path = m_strdup (val);          opt->backup.path = m_strdup (val);
705      free_if_alloc (val);      free_if_alloc (val);
   
     val = get_reg_entry (HKEY_CURRENT_USER, WINPT_REG, "KeyserverConfig");  
     if (val && val[0] != ' ')  
         opt->kserv_conf = m_strdup (val);  
     free_if_alloc (val);  
706            
707      for (i=0; reg_hotkeys[i].reg_entry; i++) {      for (i=0; reg_hotkeys[i].reg_entry; i++) {
708          val = get_reg_entry (HKEY_CURRENT_USER, WINPT_REG, reg_hotkeys[i].reg_entry);          val = get_reg_entry (HKEY_CURRENT_USER, WINPT_REG, reg_hotkeys[i].reg_entry);

Legend:
Removed from v.129  
changed lines
  Added in v.167

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26