seahorse r2193 - in trunk: . common daemon gkr libseahorse pgp src ssh

[nnielsen svn gnome org]

Author: nnielsen
Date: Tue Apr 29 02:20:04 2008
New Revision: 2193
URL: http://svn.gnome.org/viewvc/seahorse?rev=2193&view=rev

Log:
	* Use the full 'Seahorse' namespace instead of 'Sea'


Added:
   trunk/common/seahorse-cleanup.c
      - copied, changed from r2192, /trunk/common/sea-cleanup.c
   trunk/common/seahorse-cleanup.h
      - copied, changed from r2192, /trunk/common/sea-cleanup.h
   trunk/common/seahorse-registry.c
      - copied, changed from r2192, /trunk/common/sea-registry.c
   trunk/common/seahorse-registry.h
      - copied, changed from r2192, /trunk/common/sea-registry.h
   trunk/pgp/seahorse-pgp-keysets.c
      - copied, changed from r2192, /trunk/pgp/sea-pgp-keysets.c
   trunk/pgp/seahorse-pgp-keysets.h
      - copied, changed from r2192, /trunk/pgp/sea-pgp-keysets.h
   trunk/pgp/seahorse-pgp.c
      - copied, changed from r2192, /trunk/pgp/sea-pgp.c
   trunk/pgp/seahorse-pgp.h
      - copied, changed from r2192, /trunk/pgp/sea-pgp.h
   trunk/ssh/seahorse-ssh.c
      - copied, changed from r2192, /trunk/ssh/sea-ssh.c
   trunk/ssh/seahorse-ssh.h
      - copied, changed from r2192, /trunk/ssh/sea-ssh.h
Removed:
   trunk/common/sea-cleanup.c
   trunk/common/sea-cleanup.h
   trunk/common/sea-registry.c
   trunk/common/sea-registry.h
   trunk/pgp/sea-pgp-keysets.c
   trunk/pgp/sea-pgp-keysets.h
   trunk/pgp/sea-pgp.c
   trunk/pgp/sea-pgp.h
   trunk/ssh/sea-ssh.c
   trunk/ssh/sea-ssh.h
Modified:
   trunk/ChangeLog
   trunk/common/Makefile.am
   trunk/daemon/Makefile.am
   trunk/daemon/seahorse-daemon.c
   trunk/daemon/seahorse-service-crypto.c
   trunk/gkr/Makefile.am
   trunk/gkr/seahorse-gkeyring-item.c
   trunk/gkr/seahorse-gkeyring-source.c
   trunk/gkr/seahorse-gkr.c
   trunk/gkr/seahorse-gkr.h
   trunk/libseahorse/Makefile.am
   trunk/libseahorse/seahorse-context.c
   trunk/libseahorse/seahorse-key-source.c
   trunk/libseahorse/seahorse-key-source.h
   trunk/libseahorse/seahorse-key.h
   trunk/libseahorse/seahorse-prefs.c
   trunk/libseahorse/seahorse-unknown-source.c
   trunk/libseahorse/seahorse-util.c
   trunk/pgp/Makefile.am
   trunk/pgp/seahorse-gpgme-io.c
   trunk/pgp/seahorse-gpgme-io.h
   trunk/pgp/seahorse-hkp-source.c
   trunk/pgp/seahorse-ldap-source.c
   trunk/pgp/seahorse-pgp-dialogs.h
   trunk/pgp/seahorse-pgp-key.c
   trunk/pgp/seahorse-pgp-key.h
   trunk/pgp/seahorse-pgp-source.c
   trunk/pgp/seahorse-pgp-source.h
   trunk/pgp/seahorse-server-source.c
   trunk/src/Makefile.am
   trunk/src/main.c
   trunk/src/seahorse-generate-select.c
   trunk/src/seahorse-key-manager.c
   trunk/src/seahorse-key-properties.c
   trunk/src/seahorse-keyserver-results.c
   trunk/ssh/Makefile.am
   trunk/ssh/seahorse-ssh-key.c
   trunk/ssh/seahorse-ssh-key.h
   trunk/ssh/seahorse-ssh-source.c
   trunk/ssh/seahorse-ssh-source.h

Modified: trunk/common/Makefile.am
==============================================================================
--- trunk/common/Makefile.am	(original)
+++ trunk/common/Makefile.am	Tue Apr 29 02:20:04 2008
@@ -5,9 +5,9 @@
 	-I$(top_srcdir) \
 	$(SEAHORSE_CFLAGS)
 
-noinst_LTLIBRARIES = libsea-common.la
+noinst_LTLIBRARIES = libseahorse-common.la
 
-libsea_common_la_SOURCES = \
-	sea-cleanup.c sea-cleanup.h \
-	sea-registry.c sea-registry.h
+libseahorse_common_la_SOURCES = \
+	seahorse-cleanup.c seahorse-cleanup.h \
+	seahorse-registry.c seahorse-registry.h
 	
\ No newline at end of file

Copied: trunk/common/seahorse-cleanup.c (from r2192, /trunk/common/sea-cleanup.c)
==============================================================================
--- /trunk/common/sea-cleanup.c	(original)
+++ trunk/common/seahorse-cleanup.c	Tue Apr 29 02:20:04 2008
@@ -1,39 +1,37 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* sea-cleanup.c - for data cleanup at end of program
+/* 
+ * Seahorse
+ * 
+ * Copyright (C) 2008 Stefan Walter
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
+ */
 
-   Copyright (C) 2007 Stefan Walter
+#include "seahorse-cleanup.h"
 
-   The Gnome Keyring Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Keyring Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Author: Stef Walter <stef memberwebs com>
-*/
-
-#include "sea-cleanup.h"
-
-typedef struct _SeaCleanup {
+typedef struct _SeahorseCleanup {
 	GDestroyNotify notify;
 	gpointer user_data;
-} SeaCleanup; 
+} SeahorseCleanup; 
 
 static GSList *registered_cleanups = NULL;
 
 void    
-sea_cleanup_register (GDestroyNotify notify, gpointer user_data)
+seahorse_cleanup_register (GDestroyNotify notify, gpointer user_data)
 {
-	SeaCleanup *cleanup = g_new0 (SeaCleanup, 1);
+	SeahorseCleanup *cleanup = g_new0 (SeahorseCleanup, 1);
 	
 	g_assert (notify);
 	cleanup->notify = notify;
@@ -44,13 +42,13 @@
 }
 
 void
-sea_cleanup_unregister (GDestroyNotify notify, gpointer user_data)
+seahorse_cleanup_unregister (GDestroyNotify notify, gpointer user_data)
 {
-	SeaCleanup *cleanup;
+	SeahorseCleanup *cleanup;
 	GSList *l;
 	
 	for (l = registered_cleanups; l; l = g_slist_next (l)) {
-		cleanup = (SeaCleanup*)l->data;
+		cleanup = (SeahorseCleanup*)l->data;
 		if (cleanup->notify == notify && cleanup->user_data == user_data) {
 			registered_cleanups = g_slist_remove (registered_cleanups, cleanup);
 			break;
@@ -60,10 +58,10 @@
 
 
 void    
-sea_cleanup_perform (void)
+seahorse_cleanup_perform (void)
 {
 	GSList *cleanups, *l;
-	SeaCleanup *cleanup;
+	SeahorseCleanup *cleanup;
 	
 	while (registered_cleanups) {
 		
@@ -76,7 +74,7 @@
 		registered_cleanups = NULL;
 		
 		for (l = cleanups; l; l = g_slist_next (l)) {
-			cleanup = (SeaCleanup*)l->data;
+			cleanup = (SeahorseCleanup*)l->data;
 			g_assert (cleanup->notify);
 			
 			(cleanup->notify) (cleanup->user_data);

Copied: trunk/common/seahorse-cleanup.h (from r2192, /trunk/common/sea-cleanup.h)
==============================================================================
--- /trunk/common/sea-cleanup.h	(original)
+++ trunk/common/seahorse-cleanup.h	Tue Apr 29 02:20:04 2008
@@ -1,35 +1,33 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* sea-cleanup.h - for data cleanup at end of program
-
-   Copyright (C) 2007 Stefan Walter
-
-   The Gnome Keyring Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Keyring Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Author: Stef Walter <stef memberwebs com>
-*/
-
+/* 
+ * Seahorse
+ * 
+ * Copyright (C) 2008 Stefan Walter
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
+ */
+   
 #ifndef GKRCLEANUP_H_
 #define GKRCLEANUP_H_
 
 #include <glib.h>
 
-void    sea_cleanup_register        (GDestroyNotify notify, gpointer user_data);
+void    seahorse_cleanup_register        (GDestroyNotify notify, gpointer user_data);
 
-void    sea_cleanup_unregister      (GDestroyNotify notify, gpointer user_data);
+void    seahorse_cleanup_unregister      (GDestroyNotify notify, gpointer user_data);
 
-void    sea_cleanup_perform         (void);
+void    seahorse_cleanup_perform         (void);
 
 #endif /* GKRCLEANUP_H_ */

Copied: trunk/common/seahorse-registry.c (from r2192, /trunk/common/sea-registry.c)
==============================================================================
--- /trunk/common/sea-registry.c	(original)
+++ trunk/common/seahorse-registry.c	Tue Apr 29 02:20:04 2008
@@ -1,19 +1,39 @@
+/* 
+ * Seahorse
+ * 
+ * Copyright (C) 2008 Stefan Walter
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
+ */
+   
+#include "seahorse-cleanup.h"
+#include "seahorse-registry.h"
 
-#include "sea-cleanup.h"
-#include "sea-registry.h"
-
-typedef struct _SeaRegistryPrivate SeaRegistryPrivate;
+typedef struct _SeahorseRegistryPrivate SeahorseRegistryPrivate;
 
-struct _SeaRegistryPrivate {
+struct _SeahorseRegistryPrivate {
 	GHashTable *categories;
 };
 
-#define SEA_REGISTRY_GET_PRIVATE(o) \
-	(G_TYPE_INSTANCE_GET_PRIVATE((o), SEA_TYPE_REGISTRY, SeaRegistryPrivate))
+#define SEAHORSE_REGISTRY_GET_PRIVATE(o) \
+	(G_TYPE_INSTANCE_GET_PRIVATE((o), SEAHORSE_TYPE_REGISTRY, SeahorseRegistryPrivate))
 
-G_DEFINE_TYPE(SeaRegistry, sea_registry, G_TYPE_OBJECT);
+G_DEFINE_TYPE(SeahorseRegistry, seahorse_registry, G_TYPE_OBJECT);
 
-static SeaRegistry *registry_singleton = NULL; 
+static SeahorseRegistry *registry_singleton = NULL; 
 
 #define NO_VALUE (GUINT_TO_POINTER(1))
 
@@ -37,12 +57,12 @@
 }
 
 static void
-register_type_for_category (SeaRegistry *registry, const gchar *category, GType type)
+register_type_for_category (SeahorseRegistry *registry, const gchar *category, GType type)
 {
-	SeaRegistryPrivate *pv = SEA_REGISTRY_GET_PRIVATE (registry);
+	SeahorseRegistryPrivate *pv = SEAHORSE_REGISTRY_GET_PRIVATE (registry);
 	GHashTable *set;
 	
-	g_return_if_fail (SEA_IS_REGISTRY (registry));
+	g_return_if_fail (SEAHORSE_IS_REGISTRY (registry));
 	g_return_if_fail (category);
 	g_return_if_fail (category[0]);
 	
@@ -56,13 +76,13 @@
 }
 
 static GList*
-lookup_types (SeaRegistry *registry, const gchar *category, va_list cats)
+lookup_types (SeahorseRegistry *registry, const gchar *category, va_list cats)
 {
-	SeaRegistryPrivate *pv = SEA_REGISTRY_GET_PRIVATE (registry);
+	SeahorseRegistryPrivate *pv = SEAHORSE_REGISTRY_GET_PRIVATE (registry);
 	GList *l, *type, *types = NULL;
 	GHashTable *set;
 	
-	g_return_val_if_fail (SEA_IS_REGISTRY (registry), NULL);
+	g_return_val_if_fail (SEAHORSE_IS_REGISTRY (registry), NULL);
 	g_return_val_if_fail (category, NULL);
 	g_return_val_if_fail (category[0], NULL);
 	
@@ -111,59 +131,59 @@
  */
 
 static void
-sea_registry_init (SeaRegistry *obj)
+seahorse_registry_init (SeahorseRegistry *obj)
 {
-	SeaRegistryPrivate *pv = SEA_REGISTRY_GET_PRIVATE (obj);
+	SeahorseRegistryPrivate *pv = SEAHORSE_REGISTRY_GET_PRIVATE (obj);
 	pv->categories = g_hash_table_new_full (g_str_hash, g_str_equal, 
 	                                        g_free, (GDestroyNotify)g_hash_table_destroy);
 }
 
 static void
-sea_registry_dispose (GObject *obj)
+seahorse_registry_dispose (GObject *obj)
 {
-	SeaRegistryPrivate *pv = SEA_REGISTRY_GET_PRIVATE (obj);
+	SeahorseRegistryPrivate *pv = SEAHORSE_REGISTRY_GET_PRIVATE (obj);
 	g_hash_table_remove_all (pv->categories);
-	G_OBJECT_CLASS (sea_registry_parent_class)->dispose (obj);
+	G_OBJECT_CLASS (seahorse_registry_parent_class)->dispose (obj);
 }
 
 static void
-sea_registry_finalize (GObject *obj)
+seahorse_registry_finalize (GObject *obj)
 {
-	SeaRegistryPrivate *pv = SEA_REGISTRY_GET_PRIVATE (obj);
+	SeahorseRegistryPrivate *pv = SEAHORSE_REGISTRY_GET_PRIVATE (obj);
 	g_hash_table_destroy (pv->categories);
-	G_OBJECT_CLASS (sea_registry_parent_class)->finalize (obj);
+	G_OBJECT_CLASS (seahorse_registry_parent_class)->finalize (obj);
 }
 
 static void
-sea_registry_class_init (SeaRegistryClass *klass)
+seahorse_registry_class_init (SeahorseRegistryClass *klass)
 {
 	GObjectClass *gobject_class;
 	gobject_class = (GObjectClass*)klass;
 
-	sea_registry_parent_class = g_type_class_peek_parent (klass);
-	gobject_class->dispose = sea_registry_dispose;
-	gobject_class->finalize = sea_registry_finalize;
+	seahorse_registry_parent_class = g_type_class_peek_parent (klass);
+	gobject_class->dispose = seahorse_registry_dispose;
+	gobject_class->finalize = seahorse_registry_finalize;
 
-	g_type_class_add_private (gobject_class, sizeof (SeaRegistryPrivate));
+	g_type_class_add_private (gobject_class, sizeof (SeahorseRegistryPrivate));
 }
 
 /* -------------------------------------------------------------------------------
  * PUBLIC 
  */
 
-SeaRegistry*
-sea_registry_get (void)
+SeahorseRegistry*
+seahorse_registry_get (void)
 {
 	if (!registry_singleton) {
-		registry_singleton = g_object_new (SEA_TYPE_REGISTRY, NULL);
-		sea_cleanup_register (cleanup_registry, NULL);
+		registry_singleton = g_object_new (SEAHORSE_TYPE_REGISTRY, NULL);
+		seahorse_cleanup_register (cleanup_registry, NULL);
 	}
 	
 	return registry_singleton;
 }
 
 void
-sea_registry_load_types (SeaRegistry *registry, const SeaRegisterType *types)
+seahorse_registry_load_types (SeahorseRegistry *registry, const SeahorseRegisterType *types)
 {
 	GType type;
 	gpointer klass;
@@ -180,15 +200,15 @@
 }
 
 void
-sea_registry_register_type (SeaRegistry *registry, GType type, 
+seahorse_registry_register_type (SeahorseRegistry *registry, GType type, 
                             const gchar *category, ...)
 {
 	va_list cats;
 
 	if (!registry)
-		registry = sea_registry_get ();
+		registry = seahorse_registry_get ();
 	
-	g_return_if_fail (SEA_IS_REGISTRY (registry));
+	g_return_if_fail (SEAHORSE_IS_REGISTRY (registry));
 	g_return_if_fail (type);
 	g_return_if_fail (category);
 
@@ -205,16 +225,16 @@
 }
 
 GType
-sea_registry_find_type (SeaRegistry *registry, const gchar *category, ...)
+seahorse_registry_find_type (SeahorseRegistry *registry, const gchar *category, ...)
 {
 	va_list cats;
 	GList *types;
 	GType type;
 	
 	if (!registry)
-		registry = sea_registry_get ();
+		registry = seahorse_registry_get ();
 	
-	g_return_val_if_fail (SEA_IS_REGISTRY (registry), 0);
+	g_return_val_if_fail (SEAHORSE_IS_REGISTRY (registry), 0);
 
 	va_start (cats, category);
 	types = lookup_types (registry, category, cats);
@@ -228,15 +248,15 @@
 }
 
 GList*
-sea_registry_find_types (SeaRegistry *registry, const gchar *category, ...)
+seahorse_registry_find_types (SeahorseRegistry *registry, const gchar *category, ...)
 {
 	va_list cats;
 	GList *types;
 	
 	if (!registry)
-		registry = sea_registry_get ();
+		registry = seahorse_registry_get ();
 	
-	g_return_val_if_fail (SEA_IS_REGISTRY (registry), NULL);
+	g_return_val_if_fail (SEAHORSE_IS_REGISTRY (registry), NULL);
 
 	va_start (cats, category);
 	types = lookup_types (registry, category, cats);

Copied: trunk/common/seahorse-registry.h (from r2192, /trunk/common/sea-registry.h)
==============================================================================
--- /trunk/common/sea-registry.h	(original)
+++ trunk/common/seahorse-registry.h	Tue Apr 29 02:20:04 2008
@@ -1,3 +1,24 @@
+/* 
+ * Seahorse
+ * 
+ * Copyright (C) 2008 Stefan Walter
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
+ */
+
 #ifndef SEAHORSEREGISTRY_H_
 #define SEAHORSEREGISTRY_H_
 
@@ -5,45 +26,45 @@
 
 G_BEGIN_DECLS
 
-typedef GType (*SeaRegisterType) (void);
+typedef GType (*SeahorseRegisterType) (void);
 
-#define SEA_TYPE_REGISTRY             (sea_registry_get_type())
-#define SEA_REGISTRY(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), SEA_TYPE_REGISTRY, SeaRegistry))
-#define SEA_REGISTRY_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), SEA_TYPE_REGISTRY, GObject))
-#define SEA_IS_REGISTRY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj), SEA_TYPE_REGISTRY))
-#define SEA_IS_REGISTRY_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), SEA_TYPE_REGISTRY))
-#define SEA_REGISTRY_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), SEA_TYPE_REGISTRY, SeaRegistryClass))
+#define SEAHORSE_TYPE_REGISTRY             (seahorse_registry_get_type())
+#define SEAHORSE_REGISTRY(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), SEAHORSE_TYPE_REGISTRY, SeahorseRegistry))
+#define SEAHORSE_REGISTRY_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), SEAHORSE_TYPE_REGISTRY, GObject))
+#define SEAHORSE_IS_REGISTRY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj), SEAHORSE_TYPE_REGISTRY))
+#define SEAHORSE_IS_REGISTRY_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), SEAHORSE_TYPE_REGISTRY))
+#define SEAHORSE_REGISTRY_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), SEAHORSE_TYPE_REGISTRY, SeahorseRegistryClass))
 
-typedef struct _SeaRegistry      SeaRegistry;
-typedef struct _SeaRegistryClass SeaRegistryClass;
+typedef struct _SeahorseRegistry      SeahorseRegistry;
+typedef struct _SeahorseRegistryClass SeahorseRegistryClass;
 
-struct _SeaRegistry {
+struct _SeahorseRegistry {
 	 GObject parent;
 };
 
-struct _SeaRegistryClass {
+struct _SeahorseRegistryClass {
 	GObjectClass parent_class;
 };
 
 /* member functions */
-GType                sea_registry_get_type        (void) G_GNUC_CONST;
+GType                seahorse_registry_get_type        (void) G_GNUC_CONST;
 
-SeaRegistry*         sea_registry_get             (void);
+SeahorseRegistry*    seahorse_registry_get             (void);
 
-void                 sea_registry_load_types      (SeaRegistry *registry, 
-                                                   const SeaRegisterType *types);
+void                 seahorse_registry_load_types      (SeahorseRegistry *registry, 
+                                                        const SeahorseRegisterType *types);
 
-void                 sea_registry_register_type   (SeaRegistry *registry, 
-                                                   GType type, const gchar *category, 
-                                                   ...) G_GNUC_NULL_TERMINATED;
+void                 seahorse_registry_register_type   (SeahorseRegistry *registry, 
+                                                        GType type, const gchar *category, 
+                                                        ...) G_GNUC_NULL_TERMINATED;
 
-GType                sea_registry_find_type       (SeaRegistry *registry, 
-                                                   const gchar *category,
-                                                   ...) G_GNUC_NULL_TERMINATED;
+GType                seahorse_registry_find_type       (SeahorseRegistry *registry, 
+                                                        const gchar *category,
+                                                        ...) G_GNUC_NULL_TERMINATED;
 
-GList*               sea_registry_find_types      (SeaRegistry *registry, 
-                                                   const gchar *category,
-                                                   ...) G_GNUC_NULL_TERMINATED;
+GList*               seahorse_registry_find_types      (SeahorseRegistry *registry, 
+                                                        const gchar *category,
+                                                        ...) G_GNUC_NULL_TERMINATED;
 
 G_END_DECLS
 

Modified: trunk/daemon/Makefile.am
==============================================================================
--- trunk/daemon/Makefile.am	(original)
+++ trunk/daemon/Makefile.am	Tue Apr 29 02:20:04 2008
@@ -35,9 +35,9 @@
 
 seahorse_daemon_LDADD = \
 	$(top_builddir)/libseahorse/libseahorse.la \
-	$(top_builddir)/pgp/libsea-pgp.la \
-	$(top_builddir)/ssh/libsea-ssh.la \
-	$(top_builddir)/common/libsea-common.la \
+	$(top_builddir)/pgp/libseahorse-pgp.la \
+	$(top_builddir)/ssh/libseahorse-ssh.la \
+	$(top_builddir)/common/libseahorse-common.la \
 	$(top_builddir)/libcryptui/libcryptui.la \
 	$(SEAHORSE_LIBS)
 

Modified: trunk/daemon/seahorse-daemon.c
==============================================================================
--- trunk/daemon/seahorse-daemon.c	(original)
+++ trunk/daemon/seahorse-daemon.c	Tue Apr 29 02:20:04 2008
@@ -28,13 +28,13 @@
 #include "seahorse-secure-memory.h"
 #include "seahorse-unix-signal.h"
 
-#include "common/sea-cleanup.h"
-#include "common/sea-registry.h"
+#include "common/seahorse-cleanup.h"
+#include "common/seahorse-registry.h"
 
-#include "pgp/sea-pgp.h"
+#include "pgp/seahorse-pgp.h"
 
 #ifdef WITH_SSH
-#include "ssh/sea-ssh.h"
+#include "ssh/seahorse-ssh.h"
 #endif
 
 #include <gnome.h>
@@ -223,8 +223,8 @@
     seahorse_gtkstock_add_icons (daemon_icons);
     
     /* Load the various components */
-    sea_registry_load_types (NULL, SEA_PGP_REGISTRY);
-    sea_registry_load_types (NULL, SEA_SSH_REGISTRY);
+    seahorse_registry_load_types (NULL, SEAHORSE_PGP_REGISTRY);
+    seahorse_registry_load_types (NULL, SEAHORSE_SSH_REGISTRY);
 
     /* Make the default SeahorseContext */
     seahorse_context_new (SEAHORSE_CONTEXT_APP | SEAHORSE_CONTEXT_DAEMON, 0);
@@ -253,7 +253,7 @@
     seahorse_dbus_server_cleanup ();
 
     seahorse_context_destroy (SCTX_APP ());
-    sea_cleanup_perform ();
+    seahorse_cleanup_perform ();
 
     return 0;
 }

Modified: trunk/daemon/seahorse-service-crypto.c
==============================================================================
--- trunk/daemon/seahorse-service-crypto.c	(original)
+++ trunk/daemon/seahorse-service-crypto.c	Tue Apr 29 02:20:04 2008
@@ -125,7 +125,7 @@
 
 	/* Discover the key in question */
 	rawids = g_slist_append (NULL, status->signatures->fpr);
-	keys = seahorse_context_discover_keys (SCTX_APP (), SEA_PGP, rawids);
+	keys = seahorse_context_discover_keys (SCTX_APP (), SEAHORSE_PGP, rawids);
 	g_slist_free (rawids);
 
 	g_return_if_fail (keys != NULL);
@@ -388,7 +388,7 @@
     gboolean ret = TRUE;
     GQuark keyid;
     
-    if (!g_str_equal (ktype, g_quark_to_string (SEA_PGP))) {
+    if (!g_str_equal (ktype, g_quark_to_string (SEAHORSE_PGP))) {
         g_set_error (error, SEAHORSE_DBUS_ERROR, SEAHORSE_DBUS_ERROR_INVALID,
                      _("Invalid key type for decryption: %s"), ktype);
         return FALSE;        
@@ -451,7 +451,7 @@
     gboolean ret = TRUE;
     GQuark keyid;
     
-    if (!g_str_equal (ktype, g_quark_to_string (SEA_PGP))) {
+    if (!g_str_equal (ktype, g_quark_to_string (SEAHORSE_PGP))) {
         g_set_error (error, SEAHORSE_DBUS_ERROR, SEAHORSE_DBUS_ERROR_INVALID,
                      _("Invalid key type for verifying: %s"), ktype);
         return FALSE;        

Modified: trunk/gkr/Makefile.am
==============================================================================
--- trunk/gkr/Makefile.am	(original)
+++ trunk/gkr/Makefile.am	Tue Apr 29 02:20:04 2008
@@ -24,5 +24,5 @@
 	
 libseahorse_gkr_la_LIBADD = \
 	$(top_builddir)/libseahorse/libseahorse.la \
-	$(top_builddir)/common/libsea-common.la \
+	$(top_builddir)/common/libseahorse-common.la \
 	$(top_builddir)/libcryptui/libcryptui.la

Modified: trunk/gkr/seahorse-gkeyring-item.c
==============================================================================
--- trunk/gkr/seahorse-gkeyring-item.c	(original)
+++ trunk/gkr/seahorse-gkeyring-item.c	Tue Apr 29 02:20:04 2008
@@ -573,10 +573,10 @@
     if (git->attributes) {
         val = seahorse_gkeyring_item_get_attribute (git, "seahorse-key-type");
         if (val) {
-			if (strcmp (val, SEA_PGP_STR) == 0)
+			if (strcmp (val, SEAHORSE_PGP_STR) == 0)
                 return SEAHORSE_GKEYRING_USE_PGP;
 #ifdef WITH_SSH
-            if (strcmp (val, SEA_SSH_STR) == 0)
+            if (strcmp (val, SEAHORSE_SSH_STR) == 0)
                 return SEAHORSE_GKEYRING_USE_SSH;
 #endif
         }

Modified: trunk/gkr/seahorse-gkeyring-source.c
==============================================================================
--- trunk/gkr/seahorse-gkeyring-source.c	(original)
+++ trunk/gkr/seahorse-gkeyring-source.c	Tue Apr 29 02:20:04 2008
@@ -32,7 +32,7 @@
 #include "seahorse-passphrase.h"
 #include "seahorse-gkeyring-operation.h"
 
-#include "common/sea-registry.h"
+#include "common/seahorse-registry.h"
 
 #include <gnome-keyring.h>
 
@@ -749,7 +749,7 @@
                            0, G_MAXUINT, SKEY_LOC_INVALID, G_PARAM_READABLE));    
     
     
-	sea_registry_register_type (NULL, SEAHORSE_TYPE_GKEYRING_SOURCE, "key-source", "local", SEAHORSE_GKR_STR, NULL);
+	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_GKEYRING_SOURCE, "key-source", "local", SEAHORSE_GKR_STR, NULL);
 }
 
 /* -------------------------------------------------------------------------- 

Modified: trunk/gkr/seahorse-gkr.c
==============================================================================
--- trunk/gkr/seahorse-gkr.c	(original)
+++ trunk/gkr/seahorse-gkr.c	Tue Apr 29 02:20:04 2008
@@ -1,3 +1,23 @@
+/* 
+ * Seahorse
+ * 
+ * Copyright (C) 2008 Stefan Walter
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
+ */
 
 #include "config.h"
 
@@ -5,7 +25,7 @@
 
 #include "seahorse-gkeyring-source.h"
 
-const SeaRegisterType SEAHORSE_GKR_REGISTRY[] = {
+const SeahorseRegisterType SEAHORSE_GKR_REGISTRY[] = {
 	seahorse_gkeyring_source_get_type,
 	NULL
 };

Modified: trunk/gkr/seahorse-gkr.h
==============================================================================
--- trunk/gkr/seahorse-gkr.h	(original)
+++ trunk/gkr/seahorse-gkr.h	Tue Apr 29 02:20:04 2008
@@ -1,11 +1,32 @@
+/* 
+ * Seahorse
+ * 
+ * Copyright (C) 2008 Stefan Walter
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
+ */
+
 #ifndef SEAHORSEGKR_H_
 #define SEAHORSEGKR_H_
 
-#include "common/sea-registry.h"
+#include "common/seahorse-registry.h"
 
 #define SEAHORSE_GKR_STR                     "gnome-keyring"
 #define SEAHORSE_GKR                         (g_quark_from_static_string (SEAHORSE_GKR_STR))
 
-extern const SeaRegisterType SEAHORSE_GKR_REGISTRY[];
+extern const SeahorseRegisterType SEAHORSE_GKR_REGISTRY[];
 
 #endif /*SEAHORSEGKR_H_*/

Modified: trunk/libseahorse/Makefile.am
==============================================================================
--- trunk/libseahorse/Makefile.am	(original)
+++ trunk/libseahorse/Makefile.am	Tue Apr 29 02:20:04 2008
@@ -57,7 +57,7 @@
 	$(KEYSERVER_SRCS)
 	
 libseahorse_la_LIBADD = \
-	$(top_builddir)/common/libsea-common.la \
+	$(top_builddir)/common/libseahorse-common.la \
 	$(top_builddir)/libcryptui/libcryptui.la
 
 seahorselibexecbin_PROGRAMS = xloadimage

Modified: trunk/libseahorse/seahorse-context.c
==============================================================================
--- trunk/libseahorse/seahorse-context.c	(original)
+++ trunk/libseahorse/seahorse-context.c	Tue Apr 29 02:20:04 2008
@@ -35,7 +35,7 @@
 #include "seahorse-unknown-source.h"
 #include "seahorse-unknown-key.h"
 
-#include "common/sea-registry.h"
+#include "common/seahorse-registry.h"
 
 #include "pgp/seahorse-server-source.h"
 
@@ -209,7 +209,7 @@
 		
 		GList *l, *types;
 		
-		types = sea_registry_find_types (NULL, "key-source", "local", NULL);
+		types = seahorse_registry_find_types (NULL, "key-source", "local", NULL);
 		for (l = types; l; l = g_list_next (l)) {
 			SeahorseKeySource *src = g_object_new (GPOINTER_TO_UINT (l->data), NULL);
 			seahorse_context_take_key_source (sctx, src);

Modified: trunk/libseahorse/seahorse-key-source.c
==============================================================================
--- trunk/libseahorse/seahorse-key-source.c	(original)
+++ trunk/libseahorse/seahorse-key-source.c	Tue Apr 29 02:20:04 2008
@@ -27,7 +27,7 @@
 #include "seahorse-context.h"
 #include "seahorse-util.h"
 
-#include "common/sea-registry.h"
+#include "common/seahorse-registry.h"
 
 G_DEFINE_TYPE (SeahorseKeySource, seahorse_key_source, G_TYPE_OBJECT);
 
@@ -382,7 +382,7 @@
 
 	g_return_val_if_fail (keyid != NULL, 0);
     
-	type = sea_registry_find_type (NULL, "key-source", g_quark_to_string (ktype), "local", NULL);
+	type = seahorse_registry_find_type (NULL, "key-source", g_quark_to_string (ktype), "local", NULL);
 	g_return_val_if_fail (type, 0);
 	
 	klass = SEAHORSE_KEY_SOURCE_CLASS (g_type_class_peek (type));

Modified: trunk/libseahorse/seahorse-key-source.h
==============================================================================
--- trunk/libseahorse/seahorse-key-source.h	(original)
+++ trunk/libseahorse/seahorse-key-source.h	Tue Apr 29 02:20:04 2008
@@ -29,7 +29,7 @@
  *   created it.
  * 
  * Properties base classes must implement:
- *  ktype: (GQuark) The ktype (ie: SEA_PGP) of keys originating from this 
+ *  ktype: (GQuark) The ktype (ie: SEAHORSE_PGP) of keys originating from this 
  *         key source.
  *  key-desc: (gchar*) Description for the type of keys originating here.
  *  location: (SeahorseKeyLoc) The location of keys that come from this 

Modified: trunk/libseahorse/seahorse-key.h
==============================================================================
--- trunk/libseahorse/seahorse-key.h	(original)
+++ trunk/libseahorse/seahorse-key.h	Tue Apr 29 02:20:04 2008
@@ -38,7 +38,7 @@
  *      (ie: the DBUS format)
  *   raw-id: (gchar*) The raw backend specific key identifier
  *   key-desc: (gchar*) A description of the key type.
- *   ktype: (GQuark) The type of key (ie: SEA_PGP). 
+ *   ktype: (GQuark) The type of key (ie: SEAHORSE_PGP). 
  *   etype: (SeahorseKeyEType) The encryption type (ie: SKEY_PUBLIC)
  *   flags: (guint) Flags on the capabilities of the key (ie: SeahorseKeyFlags)
  *   location: (SeahorseKeyLoc) The location this key is stored. (ie: SKEY_LOC_REMOTE)

Modified: trunk/libseahorse/seahorse-prefs.c
==============================================================================
--- trunk/libseahorse/seahorse-prefs.c	(original)
+++ trunk/libseahorse/seahorse-prefs.c	Tue Apr 29 02:20:04 2008
@@ -30,9 +30,9 @@
 #include "seahorse-gtkstock.h"
 #include "seahorse-secure-entry.h"
 
-#include "common/sea-registry.h"
+#include "common/seahorse-registry.h"
 
-#include "pgp/sea-pgp.h"
+#include "pgp/seahorse-pgp.h"
 #include "pgp/seahorse-server-source.h"
 
 /* From seahorse-prefs-cache.c */

Modified: trunk/libseahorse/seahorse-unknown-source.c
==============================================================================
--- trunk/libseahorse/seahorse-unknown-source.c	(original)
+++ trunk/libseahorse/seahorse-unknown-source.c	Tue Apr 29 02:20:04 2008
@@ -26,7 +26,7 @@
 #include "seahorse-unknown-source.h"
 #include "seahorse-unknown-key.h"
 
-#include "common/sea-registry.h"
+#include "common/seahorse-registry.h"
 
 enum {
     PROP_0,
@@ -171,7 +171,7 @@
         g_param_spec_uint ("location", "Key Location", "Where the key is stored. See SeahorseKeyLoc", 
                            0, G_MAXUINT, SKEY_LOC_INVALID, G_PARAM_READABLE));    
     
-	sea_registry_register_type (NULL, SEAHORSE_TYPE_UNKNOWN_SOURCE, "key-source", NULL);
+	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_UNKNOWN_SOURCE, "key-source", NULL);
 }
 
 /* -----------------------------------------------------------------------------

Modified: trunk/libseahorse/seahorse-util.c
==============================================================================
--- trunk/libseahorse/seahorse-util.c	(original)
+++ trunk/libseahorse/seahorse-util.c	Tue Apr 29 02:20:04 2008
@@ -26,9 +26,9 @@
 #include "seahorse-key.h"
 #include "seahorse-gconf.h"
 
-#include "pgp/sea-pgp.h"
+#include "pgp/seahorse-pgp.h"
 
-#include "ssh/sea-ssh.h"
+#include "ssh/seahorse-ssh.h"
 
 #include <gio/gio.h>
 #include <glib/gstdio.h>
@@ -656,13 +656,13 @@
 
 	if (g_ascii_strcasecmp (mime, "application/pgp-encrypted") == 0 ||
 	    g_ascii_strcasecmp (mime, "application/pgp-keys") == 0)
-		return SEA_PGP;
+		return SEAHORSE_PGP;
     
 #ifdef WITH_SSH 
 	/* TODO: For now all PEM keys are treated as SSH keys */
 	else if (g_ascii_strcasecmp (mime, "application/x-ssh-key") == 0 ||
 	         g_ascii_strcasecmp (mime, "application/x-pem-key") == 0)
-		return SEA_SSH;
+		return SEAHORSE_SSH;
 #endif 
     
 	g_warning ("unsupported type of key data: %s", mime);

Modified: trunk/pgp/Makefile.am
==============================================================================
--- trunk/pgp/Makefile.am	(original)
+++ trunk/pgp/Makefile.am	Tue Apr 29 02:20:04 2008
@@ -14,7 +14,7 @@
 	-DEXECDIR=\""$(seahorselibexecbindir)"\" \
 	-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE 
 
-noinst_LTLIBRARIES = libsea-pgp.la
+noinst_LTLIBRARIES = libseahorse-pgp.la
 
 if WITH_LDAP
 LDAP_SRCS = seahorse-ldap-source.c seahorse-ldap-source.h
@@ -34,12 +34,12 @@
 KEYSERVER_SRCS = 
 endif
 
-libsea_pgp_la_SOURCES = \
+libseahorse_pgp_la_SOURCES = \
 	seahorse-gpgme-io.c seahorse-gpgme-io.h \
 	seahorse-gpgmex.h seahorse-gpgmex-op.c seahorse-gpgmex-util.c \
 	seahorse-gpg-options.c seahorse-gpg-options.h \
-	sea-pgp.c sea-pgp.h \
-	sea-pgp-keysets.c sea-pgp-keysets.h \
+	seahorse-pgp.c seahorse-pgp.h \
+	seahorse-pgp-keysets.c seahorse-pgp-keysets.h \
 	seahorse-pgp-error.c \
 	seahorse-pgp-key.c seahorse-pgp-key.h \
 	seahorse-pgp-key-op.c seahorse-pgp-key-op.h \
@@ -50,9 +50,9 @@
 	$(LDAP_SRCS) \
 	$(HKP_SRCS)
 
-libsea_pgp_la_LIBADD = \
+libseahorse_pgp_la_LIBADD = \
 	$(top_builddir)/libseahorse/libseahorse.la \
-	$(top_builddir)/common/libsea-common.la \
+	$(top_builddir)/common/libseahorse-common.la \
 	$(top_builddir)/libcryptui/libcryptui.la
 
 glade_DATA = \

Modified: trunk/pgp/seahorse-gpgme-io.c
==============================================================================
--- trunk/pgp/seahorse-gpgme-io.c	(original)
+++ trunk/pgp/seahorse-gpgme-io.c	Tue Apr 29 02:20:04 2008
@@ -224,7 +224,7 @@
 };
 
 gpgme_data_t
-sea_gpgme_output_data (GOutputStream* output)
+seahorse_gpgme_output_data (GOutputStream* output)
 {
 	gpgme_error_t gerr;
 	gpgme_data_t ret = NULL;
@@ -318,7 +318,7 @@
 };
 
 gpgme_data_t
-sea_gpgme_input_data (GInputStream* input)
+seahorse_gpgme_input_data (GInputStream* input)
 {
 	gpgme_error_t gerr;
 	gpgme_data_t ret = NULL;

Modified: trunk/pgp/seahorse-gpgme-io.h
==============================================================================
--- trunk/pgp/seahorse-gpgme-io.h	(original)
+++ trunk/pgp/seahorse-gpgme-io.h	Tue Apr 29 02:20:04 2008
@@ -1,22 +1,22 @@
-/*
+/* 
  * Seahorse
- *
+ * 
  * Copyright (C) 2008 Stefan Walter
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
  */
 
 /**
@@ -24,13 +24,13 @@
  * Allows for accessing data on remote machines (ie: smb, sftp)
  */
  
-#ifndef __SEA_GPGME_IO__
-#define __SEA_GPGME_IO__
+#ifndef __SEAHORSE_GPGME_IO__
+#define __SEAHORSE_GPGME_IO__
 
 #include <gpgme.h>
 #include <gio/gio.h>
 
-gpgme_data_t        sea_gpgme_input_data           (GInputStream* input);
-gpgme_data_t        sea_gpgme_output_data          (GOutputStream* output);
+gpgme_data_t        seahorse_gpgme_input_data           (GInputStream* input);
+gpgme_data_t        seahorse_gpgme_output_data          (GOutputStream* output);
 
-#endif /* __SEA_GPGME_IO__ */
+#endif /* __SEAHORSE_GPGME_IO__ */

Modified: trunk/pgp/seahorse-hkp-source.c
==============================================================================
--- trunk/pgp/seahorse-hkp-source.c	(original)
+++ trunk/pgp/seahorse-hkp-source.c	Tue Apr 29 02:20:04 2008
@@ -721,7 +721,7 @@
 {
     switch (prop_id) {
     case PROP_KEY_TYPE:
-        g_value_set_uint (value, SEA_PGP);
+        g_value_set_uint (value, SEAHORSE_PGP);
         break;
     case PROP_KEY_DESC:
         g_value_set_string (value, _("PGP Key"));
@@ -963,7 +963,7 @@
 	        g_param_spec_string ("key-desc", "Key Desc", "Description for keys that originate here.",
 	                             NULL, G_PARAM_READABLE));
 	    
-	sea_registry_register_type (NULL, SEAHORSE_TYPE_HKP_SOURCE, "key-source", "remote", SEA_PGP_STR, NULL);
+	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_HKP_SOURCE, "key-source", "remote", SEAHORSE_PGP_STR, NULL);
 }
 
 

Modified: trunk/pgp/seahorse-ldap-source.c
==============================================================================
--- trunk/pgp/seahorse-ldap-source.c	(original)
+++ trunk/pgp/seahorse-ldap-source.c	Tue Apr 29 02:20:04 2008
@@ -1257,7 +1257,7 @@
 {
     switch (prop_id) {
     case PROP_KEY_TYPE:
-        g_value_set_uint (value, SEA_PGP);
+        g_value_set_uint (value, SEAHORSE_PGP);
         break;
     case PROP_KEY_DESC:
         g_value_set_string (value, _("PGP Key"));
@@ -1399,7 +1399,7 @@
 	        g_param_spec_string ("key-desc", "Key Desc", "Description for keys that originate here.",
 	                             NULL, G_PARAM_READABLE));
 	    
-	sea_registry_register_type (NULL, SEAHORSE_TYPE_LDAP_SOURCE, "key-source", "remote", SEA_PGP_STR, NULL);
+	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_LDAP_SOURCE, "key-source", "remote", SEAHORSE_PGP_STR, NULL);
 }
 
 

Modified: trunk/pgp/seahorse-pgp-dialogs.h
==============================================================================
--- trunk/pgp/seahorse-pgp-dialogs.h	(original)
+++ trunk/pgp/seahorse-pgp-dialogs.h	Tue Apr 29 02:20:04 2008
@@ -24,8 +24,8 @@
  * Various UI elements and dialogs used in libseahorse.
  */
  
-#ifndef __SEA_PGP_DIALOGS_H__
-#define __SEA_PGP_DIALOGS_H__
+#ifndef __SEAHORSE_PGP_DIALOGS_H__
+#define __SEAHORSE_PGP_DIALOGS_H__
 
 #include <gtk/gtk.h>
 
@@ -35,4 +35,4 @@
 
 void            seahorse_pgp_handle_gpgme_error     (gpgme_error_t err, const gchar* desc, ...);
 
-#endif /* __SEA_PGP_DIALOGS_H__ */
+#endif /* __SEAHORSE_PGP_DIALOGS_H__ */

Modified: trunk/pgp/seahorse-pgp-key.c
==============================================================================
--- trunk/pgp/seahorse-pgp-key.c	(original)
+++ trunk/pgp/seahorse-pgp-key.c	Tue Apr 29 02:20:04 2008
@@ -130,7 +130,7 @@
     SeahorseKey *skey = SEAHORSE_KEY (pkey);
     
     skey->keyid = 0;
-    skey->ktype = SEA_PGP;
+    skey->ktype = SEAHORSE_PGP;
     
     if (!pkey->pubkey) {
         
@@ -203,7 +203,7 @@
     }
     
     if (!skey->keyid)
-        skey->keyid = g_quark_from_string (SEA_PGP_STR ":UNKNOWN UNKNOWN ");
+        skey->keyid = g_quark_from_string (SEAHORSE_PGP_STR ":UNKNOWN UNKNOWN ");
     
     seahorse_key_changed (skey, SKEY_CHANGE_ALL);
 }
@@ -879,7 +879,7 @@
     if (len > 16)
         id += len - 16;
     
-    t = g_strdup_printf ("%s:%s", SEA_PGP_STR, id);
+    t = g_strdup_printf ("%s:%s", SEAHORSE_PGP_STR, id);
     keyid = g_quark_from_string (t);
     g_free (t);
     

Modified: trunk/pgp/seahorse-pgp-key.h
==============================================================================
--- trunk/pgp/seahorse-pgp-key.h	(original)
+++ trunk/pgp/seahorse-pgp-key.h	Tue Apr 29 02:20:04 2008
@@ -45,7 +45,7 @@
 
 #include "seahorse-key.h"
 
-#include "pgp/sea-pgp.h"
+#include "pgp/seahorse-pgp.h"
 #include "pgp/seahorse-gpgmex.h"
 #include "pgp/seahorse-pgp-source.h"
 

Copied: trunk/pgp/seahorse-pgp-keysets.c (from r2192, /trunk/pgp/sea-pgp-keysets.c)
==============================================================================
--- /trunk/pgp/sea-pgp-keysets.c	(original)
+++ trunk/pgp/seahorse-pgp-keysets.c	Tue Apr 29 02:20:04 2008
@@ -1,10 +1,30 @@
+/* 
+ * Seahorse
+ * 
+ * Copyright (C) 2008 Stefan Walter
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
+ */
 
 #include "config.h"
 
 #include "seahorse-gconf.h"
 
-#include "sea-pgp.h"
-#include "sea-pgp-keysets.h"
+#include "seahorse-pgp.h"
+#include "seahorse-pgp-keysets.h"
 
 /* -----------------------------------------------------------------------------
  * COMMON KEYSETS 
@@ -37,7 +57,7 @@
     SeahorseKeyset *skset;
     
     pred->location = SKEY_LOC_LOCAL;
-    pred->ktype = SEA_PGP;
+    pred->ktype = SEAHORSE_PGP;
     pred->etype = SKEY_PRIVATE;
     pred->flags = SKEY_FLAG_CAN_SIGN;
     pred->nflags = SKEY_FLAG_EXPIRED | SKEY_FLAG_REVOKED | SKEY_FLAG_DISABLED;

Copied: trunk/pgp/seahorse-pgp-keysets.h (from r2192, /trunk/pgp/sea-pgp-keysets.h)
==============================================================================
--- /trunk/pgp/sea-pgp-keysets.h	(original)
+++ trunk/pgp/seahorse-pgp-keysets.h	Tue Apr 29 02:20:04 2008
@@ -1,3 +1,24 @@
+/* 
+ * Seahorse
+ * 
+ * Copyright (C) 2008 Stefan Walter
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
+ */
+
 #ifndef SEAPGPKEYSETS_H_
 #define SEAPGPKEYSETS_H_
 

Modified: trunk/pgp/seahorse-pgp-source.c
==============================================================================
--- trunk/pgp/seahorse-pgp-source.c	(original)
+++ trunk/pgp/seahorse-pgp-source.c	Tue Apr 29 02:20:04 2008
@@ -317,7 +317,7 @@
         g_param_spec_uint ("location", "Key Location", "Where the key is stored. See SeahorseKeyLoc", 
                            0, G_MAXUINT, SKEY_LOC_INVALID, G_PARAM_READABLE));    
     
-	sea_registry_register_type (NULL, SEAHORSE_TYPE_PGP_SOURCE, "key-source", "local", SEA_PGP_STR, NULL);
+	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_PGP_SOURCE, "key-source", "local", SEAHORSE_PGP_STR, NULL);
 
 }
 
@@ -432,7 +432,7 @@
 {
     switch (prop_id) {
     case PROP_KEY_TYPE:
-        g_value_set_uint (value, SEA_PGP);
+        g_value_set_uint (value, SEAHORSE_PGP);
         break;
     case PROP_KEY_DESC:
         g_value_set_string (value, _("PGP Key"));
@@ -1020,7 +1020,7 @@
     	pop = seahorse_pgp_operation_new (_("Importing Keys"));
     	g_return_val_if_fail (pop != NULL, NULL);
     
-	data = sea_gpgme_input_data (input);
+	data = seahorse_gpgme_input_data (input);
 	g_return_val_if_fail (data, NULL);
     
 	gerr = gpgme_op_import_start (pop->gctx, data);
@@ -1065,7 +1065,7 @@
         gpgme_set_armor (pop->gctx, TRUE);
         gpgme_set_textmode (pop->gctx, TRUE);
         
-        data = sea_gpgme_output_data (output);
+        data = seahorse_gpgme_output_data (output);
         g_return_val_if_fail (data, NULL);
 
         /* Export context for asynchronous export */

Modified: trunk/pgp/seahorse-pgp-source.h
==============================================================================
--- trunk/pgp/seahorse-pgp-source.h	(original)
+++ trunk/pgp/seahorse-pgp-source.h	Tue Apr 29 02:20:04 2008
@@ -31,7 +31,7 @@
  * - Monitors ~/.gnupg for changes and reloads the key ring as necessary.
  * 
  * Properties:
- *  ktype: (GQuark) The ktype (ie: SEA_PGP) of keys originating from this 
+ *  ktype: (GQuark) The ktype (ie: SEAHORSE_PGP) of keys originating from this 
            key source.
  *  location: (SeahorseKeyLoc) The location of keys that come from this 
  *         source. (ie: SKEY_LOC_LOCAL, SKEY_LOC_REMOTE)

Copied: trunk/pgp/seahorse-pgp.c (from r2192, /trunk/pgp/sea-pgp.c)
==============================================================================
--- /trunk/pgp/sea-pgp.c	(original)
+++ trunk/pgp/seahorse-pgp.c	Tue Apr 29 02:20:04 2008
@@ -1,7 +1,27 @@
+/* 
+ * Seahorse
+ * 
+ * Copyright (C) 2008 Stefan Walter
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
+ */
 
 #include "config.h"
 
-#include "sea-pgp.h"
+#include "seahorse-pgp.h"
 
 #include "seahorse-pgp-source.h"
 
@@ -12,7 +32,7 @@
 #include "seahorse-hkp-source.h"
 #endif
 	
-const SeaRegisterType SEA_PGP_REGISTRY[] = {
+const SeahorseRegisterType SEAHORSE_PGP_REGISTRY[] = {
 	seahorse_pgp_source_get_type,
 #ifdef WITH_LDAP
 	seahorse_ldap_source_get_type,

Copied: trunk/pgp/seahorse-pgp.h (from r2192, /trunk/pgp/sea-pgp.h)
==============================================================================
--- /trunk/pgp/sea-pgp.h	(original)
+++ trunk/pgp/seahorse-pgp.h	Tue Apr 29 02:20:04 2008
@@ -1,11 +1,32 @@
+/* 
+ * Seahorse
+ * 
+ * Copyright (C) 2008 Stefan Walter
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
+ */
+
 #ifndef SEAHORSEPGP_H_
 #define SEAHORSEPGP_H_
 
-#include "common/sea-registry.h"
+#include "common/seahorse-registry.h"
 
-#define SEA_PGP_STR                     "openpgp"
-#define SEA_PGP                         (g_quark_from_static_string (SEA_PGP_STR))
+#define SEAHORSE_PGP_STR                     "openpgp"
+#define SEAHORSE_PGP                         (g_quark_from_static_string (SEAHORSE_PGP_STR))
 
-extern const SeaRegisterType SEA_PGP_REGISTRY[];
+extern const SeahorseRegisterType SEAHORSE_PGP_REGISTRY[];
 
 #endif /*SEAHORSEPGP_H_*/

Modified: trunk/pgp/seahorse-server-source.c
==============================================================================
--- trunk/pgp/seahorse-server-source.c	(original)
+++ trunk/pgp/seahorse-server-source.c	Tue Apr 29 02:20:04 2008
@@ -204,7 +204,7 @@
         g_value_set_string (value, ssrc->priv->uri);
         break;
     case PROP_KEY_TYPE:
-        g_value_set_uint (value, SEA_PGP);
+        g_value_set_uint (value, SEAHORSE_PGP);
         break;
     case PROP_KEY_DESC:
         g_value_set_string (value, _("PGP Key"));

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Apr 29 02:20:04 2008
@@ -53,10 +53,10 @@
 
 seahorse_LDADD = \
 	$(top_builddir)/libseahorse/libseahorse.la \
-	$(top_builddir)/pgp/libsea-pgp.la \
-	$(top_builddir)/ssh/libsea-ssh.la \
+	$(top_builddir)/pgp/libseahorse-pgp.la \
+	$(top_builddir)/ssh/libseahorse-ssh.la \
 	$(top_builddir)/gkr/libseahorse-gkr.la \
-	$(top_builddir)/common/libsea-common.la \  
+	$(top_builddir)/common/libseahorse-common.la \  
 	$(top_builddir)/libcryptui/libcryptui.la \
 	$(SEAHORSE_LIBS)
 

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Tue Apr 29 02:20:04 2008
@@ -29,15 +29,15 @@
 #include "seahorse-gtkstock.h"
 #include "seahorse-secure-memory.h"
 
-#include "common/sea-cleanup.h"
-#include "common/sea-registry.h"
+#include "common/seahorse-cleanup.h"
+#include "common/seahorse-registry.h"
 
-#include "pgp/sea-pgp.h"
+#include "pgp/seahorse-pgp.h"
 #include "pgp/seahorse-pgp-key.h"
 #include "pgp/seahorse-pgp-source.h"
 
 #ifdef WITH_SSH
-#include "ssh/sea-ssh.h"
+#include "ssh/seahorse-ssh.h"
 #endif
 
 #include "gkr/seahorse-gkr.h"
@@ -76,8 +76,8 @@
     seahorse_gtkstock_init ();
     
     /* Initialize the various components */
-    sea_registry_load_types (NULL, SEA_PGP_REGISTRY);
-    sea_registry_load_types (NULL, SEA_SSH_REGISTRY);
+    seahorse_registry_load_types (NULL, SEAHORSE_PGP_REGISTRY);
+    seahorse_registry_load_types (NULL, SEAHORSE_SSH_REGISTRY);
     
     /* Make the default SeahorseContext */
     seahorse_context_new (SEAHORSE_CONTEXT_APP, 0);
@@ -88,6 +88,6 @@
     
     gtk_main ();
     
-    sea_cleanup_perform ();
+    seahorse_cleanup_perform ();
     return ret;
 }

Modified: trunk/src/seahorse-generate-select.c
==============================================================================
--- trunk/src/seahorse-generate-select.c	(original)
+++ trunk/src/seahorse-generate-select.c	Tue Apr 29 02:20:04 2008
@@ -66,11 +66,11 @@
     sksrc = seahorse_context_find_key_source (SCTX_APP (), ktype, SKEY_LOC_LOCAL);
     g_return_if_fail (sksrc != NULL);
     
-    if (ktype == SEA_PGP)
+    if (ktype == SEAHORSE_PGP)
         seahorse_pgp_generate_show (SEAHORSE_PGP_SOURCE (sksrc), GTK_WINDOW (glade_xml_get_widget (swidget->xml, swidget->name)));
         
 #ifdef WITH_SSH 
-    else if (ktype == SEA_SSH)
+    else if (ktype == SEAHORSE_SSH)
         seahorse_ssh_generate_show (SEAHORSE_SSH_SOURCE (sksrc), GTK_WINDOW (glade_xml_get_widget (swidget->xml, swidget->name)));
 #endif 
     
@@ -140,10 +140,10 @@
     
     /* Build our tree store */
     store = gtk_list_store_newv (KEY_N_COLUMNS, (GType*)key_columns);
-    add_key_type (store, SEA_PGP, SEAHORSE_STOCK_SECRET, _("PGP Key"), 
+    add_key_type (store, SEAHORSE_PGP, SEAHORSE_STOCK_SECRET, _("PGP Key"), 
                   _("Used to encrypt email and files"));
 #ifdef WITH_SSH
-    add_key_type (store, SEA_SSH, SEAHORSE_STOCK_KEY_SSH, _("Secure Shell Key"),
+    add_key_type (store, SEAHORSE_SSH, SEAHORSE_STOCK_KEY_SSH, _("Secure Shell Key"),
                   _("Used to access other computers (eg: via a terminal)"));
 #endif /* WITH_SSH */
     

Modified: trunk/src/seahorse-key-manager.c
==============================================================================
--- trunk/src/seahorse-key-manager.c	(original)
+++ trunk/src/seahorse-key-manager.c	Tue Apr 29 02:20:04 2008
@@ -759,7 +759,7 @@
     
     /* Only supported on PGP keys */
     for (l = keys; l; l = g_list_next (l)) {
-        if (seahorse_key_get_ktype (SEAHORSE_KEY (l->data)) != SEA_PGP) {
+        if (seahorse_key_get_ktype (SEAHORSE_KEY (l->data)) != SEAHORSE_PGP) {
             keys = l = g_list_delete_link (keys, l);
             if (keys == NULL)
                 break;
@@ -767,7 +767,7 @@
     }
     
     if (keys == NULL)
-        keys = seahorse_context_find_keys (SCTX_APP (), SEA_PGP, 0, SKEY_LOC_LOCAL);
+        keys = seahorse_context_find_keys (SCTX_APP (), SEAHORSE_PGP, 0, SKEY_LOC_LOCAL);
     seahorse_keyserver_sync_show (keys,GTK_WINDOW (glade_xml_get_widget (swidget->xml, swidget->name)));
     g_list_free (keys);
 #endif
@@ -782,7 +782,7 @@
     
     /* Only supported on SSH keys */
     for (l = keys; l; l = g_list_next (l)) {
-        if (seahorse_key_get_ktype (SEAHORSE_KEY (l->data)) != SEA_SSH) {
+        if (seahorse_key_get_ktype (SEAHORSE_KEY (l->data)) != SEAHORSE_SSH) {
             keys = l = g_list_delete_link (keys, l);
             if (keys == NULL)
                 break;
@@ -991,11 +991,11 @@
     gtk_action_group_set_sensitive (actions, selected);
     
     actions = seahorse_widget_find_actions (swidget, "pgp");
-    gtk_action_group_set_sensitive (actions, ((ktype == SEA_PGP) && (seahorse_key_get_etype (skey) != SKEY_PRIVATE)));
+    gtk_action_group_set_sensitive (actions, ((ktype == SEAHORSE_PGP) && (seahorse_key_get_etype (skey) != SKEY_PRIVATE)));
     
 #ifdef WITH_SSH    
     actions = seahorse_widget_find_actions (swidget, "ssh");
-    gtk_action_group_set_sensitive (actions, ktype == SEA_SSH);
+    gtk_action_group_set_sensitive (actions, ktype == SEAHORSE_SSH);
 #endif    
     
     /* This is called as a one-time idle handler, return FALSE so we don't get run again */

Modified: trunk/src/seahorse-key-properties.c
==============================================================================
--- trunk/src/seahorse-key-properties.c	(original)
+++ trunk/src/seahorse-key-properties.c	Tue Apr 29 02:20:04 2008
@@ -347,7 +347,7 @@
         }
         
         /* Pass it to 'DiscoverKeys' for resolution/download */
-        keys = seahorse_context_discover_keys (SCTX_APP (), SEA_PGP, rawids);
+        keys = seahorse_context_discover_keys (SCTX_APP (), SEAHORSE_PGP, rawids);
         g_slist_free (rawids);
         rawids = NULL;
         
@@ -1484,7 +1484,7 @@
         rawids = unique_slist_strings (rawids);
         
         /* Pass it to 'DiscoverKeys' for resolution/download */
-        keys = seahorse_context_discover_keys (SCTX_APP (), SEA_PGP, rawids);
+        keys = seahorse_context_discover_keys (SCTX_APP (), SEAHORSE_PGP, rawids);
         g_slist_free (rawids);
         rawids = NULL;
         

Modified: trunk/src/seahorse-keyserver-results.c
==============================================================================
--- trunk/src/seahorse-keyserver-results.c	(original)
+++ trunk/src/seahorse-keyserver-results.c	Tue Apr 29 02:20:04 2008
@@ -535,7 +535,7 @@
     
     /* Our predicate for filtering keys */
     pred = g_new0 (SeahorseKeyPredicate, 1);
-    pred->ktype = SEA_PGP;
+    pred->ktype = SEAHORSE_PGP;
     pred->etype = SKEY_PUBLIC;
     pred->location = SKEY_LOC_REMOTE;
     pred->custom = (SeahorseKeyPredFunc)filter_keyset;

Modified: trunk/ssh/Makefile.am
==============================================================================
--- trunk/ssh/Makefile.am	(original)
+++ trunk/ssh/Makefile.am	Tue Apr 29 02:20:04 2008
@@ -14,17 +14,17 @@
 	-DEXECDIR=\""$(seahorselibexecbindir)"\" \
 	-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE 
 
-noinst_LTLIBRARIES = libsea-ssh.la
+noinst_LTLIBRARIES = libseahorse-ssh.la
 
-libsea_ssh_la_SOURCES = \
-	sea-ssh.c sea-ssh.h \
+libseahorse_ssh_la_SOURCES = \
+	seahorse-ssh.c seahorse-ssh.h \
 	seahorse-algo.c seahorse-algo.h \
 	seahorse-ssh-key-data.c seahorse-ssh-key-data.h \
 	seahorse-ssh-key.c seahorse-ssh-key.h  \
 	seahorse-ssh-source.c seahorse-ssh-source.h \
 	seahorse-ssh-operation.c seahorse-ssh-operation.h
 	
-libsea_ssh_la_LIBADD = \
+libseahorse_ssh_la_LIBADD = \
 	$(top_builddir)/libseahorse/libseahorse.la \
 	$(top_builddir)/libcryptui/libcryptui.la
 

Modified: trunk/ssh/seahorse-ssh-key.c
==============================================================================
--- trunk/ssh/seahorse-ssh-key.c	(original)
+++ trunk/ssh/seahorse-ssh-key.c	Tue Apr 29 02:20:04 2008
@@ -100,7 +100,7 @@
     }
     
     /* Now start setting the main SeahorseKey fields */
-    key->ktype = SEA_SSH;
+    key->ktype = SEAHORSE_SSH;
     key->keyid = 0;
     
     if (!skey->keydata || !skey->keydata->fingerprint) {
@@ -131,7 +131,7 @@
     }
     
     if (!key->keyid)
-        key->keyid = g_quark_from_string (SEA_SSH_STR ":UNKNOWN ");
+        key->keyid = g_quark_from_string (SEAHORSE_SSH_STR ":UNKNOWN ");
     
     seahorse_key_changed (key, SKEY_CHANGE_ALL);
 }
@@ -406,7 +406,7 @@
     /* Not enough characters */
     g_return_val_if_fail (off == 0, 0);
 
-    hex = g_strdup_printf ("%s:%s", SEA_SSH_STR, canonical_id);
+    hex = g_strdup_printf ("%s:%s", SEAHORSE_SSH_STR, canonical_id);
     ret = g_quark_from_string (hex);
     
     g_free (canonical_id);

Modified: trunk/ssh/seahorse-ssh-key.h
==============================================================================
--- trunk/ssh/seahorse-ssh-key.h	(original)
+++ trunk/ssh/seahorse-ssh-key.h	Tue Apr 29 02:20:04 2008
@@ -41,7 +41,7 @@
 
 #include <gtk/gtk.h>
 
-#include "sea-ssh.h"
+#include "seahorse-ssh.h"
 #include "seahorse-key.h"
 #include "seahorse-ssh-source.h"
 #include "seahorse-ssh-key-data.h"

Modified: trunk/ssh/seahorse-ssh-source.c
==============================================================================
--- trunk/ssh/seahorse-ssh-source.c	(original)
+++ trunk/ssh/seahorse-ssh-source.c	Tue Apr 29 02:20:04 2008
@@ -743,7 +743,7 @@
     
     switch (prop_id) {
     case PROP_KEY_TYPE:
-        g_value_set_uint (value, SEA_SSH);
+        g_value_set_uint (value, SEAHORSE_SSH);
         break;
     case PROP_KEY_DESC:
         g_value_set_string (value, _("Secure Shell Key"));
@@ -861,7 +861,7 @@
         g_param_spec_string ("base-directory", "Key directory", "Directory where the keys are stored",
                              NULL, G_PARAM_READABLE));
     
-	sea_registry_register_type (NULL, SEAHORSE_TYPE_SSH_SOURCE, "key-source", "local", SEA_SSH_STR, NULL);
+	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_SSH_SOURCE, "key-source", "local", SEAHORSE_SSH_STR, NULL);
 }
 
 /* -----------------------------------------------------------------------------

Modified: trunk/ssh/seahorse-ssh-source.h
==============================================================================
--- trunk/ssh/seahorse-ssh-source.h	(original)
+++ trunk/ssh/seahorse-ssh-source.h	Tue Apr 29 02:20:04 2008
@@ -29,7 +29,7 @@
  * - Monitors ~/.ssh for changes and reloads the key ring as necessary.
  * 
  * Properties:
- *  ktype: (GQuark) The ktype (ie: SEA_SSH) of keys originating from this 
+ *  ktype: (GQuark) The ktype (ie: SEAHORSE_SSH) of keys originating from this 
            key source.
  *  location: (SeahorseKeyLoc) The location of keys that come from this 
  *         source. (ie: SKEY_LOC_LOCAL)

Copied: trunk/ssh/seahorse-ssh.c (from r2192, /trunk/ssh/sea-ssh.c)
==============================================================================
--- /trunk/ssh/sea-ssh.c	(original)
+++ trunk/ssh/seahorse-ssh.c	Tue Apr 29 02:20:04 2008
@@ -1,11 +1,31 @@
+/* 
+ * Seahorse
+ * 
+ * Copyright (C) 2008 Stefan Walter
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
+ */
 
 #include "config.h"
 
-#include "sea-ssh.h"
+#include "seahorse-ssh.h"
 
 #include "seahorse-ssh-source.h"
 
-const SeaRegisterType SEA_SSH_REGISTRY[] = {
+const SeahorseRegisterType SEAHORSE_SSH_REGISTRY[] = {
 	seahorse_ssh_source_get_type,
 	NULL
 };

Copied: trunk/ssh/seahorse-ssh.h (from r2192, /trunk/ssh/sea-ssh.h)
==============================================================================
--- /trunk/ssh/sea-ssh.h	(original)
+++ trunk/ssh/seahorse-ssh.h	Tue Apr 29 02:20:04 2008
@@ -1,11 +1,32 @@
+/* 
+ * Seahorse
+ * 
+ * Copyright (C) 2008 Stefan Walter
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
+ */
+
 #ifndef SEASSH_H_
 #define SEASSH_H_
 
-#include "common/sea-registry.h"
+#include "common/seahorse-registry.h"
 
-#define SEA_SSH_STR                     "openssh"
-#define SEA_SSH                         (g_quark_from_static_string (SEA_SSH_STR))
+#define SEAHORSE_SSH_STR                     "openssh"
+#define SEAHORSE_SSH                         (g_quark_from_static_string (SEAHORSE_SSH_STR))
 
-extern const SeaRegisterType SEA_SSH_REGISTRY[];
+extern const SeahorseRegisterType SEAHORSE_SSH_REGISTRY[];
 
 #endif /*SEASSH_H_*/