seahorse r2736 - in trunk: . gkr libseahorse pgp pkcs11 ssh

From: nnielsen svn gnome org
To: svn-commits-list gnome org
Subject: seahorse r2736 - in trunk: . gkr libseahorse pgp pkcs11 ssh
Date: Sun, 1 Feb 2009 20:20:00 +0000 (UTC)
Author: nnielsen
Date: Sun Feb  1 20:20:00 2009
New Revision: 2736
URL: http://svn.gnome.org/viewvc/seahorse?rev=2736&view=rev

Log:
	* gkr/seahorse-gkr-keyring.c:
	* gkr/seahorse-gkr-source.c:
	* libseahorse/seahorse-source.c:
	* libseahorse/seahorse-source.h:
	* 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:
	* ssh/seahorse-ssh-source.c: Remove unused 'key-desc' property from sources.

Modified:
   trunk/ChangeLog
   trunk/gkr/seahorse-gkr-keyring.c
   trunk/gkr/seahorse-gkr-source.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/ssh/seahorse-ssh-source.c

Modified: trunk/gkr/seahorse-gkr-keyring.c
==============================================================================
--- trunk/gkr/seahorse-gkr-keyring.c	(original)
+++ trunk/gkr/seahorse-gkr-keyring.c	Sun Feb  1 20:20:00 2009
@@ -267,7 +267,6 @@
 enum {
 	PROP_0,
 	PROP_KEY_TYPE,
-	PROP_KEY_DESC,
 	PROP_LOCATION,
 	PROP_KEYRING_NAME,
 	PROP_KEYRING_INFO
@@ -474,9 +473,6 @@
 	case PROP_KEY_TYPE:
 		g_value_set_uint (value, SEAHORSE_GKR_TYPE);
 		break;
-	case PROP_KEY_DESC:
-		g_value_set_string (value, _("Passwords"));
-		break;
 	case PROP_LOCATION:
 		g_value_set_enum (value, SEAHORSE_LOCATION_LOCAL);
 		break;
@@ -512,7 +508,6 @@
 	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_KEY_DESC, "key-desc");
 	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
 
 	g_object_class_install_property (gobject_class, PROP_KEYRING_NAME,

Modified: trunk/gkr/seahorse-gkr-source.c
==============================================================================
--- trunk/gkr/seahorse-gkr-source.c	(original)
+++ trunk/gkr/seahorse-gkr-source.c	Sun Feb  1 20:20:00 2009
@@ -62,7 +62,6 @@
     PROP_0,
     PROP_KEY_TYPE,
     PROP_FLAGS,
-    PROP_KEY_DESC,
     PROP_LOCATION
 };
 
@@ -279,9 +278,6 @@
 	case PROP_FLAGS:
 		g_value_set_uint (value, 0);
 		break;
-	case PROP_KEY_DESC:
-		g_value_set_string (value, _("Password"));
-		break;
 	case PROP_LOCATION:
 		g_value_set_enum (value, SEAHORSE_LOCATION_LOCAL);
 		break;
@@ -318,7 +314,6 @@
 	                            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_KEY_DESC, "key-desc");
 	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
     
 	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_GKR_SOURCE, "source", "local", SEAHORSE_GKR_STR, NULL);

Modified: trunk/libseahorse/seahorse-source.c
==============================================================================
--- trunk/libseahorse/seahorse-source.c	(original)
+++ trunk/libseahorse/seahorse-source.c	Sun Feb  1 20:20:00 2009
@@ -45,10 +45,6 @@
 		                           0, G_MAXUINT, SEAHORSE_TAG_INVALID, G_PARAM_READABLE));
 
 		g_object_interface_install_property (gobject_class, 
-		        g_param_spec_string ("key-desc", "Key Desc", "Description for keys that originate here.",
-		                             NULL, G_PARAM_READABLE));
-
-		g_object_interface_install_property (gobject_class, 
 		        g_param_spec_enum ("location", "Key Location", "Where the key is stored. See SeahorseLocation", 
 		                           SEAHORSE_TYPE_LOCATION, SEAHORSE_LOCATION_LOCAL, G_PARAM_READABLE));
 		

Modified: trunk/libseahorse/seahorse-source.h
==============================================================================
--- trunk/libseahorse/seahorse-source.h	(original)
+++ trunk/libseahorse/seahorse-source.h	Sun Feb  1 20:20:00 2009
@@ -31,7 +31,6 @@
  * Properties base classes must implement:
  *  ktype: (GQuark) The ktype (ie: SEAHORSE_PGP) of objects originating from this 
  *         object source.
- *  key-desc: (gchar*) Description for the type of keys originating here.
  *  location: (SeahorseLocation) The location of objects that come from this 
  *         source. (ie: SEAHORSE_LOCATION_LOCAL, SEAHORSE_LOCATION_REMOTE)
  *  uri: (gchar*) Only for remote object sources. The full URI of the keyserver 

Modified: trunk/libseahorse/seahorse-unknown-source.c
==============================================================================
--- trunk/libseahorse/seahorse-unknown-source.c	(original)
+++ trunk/libseahorse/seahorse-unknown-source.c	Sun Feb  1 20:20:00 2009
@@ -33,7 +33,6 @@
 enum {
     PROP_0,
     PROP_KEY_TYPE,
-    PROP_KEY_DESC,
     PROP_LOCATION
 };
 
@@ -85,9 +84,6 @@
     case PROP_KEY_TYPE:
         g_value_set_uint (value, usrc->ktype);
         break;
-    case PROP_KEY_DESC:
-        g_value_set_string (value, _("Unavailable Key"));
-        break;
     case PROP_LOCATION:
         g_value_set_enum (value, SEAHORSE_LOCATION_MISSING);
         break;
@@ -111,7 +107,6 @@
 	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_KEY_DESC, "key-desc");
 	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
     
 	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_UNKNOWN_SOURCE, "source", 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:20:00 2009
@@ -75,7 +75,6 @@
 enum {
     PROP_0,
     PROP_KEY_TYPE,
-    PROP_KEY_DESC,
     PROP_LOCATION
 };
 
@@ -304,7 +303,6 @@
     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_KEY_DESC, "key-desc");
 	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
 	
 	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_GPGME_SOURCE, "source", "local", SEAHORSE_PGP_STR, NULL);
@@ -434,9 +432,6 @@
     case PROP_KEY_TYPE:
         g_value_set_uint (value, SEAHORSE_PGP);
         break;
-    case PROP_KEY_DESC:
-        g_value_set_string (value, _("PGP Key"));
-        break;
     case PROP_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:20:00 2009
@@ -732,7 +732,6 @@
 enum {
     PROP_0,
     PROP_KEY_TYPE,
-    PROP_KEY_DESC,
     PROP_LOCATION
 };
 
@@ -755,9 +754,6 @@
     case PROP_KEY_TYPE:
         g_value_set_uint (value, SEAHORSE_PGP);
         break;
-    case PROP_KEY_DESC:
-        g_value_set_string (value, _("PGP Key"));
-        break;
     case PROP_LOCATION:
         g_value_set_enum (value, SEAHORSE_LOCATION_REMOTE);
         break;
@@ -1000,7 +996,6 @@
 	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_KEY_DESC, "key-desc");
 	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
 
 	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_HKP_SOURCE, "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	Sun Feb  1 20:20:00 2009
@@ -1287,7 +1287,6 @@
 enum {
     PROP_0,
     PROP_KEY_TYPE,
-    PROP_KEY_DESC,
     PROP_LOCATION
 };
 
@@ -1310,9 +1309,6 @@
     case PROP_KEY_TYPE:
         g_value_set_uint (value, SEAHORSE_PGP);
         break;
-    case PROP_KEY_DESC:
-        g_value_set_string (value, _("PGP Key"));
-        break;
     case PROP_LOCATION:
         g_value_set_enum (value, SEAHORSE_LOCATION_REMOTE);
         break;
@@ -1419,7 +1415,6 @@
 	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_KEY_DESC, "key-desc");
 	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
 	    
 	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_LDAP_SOURCE, "source", "remote", SEAHORSE_PGP_STR, NULL);

Modified: trunk/pgp/seahorse-server-source.c
==============================================================================
--- trunk/pgp/seahorse-server-source.c	(original)
+++ trunk/pgp/seahorse-server-source.c	Sun Feb  1 20:20:00 2009
@@ -38,7 +38,6 @@
 enum {
     PROP_0,
     PROP_KEY_TYPE,
-    PROP_KEY_DESC,
     PROP_LOCATION,
     PROP_KEY_SERVER,
     PROP_URI
@@ -87,7 +86,6 @@
     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_KEY_DESC, "key-desc");
 	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
 	
     g_object_class_install_property (gobject_class, PROP_KEY_SERVER,
@@ -203,9 +201,6 @@
     case PROP_KEY_TYPE:
         g_value_set_uint (value, SEAHORSE_PGP);
         break;
-    case PROP_KEY_DESC:
-        g_value_set_string (value, _("PGP Key"));
-        break;
     case PROP_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:20:00 2009
@@ -45,7 +45,6 @@
     PROP_SLOT,
     PROP_KEY_TYPE,
     PROP_FLAGS,
-    PROP_KEY_DESC,
     PROP_LOCATION
 };
 
@@ -98,9 +97,6 @@
 	case PROP_FLAGS:
 		g_value_set_uint (value, 0);
 		break;
-	case PROP_KEY_DESC:
-		g_value_set_string (value, _("X509 Certificates"));
-		break;
 	case PROP_LOCATION:
 		g_value_set_enum (value, SEAHORSE_LOCATION_LOCAL);
 		break;
@@ -176,7 +172,6 @@
 	                            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_KEY_DESC, "key-desc");
 	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
     
 	seahorse_registry_register_type (NULL, SEAHORSE_TYPE_PKCS11_SOURCE, "source", "local", SEAHORSE_PKCS11_TYPE_STR, NULL);

Modified: trunk/ssh/seahorse-ssh-source.c
==============================================================================
--- trunk/ssh/seahorse-ssh-source.c	(original)
+++ trunk/ssh/seahorse-ssh-source.c	Sun Feb  1 20:20:00 2009
@@ -62,7 +62,6 @@
 enum {
     PROP_0,
     PROP_KEY_TYPE,
-    PROP_KEY_DESC,
     PROP_LOCATION,
     PROP_BASE_DIRECTORY
 };
@@ -612,9 +611,6 @@
     case PROP_KEY_TYPE:
         g_value_set_uint (value, SEAHORSE_SSH);
         break;
-    case PROP_KEY_DESC:
-        g_value_set_string (value, _("Secure Shell Key"));
-        break;
     case PROP_LOCATION:
         g_value_set_enum (value, SEAHORSE_LOCATION_LOCAL);
         break;
@@ -704,7 +700,6 @@
     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_KEY_DESC, "key-desc");
 	g_object_class_override_property (gobject_class, PROP_LOCATION, "location");
 
     g_object_class_install_property (gobject_class, PROP_BASE_DIRECTORY,
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]