# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1233091442 -3600
# Node ID 72fef01d90613753a169b89fa42f3e5db5e3d737
# Parent  8e52ce94eee0fed9db4843584e177bcd9a1e374c# Parent  bff9633e38ee8a17bccb4be26d9f8b348758035e
Merge main and crew

diff -r 8e52ce94eee0 -r 72fef01d9061 mcabber/src/settings.c
--- 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
 }