seahorse r2727 - in trunk: . src

[sadam svn gnome org]

Author: sadam
Date: Sun Feb  1 14:01:25 2009
New Revision: 2727
URL: http://svn.gnome.org/viewvc/seahorse?rev=2727&view=rev

Log:
2009-02-01  Adam Schreiber  <sadam clemson edu>

    * configure.in:
    * src/seahorse-viewer.c: Make sure hkp and ldap are disable and 
preferences
    is removed from the menu when pgp is disabled.  Fixes bug #551799


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/seahorse-viewer.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Feb  1 14:01:25 2009
@@ -198,6 +198,12 @@
 AC_ARG_ENABLE(ldap,
 [  --disable-ldap          disable LDAP keyserver interface],
     try_ldap=$enableval, try_ldap=yes)
+
+if test "$enable_pgp" != "yes"; then
+	echo "LDAP keyserver interface requires PGP support"
+	try_ldap=no
+fi
+
 AC_MSG_RESULT($try_ldap)
 with_ldap=no
 
@@ -270,7 +276,12 @@
         AC_HELP_STRING([--disable-hkp],
         [disable HKP keyserver interface]))
 
-# HKP tests 
+# HKP tests
+if test "$enable_pgp" != "yes"; then
+	echo "HKP keyserver interface requires PGP support"
+	enable_hkp=no
+fi
+ 
 if test "$enable_hkp" = "no"; then
     echo "disabling HKP keyserver interface"
 else

Modified: trunk/src/seahorse-viewer.c
==============================================================================
--- trunk/src/seahorse-viewer.c	(original)
+++ trunk/src/seahorse-viewer.c	Sun Feb  1 14:01:25 2009
@@ -192,9 +192,10 @@
 	{ "edit-menu", NULL, N_("_Edit") },
 	{ "view-menu", NULL, N_("_View") },
 	{ "help-menu", NULL, N_("_Help") },
-	
+#ifdef  WITH_KEYSERVER || WITH_SHARING
 	{ "app-preferences", GTK_STOCK_PREFERENCES, N_("Prefere_nces"), NULL,
 	  N_("Change preferences for this program"), G_CALLBACK (on_app_preferences) },
+#endif
 	{ "app-about", "gtk-about", N_("_About"), NULL, 
 	  N_("About this program"), G_CALLBACK (on_app_about) }, 
 	{ "help-show", GTK_STOCK_HELP, N_("_Contents"), "F1",