Mercurial > hg

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge main and crew
author Mikael Berthe <mikael@lilotux.net>
date Tue, 27 Jan 2009 22:24:02 +0100
parents bff9633e38ee
children a087125d8fc8
line wrap: on
line diff
--- a/mcabber/src/settings.c	Tue Jan 20 09:03:24 2009 +0100
+++ b/mcabber/src/settings.c	Tue Jan 27 22:24:02 2009 +0100
@@ -472,7 +472,7 @@
   } else {
     pgpdata->pgp_force = value;
   }
-  if (!pgpdata->pgp_keyid)
+  if (value && pgpdata && !pgpdata->pgp_keyid)
     scr_LogPrint(LPRINT_NORMAL, "Warning: the Key Id is not set!");
 #endif
 }