seahorse r2665 - in trunk: . src

[sadam svn gnome org]

Author: sadam
Date: Mon Dec 15 04:34:00 2008
New Revision: 2665
URL: http://svn.gnome.org/viewvc/seahorse?rev=2665&view=rev

Log:
2008-12-14  Adam Schreiber  <sadam clemson edu>

    * src/Makefile.am:
    * src/seahorse-key-manager.c: Fix building without keyserver


Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/seahorse-key-manager.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Dec 15 04:34:00 2008
@@ -24,9 +24,11 @@
 	$(top_srcdir)/config.vapi \
 	$(top_srcdir)/libseahorse/libseahorse-c.vapi \
 	$(top_srcdir)/libseahorse/libseahorse.vapi
-	
+
+if WITH_KEYSERVER	
 VALA_CFILES = $(VALA_SRCS:.vala=.c)
 VALA_HFILES = $(VALA_SRCS:.vala=.h)
+endif
 
 SUFFIXES = .vala .c .h
 

Modified: trunk/src/seahorse-key-manager.c
==============================================================================
--- trunk/src/seahorse-key-manager.c	(original)
+++ trunk/src/seahorse-key-manager.c	Mon Dec 15 04:34:00 2008
@@ -618,6 +618,7 @@
 	gtk_clipboard_request_text (board, (GtkClipboardTextReceivedFunc)on_clipboard_received, self);
 }
 
+#ifdef WITH_KEYSERVER
 static void 
 on_remote_find (GtkAction* action, SeahorseKeyManager* self) 
 {
@@ -640,6 +641,7 @@
 	seahorse_keyserver_sync_show (objects, seahorse_viewer_get_window (SEAHORSE_VIEWER (self)));
 	g_list_free (objects);
 }
+#endif
 
 static void 
 on_app_quit (GtkAction* action, SeahorseKeyManager* self) 
@@ -744,12 +746,14 @@
 	  N_("Import keys from the clipboard"), G_CALLBACK (on_key_import_clipboard) }
 };
 
+#ifdef WITH_KEYSERVER
 static const GtkActionEntry SERVER_ENTRIES[] = {
 	{ "remote-find", GTK_STOCK_FIND, N_("_Find Remote Keys..."), "", 
 	  N_("Search for keys on a key server"), G_CALLBACK (on_remote_find) }, 
 	{ "remote-sync", GTK_STOCK_REFRESH, N_("_Sync and Publish Keys..."), "", 
 	  N_("Publish and/or synchronize your keys with those online."), G_CALLBACK (on_remote_sync) }
 };
+#endif
 
 static const GtkToggleActionEntry VIEW_ENTRIES[] = {
 	{ "view-type", NULL, N_("T_ypes"), NULL, N_("Show type column"), 
@@ -870,11 +874,13 @@
 	gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE);
 	gtk_action_group_add_actions (actions, GENERAL_ENTRIES, G_N_ELEMENTS (GENERAL_ENTRIES), self);
 	seahorse_viewer_include_actions (SEAHORSE_VIEWER (self), actions);
-	
+
+#ifdef WITH_KEYSERVER	
 	actions = gtk_action_group_new ("keyserver");
 	gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE);
 	gtk_action_group_add_actions (actions, SERVER_ENTRIES, G_N_ELEMENTS (SERVER_ENTRIES), self);
 	seahorse_viewer_include_actions (SEAHORSE_VIEWER (self), actions);
+#endif WITH_KEYSERVER
 	
 	self->pv->view_actions = gtk_action_group_new ("view");
 	gtk_action_group_set_translation_domain (self->pv->view_actions, GETTEXT_PACKAGE);