seahorse r2737 - in trunk: . daemon gkr libseahorse pgp pkcs11 src ssh



Author: nnielsen
Date: Sun Feb  1 20:21:45 2009
New Revision: 2737
URL: http://svn.gnome.org/viewvc/seahorse?rev=2737&view=rev

Log:
	* daemon/seahorse-service.c:
	* gkr/seahorse-gkr-keyring.c:
	* gkr/seahorse-gkr-source.c:
	* libseahorse/seahorse-commands.c:
	* libseahorse/seahorse-context.c:
	* libseahorse/seahorse-source.h:
	* libseahorse/seahorse-source.c:
	* libseahorse/seahorse-unknown-source.c:
	* pgp/seahorse-gpgme-source.c:
	* pgp/seahorse-hkp-source.c:
	* pgp/seahorse-ldap-source.c:
	* pgp/seahorse-server-source.c:
	* pkcs11/seahorse-pkcs11-source.c:
	* src/seahorse-keyserver-sync.c:
	* ssh/seahorse-ssh-source.c: Rename the SeahorseSource properties so that they
	can be more easily defined on SeahorseObject objects. Removes a wrinkle for
	implementing source and object on the same class.

Modified:
   trunk/ChangeLog
   trunk/daemon/seahorse-service.c
   trunk/gkr/seahorse-gkr-keyring.c
   trunk/gkr/seahorse-gkr-source.c
   trunk/libseahorse/seahorse-commands.c
   trunk/libseahorse/seahorse-context.c
   trunk/libseahorse/seahorse-source.c
   trunk/libseahorse/seahorse-source.h
   trunk/libseahorse/seahorse-unknown-source.c
   trunk/pgp/seahorse-gpgme-source.c
   trunk/pgp/seahorse-hkp-source.c
   trunk/pgp/seahorse-ldap-source.c
   trunk/pgp/seahorse-server-source.c
   trunk/pkcs11/seahorse-pkcs11-source.c
   trunk/src/seahorse-keyserver-sync.c
   trunk/ssh/seahorse-ssh-source.c

Modified: trunk/daemon/seahorse-service.c
==============================================================================
--- trunk/daemon/seahorse-service.c	(original)
+++ trunk/daemon/seahorse-service.c	Sun Feb  1 20:21:45 2009
@@ -323,7 +323,7 @@
     /* Fill in keysets for any keys already in the context */
     srcs = seahorse_context_find_sources (SCTX_APP (), SEAHORSE_TAG_INVALID, SEAHORSE_LOCATION_LOCAL);
     for (l = srcs; l; l = g_slist_next (l)) 
-        add_key_source (svc, seahorse_source_get_ktype (SEAHORSE_SOURCE (l->data)));
+        add_key_source (svc, seahorse_source_get_tag (SEAHORSE_SOURCE (l->data)));
     g_slist_free (srcs);
     
     /* And now listen for new key types */

Modified: trunk/gkr/seahorse-gkr-keyring.c
==============================================================================
--- trunk/gkr/seahorse-gkr-keyring.c	(original)
+++ trunk/gkr/seahorse-gkr-keyring.c	Sun Feb  1 20:21:45 2009
@@ -266,8 +266,8 @@
 
 enum {
 	PROP_0,
-	PROP_KEY_TYPE,
-	PROP_LOCATION,
+	PROP_SOURCE_TAG,
+	PROP_SOURCE_LOCATION,
 	PROP_KEYRING_NAME,
 	PROP_KEYRING_INFO
 };
@@ -470,10 +470,10 @@
 	SeahorseGkrKeyring *self = SEAHORSE_GKR_KEYRING (obj);
 	
 	switch (prop_id) {
-	case PROP_KEY_TYPE:
+	case PROP_SOURCE_TAG:
 		g_value_set_uint (value, SEAHORSE_GKR_TYPE);
 		break;
-	case PROP_LOCATION:
+	case PROP_SOURCE_LOCATION:
 		g_value_set_enum (value, SEAHORSE_LOCATION_LOCAL);
 		break;
 	case PROP_KEYRING_NAME:
@@ -507,8 +507,8 @@
 	seahorse_class->refresh = seahorse_gkr_keyring_refresh;
 	seahorse_class->delete = seahorse_gkr_keyring_delete;
 	
-	g_object_class_override_property (gobject_class, PROP_KEY_TYPE, "key-type");
-	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location");
 
 	g_object_class_install_property (gobject_class, PROP_KEYRING_NAME,
 	           g_param_spec_string ("keyring-name", "Gnome Keyring Name", "Name of keyring.", 

Modified: trunk/gkr/seahorse-gkr-source.c
==============================================================================
--- trunk/gkr/seahorse-gkr-source.c	(original)
+++ trunk/gkr/seahorse-gkr-source.c	Sun Feb  1 20:21:45 2009
@@ -60,9 +60,9 @@
 
 enum {
     PROP_0,
-    PROP_KEY_TYPE,
-    PROP_FLAGS,
-    PROP_LOCATION
+    PROP_SOURCE_TAG,
+    PROP_SOURCE_LOCATION,
+    PROP_FLAGS
 };
 
 static void seahorse_source_iface (SeahorseSourceIface *iface);
@@ -272,15 +272,15 @@
                                        GParamSpec *pspec)
 {
 	switch (prop_id) {
-	case PROP_KEY_TYPE:
+	case PROP_SOURCE_TAG:
 		g_value_set_uint (value, SEAHORSE_GKR);
 		break;
+	case PROP_SOURCE_LOCATION:
+		g_value_set_enum (value, SEAHORSE_LOCATION_LOCAL);
+		break;
 	case PROP_FLAGS:
 		g_value_set_uint (value, 0);
 		break;
-	case PROP_LOCATION:
-		g_value_set_enum (value, SEAHORSE_LOCATION_LOCAL);
-		break;
 	}
 }
 
@@ -313,8 +313,8 @@
 	         g_param_spec_uint ("flags", "Flags", "Object Source flags.", 
 	                            0, G_MAXUINT, 0, G_PARAM_READABLE));
 
-	g_object_class_override_property (gobject_class, PROP_KEY_TYPE, "key-type");
-	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location");
     
 	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_GKR_SOURCE, "source", "local", SEAHORSE_GKR_STR, NULL);
 }

Modified: trunk/libseahorse/seahorse-commands.c
==============================================================================
--- trunk/libseahorse/seahorse-commands.c	(original)
+++ trunk/libseahorse/seahorse-commands.c	Sun Feb  1 20:21:45 2009
@@ -198,15 +198,6 @@
 	return self->pv->view;
 }
 
-GQuark 
-seahorse_commands_get_ktype (SeahorseCommands* self) 
-{
-	GQuark ktype;
-	g_return_val_if_fail (SEAHORSE_IS_COMMANDS (self), 0);
-	g_object_get (self, "ktype", &ktype, NULL);
-	return ktype;
-}
-
 GtkActionGroup*
 seahorse_commands_get_command_actions (SeahorseCommands* self) 
 {

Modified: trunk/libseahorse/seahorse-context.c
==============================================================================
--- trunk/libseahorse/seahorse-context.c	(original)
+++ trunk/libseahorse/seahorse-context.c	Sun Feb  1 20:21:45 2009
@@ -348,7 +348,7 @@
         ks = SEAHORSE_SOURCE (l->data);
         
         if (ktype != SEAHORSE_TAG_INVALID && 
-            seahorse_source_get_ktype (ks) != ktype)
+            seahorse_source_get_tag (ks) != ktype)
             continue;
         
         if (location != SEAHORSE_LOCATION_INVALID && 
@@ -384,7 +384,7 @@
         ks = SEAHORSE_SOURCE (l->data);
         
         if (ktype != SEAHORSE_TAG_INVALID && 
-            seahorse_source_get_ktype (ks) != ktype)
+            seahorse_source_get_tag (ks) != ktype)
             continue;
         
         if (location != SEAHORSE_LOCATION_INVALID && 
@@ -975,7 +975,7 @@
         /* Export from this key source */
         from = seahorse_object_get_source (sobj);
         g_return_val_if_fail (from != NULL, FALSE);
-        ktype = seahorse_source_get_ktype (from);
+        ktype = seahorse_source_get_tag (from);
         
         /* Find a local keysource to import to */
         if (!to) {
@@ -988,7 +988,7 @@
         }
         
         /* Make sure it's the same type */
-        if (ktype != seahorse_source_get_ktype (to)) {
+        if (ktype != seahorse_source_get_tag (to)) {
             /* TODO: How can we warn caller about this. Do we need to? */
             g_warning ("destination is not of type: %s", 
                        g_quark_to_string (ktype));

Modified: trunk/libseahorse/seahorse-source.c
==============================================================================
--- trunk/libseahorse/seahorse-source.c	(original)
+++ trunk/libseahorse/seahorse-source.c	Sun Feb  1 20:21:45 2009
@@ -41,11 +41,11 @@
 		
 		/* Add properties and signals to the interface */
 		g_object_interface_install_property (gobject_class,
-		        g_param_spec_uint ("key-type", "Key Type", "Key type that originates from this key source.", 
+		        g_param_spec_uint ("source-tag", "Source Tag", "Tag of objects that come from this source.", 
 		                           0, G_MAXUINT, SEAHORSE_TAG_INVALID, G_PARAM_READABLE));
 
 		g_object_interface_install_property (gobject_class, 
-		        g_param_spec_enum ("location", "Key Location", "Where the key is stored. See SeahorseLocation", 
+		        g_param_spec_enum ("source-location", "Source Location", "Objects in this source are at this location. See SeahorseLocation", 
 		                           SEAHORSE_TYPE_LOCATION, SEAHORSE_LOCATION_LOCAL, G_PARAM_READABLE));
 		
 		initialized = TRUE;
@@ -336,10 +336,10 @@
 }
                                      
 GQuark              
-seahorse_source_get_ktype (SeahorseSource *sksrc)
+seahorse_source_get_tag (SeahorseSource *sksrc)
 {
     GQuark ktype;
-    g_object_get (sksrc, "key-type", &ktype, NULL);
+    g_object_get (sksrc, "source-tag", &ktype, NULL);
     return ktype;
 }
 
@@ -347,6 +347,6 @@
 seahorse_source_get_location (SeahorseSource *sksrc)
 {
     SeahorseLocation loc;
-    g_object_get (sksrc, "location", &loc, NULL);
+    g_object_get (sksrc, "source-location", &loc, NULL);
     return loc;
 }

Modified: trunk/libseahorse/seahorse-source.h
==============================================================================
--- trunk/libseahorse/seahorse-source.h	(original)
+++ trunk/libseahorse/seahorse-source.h	Sun Feb  1 20:21:45 2009
@@ -162,7 +162,7 @@
                                                            GSList *ids, 
                                                            GOutputStream *output);
 
-GQuark              seahorse_source_get_ktype             (SeahorseSource *sksrc);
+GQuark              seahorse_source_get_tag               (SeahorseSource *sksrc);
 
 SeahorseLocation    seahorse_source_get_location          (SeahorseSource *sksrc);
 

Modified: trunk/libseahorse/seahorse-unknown-source.c
==============================================================================
--- trunk/libseahorse/seahorse-unknown-source.c	(original)
+++ trunk/libseahorse/seahorse-unknown-source.c	Sun Feb  1 20:21:45 2009
@@ -32,8 +32,8 @@
 
 enum {
     PROP_0,
-    PROP_KEY_TYPE,
-    PROP_LOCATION
+    PROP_SOURCE_TAG,
+    PROP_SOURCE_LOCATION
 };
 
 static void seahorse_source_iface (SeahorseSourceIface *iface);
@@ -48,7 +48,7 @@
 static void
 search_done (SeahorseOperation *op, SeahorseObject *sobj)
 {
-	g_object_set (sobj, "location", SEAHORSE_LOCATION_MISSING, NULL);
+	g_object_set (sobj, "source-location", SEAHORSE_LOCATION_MISSING, NULL);
 }
 
 /* -----------------------------------------------------------------------------
@@ -68,7 +68,7 @@
     SeahorseUnknownSource *usrc = SEAHORSE_UNKNOWN_SOURCE (object);
     
     switch (prop_id) {
-    case PROP_KEY_TYPE:
+    case PROP_SOURCE_TAG:
         usrc->ktype = g_value_get_uint (value);
         break;
     }
@@ -81,10 +81,10 @@
     SeahorseUnknownSource *usrc = SEAHORSE_UNKNOWN_SOURCE (object);
     
     switch (prop_id) {
-    case PROP_KEY_TYPE:
+    case PROP_SOURCE_TAG:
         g_value_set_uint (value, usrc->ktype);
         break;
-    case PROP_LOCATION:
+    case PROP_SOURCE_LOCATION:
         g_value_set_enum (value, SEAHORSE_LOCATION_MISSING);
         break;
     }
@@ -106,8 +106,8 @@
 	gobject_class->set_property = seahorse_unknown_source_set_property;
 	gobject_class->get_property = seahorse_unknown_source_get_property;
     
-	g_object_class_override_property (gobject_class, PROP_KEY_TYPE, "key-type");
-	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location");
     
 	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_UNKNOWN_SOURCE, "source", NULL);
 }
@@ -125,7 +125,7 @@
 SeahorseUnknownSource*
 seahorse_unknown_source_new (GQuark ktype)
 {
-   return g_object_new (SEAHORSE_TYPE_UNKNOWN_SOURCE, "key-type", ktype, NULL);
+   return g_object_new (SEAHORSE_TYPE_UNKNOWN_SOURCE, "source-tag", ktype, NULL);
 }
 
 SeahorseObject*                     
@@ -143,7 +143,7 @@
     }
     
     if (search) {
-        g_object_set (sobj, "location", SEAHORSE_LOCATION_SEARCHING, NULL);
+        g_object_set (sobj, "source-location", SEAHORSE_LOCATION_SEARCHING, NULL);
         seahorse_operation_watch (search, (SeahorseDoneFunc) search_done, sobj, NULL, NULL);
     }
     

Modified: trunk/pgp/seahorse-gpgme-source.c
==============================================================================
--- trunk/pgp/seahorse-gpgme-source.c	(original)
+++ trunk/pgp/seahorse-gpgme-source.c	Sun Feb  1 20:21:45 2009
@@ -74,8 +74,8 @@
 
 enum {
     PROP_0,
-    PROP_KEY_TYPE,
-    PROP_LOCATION
+    PROP_SOURCE_TAG,
+    PROP_SOURCE_LOCATION
 };
 
 static gpgme_error_t
@@ -302,8 +302,8 @@
     gobject_class->set_property = seahorse_gpgme_source_set_property;
     gobject_class->get_property = seahorse_gpgme_source_get_property;
  
-	g_object_class_override_property (gobject_class, PROP_KEY_TYPE, "key-type");
-	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location");
 	
 	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_GPGME_SOURCE, "source", "local", SEAHORSE_PGP_STR, NULL);
 
@@ -429,10 +429,10 @@
                                   GParamSpec *pspec)
 {
     switch (prop_id) {
-    case PROP_KEY_TYPE:
+    case PROP_SOURCE_TAG:
         g_value_set_uint (value, SEAHORSE_PGP);
         break;
-    case PROP_LOCATION:
+    case PROP_SOURCE_LOCATION:
         g_value_set_enum (value, SEAHORSE_LOCATION_LOCAL);
         break;
     }

Modified: trunk/pgp/seahorse-hkp-source.c
==============================================================================
--- trunk/pgp/seahorse-hkp-source.c	(original)
+++ trunk/pgp/seahorse-hkp-source.c	Sun Feb  1 20:21:45 2009
@@ -731,8 +731,8 @@
 
 enum {
     PROP_0,
-    PROP_KEY_TYPE,
-    PROP_LOCATION
+    PROP_SOURCE_TAG,
+    PROP_SOURCE_LOCATION
 };
 
 static void seahorse_source_iface (SeahorseSourceIface *iface);
@@ -751,10 +751,10 @@
                                   GParamSpec *pspec)
 {
     switch (prop_id) {
-    case PROP_KEY_TYPE:
+    case PROP_SOURCE_TAG:
         g_value_set_uint (value, SEAHORSE_PGP);
         break;
-    case PROP_LOCATION:
+    case PROP_SOURCE_LOCATION:
         g_value_set_enum (value, SEAHORSE_LOCATION_REMOTE);
         break;
     };        
@@ -995,8 +995,8 @@
 	
 	seahorse_hkp_source_parent_class = g_type_class_peek_parent (klass);
 
-	g_object_class_override_property (gobject_class, PROP_KEY_TYPE, "key-type");
-	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location");
 
 	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_HKP_SOURCE, "source", "remote", SEAHORSE_PGP_STR, NULL);
 	seahorse_servers_register_type ("hkp", _("HTTP Key Server"), seahorse_hkp_is_valid_uri);

Modified: trunk/pgp/seahorse-ldap-source.c
==============================================================================
--- trunk/pgp/seahorse-ldap-source.c	(original)
+++ trunk/pgp/seahorse-ldap-source.c	Sun Feb  1 20:21:45 2009
@@ -1286,8 +1286,8 @@
  
 enum {
     PROP_0,
-    PROP_KEY_TYPE,
-    PROP_LOCATION
+    PROP_SOURCE_TAG,
+    PROP_SOURCE_LOCATION
 };
 
 static void seahorse_source_iface (SeahorseSourceIface *iface);
@@ -1306,10 +1306,10 @@
                                    GParamSpec *pspec)
 {
     switch (prop_id) {
-    case PROP_KEY_TYPE:
+    case PROP_SOURCE_TAG:
         g_value_set_uint (value, SEAHORSE_PGP);
         break;
-    case PROP_LOCATION:
+    case PROP_SOURCE_LOCATION:
         g_value_set_enum (value, SEAHORSE_LOCATION_REMOTE);
         break;
     };        
@@ -1414,8 +1414,8 @@
 
 	seahorse_ldap_source_parent_class = g_type_class_peek_parent (klass);
     
-	g_object_class_override_property (gobject_class, PROP_KEY_TYPE, "key-type");
-	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location");
 	    
 	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_LDAP_SOURCE, "source", "remote", SEAHORSE_PGP_STR, NULL);
 	seahorse_servers_register_type ("ldap", _("LDAP Key Server"), seahorse_ldap_is_valid_uri);

Modified: trunk/pgp/seahorse-server-source.c
==============================================================================
--- trunk/pgp/seahorse-server-source.c	(original)
+++ trunk/pgp/seahorse-server-source.c	Sun Feb  1 20:21:45 2009
@@ -37,8 +37,8 @@
 
 enum {
     PROP_0,
-    PROP_KEY_TYPE,
-    PROP_LOCATION,
+    PROP_SOURCE_TAG,
+    PROP_SOURCE_LOCATION,
     PROP_KEY_SERVER,
     PROP_URI
 };
@@ -85,8 +85,8 @@
     gobject_class->set_property = seahorse_server_set_property;
     gobject_class->get_property = seahorse_server_get_property;
 
-	g_object_class_override_property (gobject_class, PROP_KEY_TYPE, "key-type");
-	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location");
 	
     g_object_class_install_property (gobject_class, PROP_KEY_SERVER,
             g_param_spec_string ("key-server", "Key Server",
@@ -198,10 +198,10 @@
     case PROP_URI:
         g_value_set_string (value, ssrc->priv->uri);
         break;
-    case PROP_KEY_TYPE:
+    case PROP_SOURCE_TAG:
         g_value_set_uint (value, SEAHORSE_PGP);
         break;
-    case PROP_LOCATION:
+    case PROP_SOURCE_LOCATION:
         g_value_set_enum (value, SEAHORSE_LOCATION_REMOTE);
         break;
     }        

Modified: trunk/pkcs11/seahorse-pkcs11-source.c
==============================================================================
--- trunk/pkcs11/seahorse-pkcs11-source.c	(original)
+++ trunk/pkcs11/seahorse-pkcs11-source.c	Sun Feb  1 20:21:45 2009
@@ -43,9 +43,9 @@
 enum {
     PROP_0,
     PROP_SLOT,
-    PROP_KEY_TYPE,
-    PROP_FLAGS,
-    PROP_LOCATION
+    PROP_SOURCE_TAG,
+    PROP_SOURCE_LOCATION,
+    PROP_FLAGS
 };
 
 struct _SeahorsePkcs11SourcePrivate {
@@ -91,15 +91,15 @@
 	case PROP_SLOT:
 		g_value_set_object (value, self->pv->slot);
 		break;
-	case PROP_KEY_TYPE:
+	case PROP_SOURCE_TAG:
 		g_value_set_uint (value, SEAHORSE_PKCS11_TYPE);
 		break;
+	case PROP_SOURCE_LOCATION:
+		g_value_set_enum (value, SEAHORSE_LOCATION_LOCAL);
+		break;
 	case PROP_FLAGS:
 		g_value_set_uint (value, 0);
 		break;
-	case PROP_LOCATION:
-		g_value_set_enum (value, SEAHORSE_LOCATION_LOCAL);
-		break;
 	}
 }
 
@@ -171,8 +171,8 @@
 	         g_param_spec_uint ("flags", "Flags", "Object Source flags.", 
 	                            0, G_MAXUINT, 0, G_PARAM_READABLE));
 
-	g_object_class_override_property (gobject_class, PROP_KEY_TYPE, "key-type");
-	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location");
     
 	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_PKCS11_SOURCE, "source", "local", SEAHORSE_PKCS11_TYPE_STR, NULL);
 }

Modified: trunk/src/seahorse-keyserver-sync.c
==============================================================================
--- trunk/src/seahorse-keyserver-sync.c	(original)
+++ trunk/src/seahorse-keyserver-sync.c	Sun Feb  1 20:21:45 2009
@@ -215,7 +215,7 @@
             continue;
         
         lsksrc = seahorse_context_find_source (SCTX_APP (), 
-                        seahorse_source_get_ktype (sksrc), SEAHORSE_LOCATION_LOCAL);
+                        seahorse_source_get_tag (sksrc), SEAHORSE_LOCATION_LOCAL);
         
         if (lsksrc) {
             op = seahorse_transfer_operation_new (_("Synchronizing keys"), sksrc, lsksrc, keyids);

Modified: trunk/ssh/seahorse-ssh-source.c
==============================================================================
--- trunk/ssh/seahorse-ssh-source.c	(original)
+++ trunk/ssh/seahorse-ssh-source.c	Sun Feb  1 20:21:45 2009
@@ -61,8 +61,8 @@
 
 enum {
     PROP_0,
-    PROP_KEY_TYPE,
-    PROP_LOCATION,
+    PROP_SOURCE_TAG,
+    PROP_SOURCE_LOCATION,
     PROP_BASE_DIRECTORY
 };
 
@@ -608,10 +608,10 @@
     SeahorseSSHSource *ssrc = SEAHORSE_SSH_SOURCE (object);
     
     switch (prop_id) {
-    case PROP_KEY_TYPE:
+    case PROP_SOURCE_TAG:
         g_value_set_uint (value, SEAHORSE_SSH);
         break;
-    case PROP_LOCATION:
+    case PROP_SOURCE_LOCATION:
         g_value_set_enum (value, SEAHORSE_LOCATION_LOCAL);
         break;
     case PROP_BASE_DIRECTORY:
@@ -699,8 +699,8 @@
     gobject_class->set_property = seahorse_ssh_source_set_property;
     gobject_class->get_property = seahorse_ssh_source_get_property;
     
-	g_object_class_override_property (gobject_class, PROP_KEY_TYPE, "key-type");
-	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_TAG, "source-tag");
+	g_object_class_override_property (gobject_class, PROP_SOURCE_LOCATION, "source-location");
 
     g_object_class_install_property (gobject_class, PROP_BASE_DIRECTORY,
         g_param_spec_string ("base-directory", "Key directory", "Directory where the keys are stored",



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]