comparison mcabber/src/settings.c @ 1576:72fef01d9061

Merge main and crew
author Mikael Berthe <mikael@lilotux.net>
date Tue, 27 Jan 2009 22:24:02 +0100
parents bff9633e38ee
children a087125d8fc8
comparison
equal deleted inserted replaced
1575:8e52ce94eee0 1576:72fef01d9061
470 g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata); 470 g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata);
471 } 471 }
472 } else { 472 } else {
473 pgpdata->pgp_force = value; 473 pgpdata->pgp_force = value;
474 } 474 }
475 if (!pgpdata->pgp_keyid) 475 if (value && pgpdata && !pgpdata->pgp_keyid)
476 scr_LogPrint(LPRINT_NORMAL, "Warning: the Key Id is not set!"); 476 scr_LogPrint(LPRINT_NORMAL, "Warning: the Key Id is not set!");
477 #endif 477 #endif
478 } 478 }
479 479
480 // settings_pgp_getforce(jid) 480 // settings_pgp_getforce(jid)