GNOME.org
 

[seahorse] Fix for incompatibility with libsecret

commit e92a5fa9cdcba78ddcc261065793159ca7d0466a
Author: Stef Walter <stefw gnome org>
Date:   Mon Jul 16 14:32:33 2012 +0200

    Fix for incompatibility with libsecret
    
     * SecretItem already has a 'flags' property, so we need to rename
       the one in seahorse to 'object-flags'

 gkr/seahorse-gkr-item.c          |    4 ++--
 libseahorse/seahorse-object.c    |    4 ++--
 libseahorse/seahorse-predicate.c |    2 +-
 pgp/seahorse-gpgme-key.c         |    2 +-
 pgp/seahorse-hkp-source.c        |    2 +-
 pgp/seahorse-ldap-source.c       |    2 +-
 pkcs11/seahorse-certificate.c    |    2 +-
 pkcs11/seahorse-private-key.c    |    2 +-
 pkcs11/seahorse-token.c          |    2 +-
 ssh/seahorse-ssh-key.c           |    4 ++--
 10 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/gkr/seahorse-gkr-item.c b/gkr/seahorse-gkr-item.c
index acdd3fd..a1185c1 100644
--- a/gkr/seahorse-gkr-item.c
+++ b/gkr/seahorse-gkr-item.c
@@ -507,7 +507,7 @@ seahorse_gkr_item_g_properties_changed (GDBusProxy *proxy,
 	g_object_notify (obj, "icon");
 	g_object_notify (obj, "markup");
 	g_object_notify (obj, "description");
-	g_object_notify (obj, "flags");
+	g_object_notify (obj, "object-flags");
 	g_object_thaw_notify (obj);
 }
 
@@ -720,7 +720,7 @@ seahorse_gkr_item_class_init (SeahorseGkrItemClass *klass)
 	                              G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_FLAGS,
-	         g_param_spec_flags ("flags", "flags", "flags", SEAHORSE_TYPE_FLAGS, SEAHORSE_FLAG_NONE,
+	         g_param_spec_flags ("object-flags", "Flags", "Flags", SEAHORSE_TYPE_FLAGS, SEAHORSE_FLAG_NONE,
 	                              G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 
 	g_object_class_install_property (gobject_class, PROP_ICON,
diff --git a/libseahorse/seahorse-object.c b/libseahorse/seahorse-object.c
index 5fa9930..89b27d2 100644
--- a/libseahorse/seahorse-object.c
+++ b/libseahorse/seahorse-object.c
@@ -358,7 +358,7 @@ seahorse_object_set_property (GObject *obj, guint prop_id, const GValue *value,
 		flags = g_value_get_uint (value);
 		if (flags != self->pv->flags) {
 			self->pv->flags = flags;
-			g_object_notify (obj, "flags");
+			g_object_notify (obj, "object-flags");
 		}
 		break;
 	default:
@@ -420,7 +420,7 @@ seahorse_object_class_init (SeahorseObjectClass *klass)
 	                              SEAHORSE_TYPE_USAGE, SEAHORSE_USAGE_NONE, G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_FLAGS,
-	           g_param_spec_uint ("flags", "Object Flags", "This object's flags.", 
+	           g_param_spec_uint ("object-flags", "Object Flags", "This object's flags.",
 	                              0, G_MAXUINT, 0, G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_DELETABLE,
diff --git a/libseahorse/seahorse-predicate.c b/libseahorse/seahorse-predicate.c
index c9568d4..22c58f5 100644
--- a/libseahorse/seahorse-predicate.c
+++ b/libseahorse/seahorse-predicate.c
@@ -59,7 +59,7 @@ seahorse_predicate_match (SeahorsePredicate *pred,
 
 	if (pred->flags != 0 || pred->nflags != 0) {
 		SeahorseFlags flags = 0;
-		g_object_get (obj, "flags", &flags, NULL);
+		g_object_get (obj, "object-flags", &flags, NULL);
 		if (pred->flags != 0 && (pred->flags & flags) == 0)
 			return FALSE;
 		if (pred->nflags != 0 && (pred->nflags & flags) != 0)
diff --git a/pgp/seahorse-gpgme-key.c b/pgp/seahorse-gpgme-key.c
index aedb071..466c8b4 100644
--- a/pgp/seahorse-gpgme-key.c
+++ b/pgp/seahorse-gpgme-key.c
@@ -367,7 +367,7 @@ seahorse_gpgme_key_realize (SeahorseGpgmeKey *self)
 	actions = seahorse_gpgme_key_actions_instance ();
 	g_object_set (self,
 	              "usage", usage,
-	              "flags", flags,
+	              "object-flags", flags,
 	              "actions", actions,
 	              NULL);
 	g_object_unref (actions);
diff --git a/pgp/seahorse-hkp-source.c b/pgp/seahorse-hkp-source.c
index 381a503..dc91e5e 100644
--- a/pgp/seahorse-hkp-source.c
+++ b/pgp/seahorse-hkp-source.c
@@ -419,7 +419,7 @@ parse_hkp_index (const gchar *response)
 
 				key = seahorse_pgp_key_new ();
 				keys = g_list_prepend (keys, key);
-				g_object_set (key, "flags", flags, NULL);
+				g_object_set (key, "object-flags", flags, NULL);
 
 				/* Add all the info to the key */
 				subkey = seahorse_pgp_subkey_new ();
diff --git a/pgp/seahorse-ldap-source.c b/pgp/seahorse-ldap-source.c
index 97425c2..5e2601f 100644
--- a/pgp/seahorse-ldap-source.c
+++ b/pgp/seahorse-ldap-source.c
@@ -845,7 +845,7 @@ search_parse_key_from_ldap_entry (SeahorseLDAPSource *self,
 		seahorse_pgp_key_set_subkeys (key, list);
 		seahorse_object_list_free (list);
 		g_object_set (key,
-		              "flags", flags,
+		              "object-flags", flags,
 		              "place", self,
 		              NULL);
 
diff --git a/pkcs11/seahorse-certificate.c b/pkcs11/seahorse-certificate.c
index f9c0af7..8408731 100644
--- a/pkcs11/seahorse-certificate.c
+++ b/pkcs11/seahorse-certificate.c
@@ -287,7 +287,7 @@ seahorse_certificate_class_init (SeahorseCertificateClass *klass)
 	                              G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_FLAGS,
-	         g_param_spec_flags ("flags", "flags", "flags", SEAHORSE_TYPE_FLAGS, SEAHORSE_FLAG_NONE,
+	         g_param_spec_flags ("object-flags", "flags", "flags", SEAHORSE_TYPE_FLAGS, SEAHORSE_FLAG_NONE,
 	                              G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 
 	g_object_class_install_property (gobject_class, PROP_ACTIONS,
diff --git a/pkcs11/seahorse-private-key.c b/pkcs11/seahorse-private-key.c
index f5d1cfe..7327811 100644
--- a/pkcs11/seahorse-private-key.c
+++ b/pkcs11/seahorse-private-key.c
@@ -235,7 +235,7 @@ seahorse_private_key_class_init (SeahorsePrivateKeyClass *klass)
 	                              G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class, PROP_FLAGS,
-	         g_param_spec_flags ("flags", "flags", "flags", SEAHORSE_TYPE_FLAGS, SEAHORSE_FLAG_NONE,
+	         g_param_spec_flags ("object-flags", "flags", "flags", SEAHORSE_TYPE_FLAGS, SEAHORSE_FLAG_NONE,
 	                              G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
 
 	g_object_class_install_property (gobject_class, PROP_ACTIONS,
diff --git a/pkcs11/seahorse-token.c b/pkcs11/seahorse-token.c
index 0faf04c..cdf605e 100644
--- a/pkcs11/seahorse-token.c
+++ b/pkcs11/seahorse-token.c
@@ -702,7 +702,7 @@ seahorse_token_class_init (SeahorseTokenClass *klass)
 	                              GCK_TYPE_SLOT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
 	g_object_class_install_property (gobject_class, PROP_FLAGS,
-	         g_param_spec_uint ("flags", "Flags", "Object Token flags.",
+	         g_param_spec_uint ("object-flags", "Flags", "Object Token flags.",
 	                            0, G_MAXUINT, 0, G_PARAM_READABLE));
 
 	g_object_class_install_property (gobject_class, PROP_INFO,
diff --git a/ssh/seahorse-ssh-key.c b/ssh/seahorse-ssh-key.c
index 916a2f0..4a37435 100644
--- a/ssh/seahorse-ssh-key.c
+++ b/ssh/seahorse-ssh-key.c
@@ -124,7 +124,7 @@ changed_key (SeahorseSSHKey *self)
 		              "icon", NULL,
 		              "usage", SEAHORSE_USAGE_NONE,
 		              "nickname", "",
-		              "flags", SEAHORSE_FLAG_DISABLED,
+		              "object-flags", SEAHORSE_FLAG_DISABLED,
 		              NULL);
 		return;
 	} 
@@ -163,7 +163,7 @@ changed_key (SeahorseSSHKey *self)
 	              "usage", usage,
 	              "nickname", simple,
 	              "identifier", identifier,
-	              "flags", flags,
+	              "object-flags", flags,
 	              NULL);
 
 	g_object_unref (actions);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]