[seahorse/refactor: 25/33] Add descriptions and clearer markup to various object types
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse/refactor: 25/33] Add descriptions and clearer markup to various object types
- Date: Tue, 18 Oct 2011 07:08:47 +0000 (UTC)
commit 75c2323828286bb41a619a580ce38741728714cb
Author: Stef Walter <stefw collabora co uk>
Date: Thu Oct 13 19:23:53 2011 +0200
Add descriptions and clearer markup to various object types
gkr/seahorse-gkr-item.c | 498 +++++++++++++++++++++---------
libseahorse/seahorse-key-manager-store.c | 188 +++---------
pgp/seahorse-pgp-key.c | 21 +-
ssh/seahorse-ssh-key.c | 40 ++-
4 files changed, 435 insertions(+), 312 deletions(-)
---
diff --git a/gkr/seahorse-gkr-item.c b/gkr/seahorse-gkr-item.c
index 9e15de0..11b04cf 100644
--- a/gkr/seahorse-gkr-item.c
+++ b/gkr/seahorse-gkr-item.c
@@ -42,11 +42,16 @@
#define CHAINED_KEYRING "org.gnome.keyring.ChainedKeyring"
#define ENCRYPTION_KEY "org.gnome.keyring.EncryptionKey"
#define PK_STORAGE "org.gnome.keyring.PkStorage"
+#define CHROME_PASSWORD "x.internal.Chrome"
+#define GOA_PASSWORD "org.gnome.OnlineAccounts"
+#define TELEPATHY_PASSWORD "org.freedesktop.Telepathy"
+#define EMPATHY_PASSWORD "org.freedesktop.Empathy"
+#define NETWORK_MANAGER_SECRET "org.freedesktop.NetworkManager"
typedef struct _DisplayEntry DisplayEntry;
typedef struct _DisplayInfo DisplayInfo;
-typedef void (*DisplayCustom) (DisplayEntry *entry,
+typedef void (*DisplayCustom) (const DisplayEntry *entry,
GnomeKeyringItemInfo *item_info,
GnomeKeyringAttributeList *item_attrs,
DisplayInfo *info);
@@ -71,6 +76,11 @@ typedef struct {
const gchar *match_pattern;
} MappingEntry;
+typedef struct {
+ GnomeKeyringItemType old;
+ const gchar *item_type;
+} OldItemTypes;
+
static guint32
get_attribute_int (GnomeKeyringAttributeList *attrs,
const gchar *name)
@@ -110,11 +120,23 @@ get_attribute_string (GnomeKeyringAttributeList *attrs,
}
static gboolean
-is_custom_display_name (const gchar *server,
- const gchar *user,
- const gchar *object,
- guint32 port,
- const gchar *display)
+is_network_item (GnomeKeyringAttributeList *attrs,
+ const gchar *match)
+{
+ const gchar *protocol;
+
+ g_assert (match);
+
+ protocol = get_attribute_string (attrs, "protocol");
+ return protocol && strcasecmp (protocol, match) == 0;
+}
+
+static gboolean
+is_custom_network_label (const gchar *server,
+ const gchar *user,
+ const gchar *object,
+ guint32 port,
+ const gchar *display)
{
GString *generated;
gboolean ret;
@@ -145,38 +167,32 @@ is_custom_display_name (const gchar *server,
}
static gchar *
-calc_network_label (GnomeKeyringItemInfo *info,
- GnomeKeyringAttributeList *attrs,
+calc_network_label (GnomeKeyringAttributeList *attrs,
gboolean always)
{
const gchar *val;
- gchar *display;
/* HTTP usually has a the realm as the "object" display that */
- if (is_network_item (attrs, "http") && self->pv->item_attrs) {
- val = seahorse_gkr_item_get_attribute (self, "object");
- if (val && val[0]) {
- g_free (display);
- return g_strdup (val);
- }
- }
-
- /* Display the server name as a last resort */
- if (always) {
- val = seahorse_gkr_item_get_attribute (self, "server");
- if (val && val[0]) {
- g_free (display);
- return g_strdup (val);
- }
- }
+ if (is_network_item (attrs, "http") && attrs != NULL) {
+ val = get_attribute_string (attrs, "object");
+ if (val && val[0])
+ return g_strdup (val);
+
+ /* Display the server name as a last resort */
+ if (always) {
+ val = get_attribute_string (attrs, "server");
+ if (val && val[0])
+ return g_strdup (val);
}
+ }
- return always ? display : NULL;
+ return NULL;
}
+
static void
-network_custom (DisplayEntry *entry,
- GnomeKeyringItemInfo *item_info,
- GnomeKeyringAttributeList *item_attrs,
+network_custom (const DisplayEntry *entry,
+ GnomeKeyringItemInfo *item,
+ GnomeKeyringAttributeList *attrs,
DisplayInfo *info)
{
const gchar *object;
@@ -184,45 +200,178 @@ network_custom (DisplayEntry *entry,
const gchar *protocol;
const gchar *server;
guint32 port;
- gchar *uri = NULL;
gchar *display = NULL;
- gchar *ret;
- server = get_attribute_string (self, "server");
- protocol = get_attribute_string (self, "protocol");
- object = get_attribute_string (self, "object");
- user = get_attribute_string (self, "user");
- port = get_attribute_int (self, "port");
+ server = get_attribute_string (attrs, "server");
+ protocol = get_attribute_string (attrs, "protocol");
+ object = get_attribute_string (attrs, "object");
+ user = get_attribute_string (attrs, "user");
+ port = get_attribute_int (attrs, "port");
if (!protocol)
return;
- display = gnome_keyring_item_info_get_display_name (info);
+ display = gnome_keyring_item_info_get_display_name (item);
/* If it's customized by the application or user then display that */
- if (is_custom_network_label (server, user, object, port, display)) {
+ if (!is_custom_network_label (server, user, object, port, display))
+ info->label = calc_network_label (attrs, TRUE);
+ if (info->label == NULL)
info->label = display;
- } else {
+ else
g_free (display);
- info->label = calc_network_label (info, attrs, TRUE);
- }
if (server && protocol) {
- uri = g_strdup_printf (" %s://%s%s%s/%s",
- protocol,
- user ? user : "",
- user ? "@" : "",
- server,
- object ? object : "");
+ info->details = g_markup_printf_escaped ("%s://%s%s%s/%s",
+ protocol,
+ user ? user : "",
+ user ? "@" : "",
+ server,
+ object ? object : "");
}
+}
- ret = g_markup_printf_escaped ("%s<span foreground='#555555' size='small' rise='0'>%s</span>",
- display, uri ? uri : "");
- g_free (display);
- g_free (uri);
+static void
+chrome_custom (const DisplayEntry *entry,
+ GnomeKeyringItemInfo *item,
+ GnomeKeyringAttributeList *attrs,
+ DisplayInfo *info)
+{
+ gchar *display;
+ const gchar *origin;
+ GRegex *regex;
+ GMatchInfo *match;
+
+ display = gnome_keyring_item_info_get_display_name (item);
+ origin = get_attribute_string (attrs, "origin_url");
+
+ /* A brain dead url, parse */
+ if (g_strcmp0 (display, origin) == 0) {
+ regex = g_regex_new ("[a-z]+://([^/]+)/", G_REGEX_CASELESS, 0, NULL);
+ if (g_regex_match (regex, display, G_REGEX_MATCH_ANCHORED, &match)) {
+ if (g_match_info_matches (match))
+ info->label = g_match_info_fetch (match, 1);
+ g_match_info_free (match);
+ }
+ g_regex_unref (regex);
+ }
- return ret;
+ if (info->label == NULL)
+ info->label = (display);
+ else
+ g_free (display);
+ info->details = g_markup_escape_text (origin ? origin : "", -1);
+}
+
+static gchar *
+decode_telepathy_id (const gchar *account)
+{
+ gchar *value;
+ gchar *result;
+ gchar *pos;
+ gsize len;
+
+ value = g_strdup (account);
+ while ((pos = strchr (value, '_')) != NULL)
+ *pos = '%';
+
+ len = strlen (value);
+
+ if (len > 0 && value[len - 1] == '0')
+ value[len - 1] = '\0';
+
+ result = g_uri_unescape_string (value, "");
+ g_free (value);
+
+ if (result != NULL)
+ return result;
+
+ return NULL;
+}
+
+static void
+empathy_custom (const DisplayEntry *entry,
+ GnomeKeyringItemInfo *item,
+ GnomeKeyringAttributeList *attrs,
+ DisplayInfo *info)
+{
+ const gchar *account;
+ GMatchInfo *match;
+ GRegex *regex;
+ gchar *display;
+ gchar *identifier;
+ const gchar *prefix;
+ gchar *pos;
+ gsize len;
+
+ display = gnome_keyring_item_info_get_display_name (item);
+ account = get_attribute_string (attrs, "account-id");
+
+ /* Translators: This should be the same as the string in empathy */
+ prefix = _("IM account password for ");
+
+ if (g_str_has_prefix (display, prefix)) {
+ len = strlen (prefix);
+ pos = strchr (display + len, '(');
+ if (pos != NULL)
+ info->label = g_strndup (display + len, pos - (display + len));
+
+ regex = g_regex_new ("^.+/.+/(.+)$", G_REGEX_CASELESS, 0, NULL);
+ if (g_regex_match (regex, account, G_REGEX_MATCH_ANCHORED, &match)) {
+ if (g_match_info_matches (match)) {
+ identifier = g_match_info_fetch (match, 1);
+ info->details = decode_telepathy_id (identifier);
+ g_free (identifier);
+ }
+ g_match_info_free (match);
+ }
+ g_regex_unref (regex);
+ }
+
+ if (info->label == NULL)
+ info->label = (display);
+ else
+ g_free (display);
+
+ if (info->details == NULL)
+ info->details = g_markup_escape_text (account, -1);
+}
+
+static void
+telepathy_custom (const DisplayEntry *entry,
+ GnomeKeyringItemInfo *item,
+ GnomeKeyringAttributeList *attrs,
+ DisplayInfo *info)
+{
+ const gchar *account;
+ GMatchInfo *match;
+ GRegex *regex;
+ gchar *display;
+ gchar *identifier;
+
+ display = gnome_keyring_item_info_get_display_name (item);
+ account = get_attribute_string (attrs, "account");
+
+ if (strstr (display, account)) {
+ regex = g_regex_new ("^.+/.+/(.+)$", G_REGEX_CASELESS, 0, NULL);
+ if (g_regex_match (regex, account, G_REGEX_MATCH_ANCHORED, &match)) {
+ if (g_match_info_matches (match)) {
+ identifier = g_match_info_fetch (match, 1);
+ info->label = decode_telepathy_id (identifier);
+ g_free (identifier);
+ }
+ g_match_info_free (match);
+ }
+ g_regex_unref (regex);
+ }
+
+ if (info->label == NULL)
+ info->label = (display);
+ else
+ g_free (display);
+
+ info->details = g_markup_escape_text (account, -1);
}
static const DisplayEntry DISPLAY_ENTRIES[] = {
@@ -233,20 +382,68 @@ static const DisplayEntry DISPLAY_ENTRIES[] = {
{ ENCRYPTION_KEY, N_("Encryption key password"), NULL },
{ PK_STORAGE, N_("Key storage password"), NULL },
{ CHROME_PASSWORD, N_("Google Chrome password"), chrome_custom },
- { GOA_PASSWORD, N_("Gnome Online Accounts password"), goa_custom },
+ { GOA_PASSWORD, N_("Gnome Online Accounts password"), NULL },
{ TELEPATHY_PASSWORD, N_("Telepathy password"), telepathy_custom },
- { NETWORK_MANAGER_SECRET, N_("Network Manager secret"), network_manager_custom },
+ { EMPATHY_PASSWORD, N_("Instant messaging password"), empathy_custom },
+ { NETWORK_MANAGER_SECRET, N_("Network Manager secret"), NULL },
};
+static const OldItemTypes OLD_ITEM_TYPES[] = {
+ { GNOME_KEYRING_ITEM_GENERIC_SECRET, GENERIC_SECRET },
+ { GNOME_KEYRING_ITEM_NETWORK_PASSWORD, NETWORK_PASSWORD },
+ { GNOME_KEYRING_ITEM_NOTE, KEYRING_NOTE },
+ { GNOME_KEYRING_ITEM_CHAINED_KEYRING_PASSWORD, CHAINED_KEYRING },
+ { GNOME_KEYRING_ITEM_ENCRYPTION_KEY_PASSWORD, ENCRYPTION_KEY },
+ { GNOME_KEYRING_ITEM_PK_STORAGE, PK_STORAGE },
+};
+
+static const gchar *
+map_item_type_to_string (GnomeKeyringItemType old)
+{
+ guint i;
+
+ for (i = 0; i < G_N_ELEMENTS (OLD_ITEM_TYPES); i++) {
+ if (old == OLD_ITEM_TYPES[i].old)
+ return OLD_ITEM_TYPES[i].item_type;
+ }
+
+ return GENERIC_SECRET;
+}
+
static const MappingEntry MAPPING_ENTRIES[] = {
- { GENERIC_SECRET, CHROME_PASSWORD, "application", "chrome" },
+ { GENERIC_SECRET, CHROME_PASSWORD, "application", "chrome*" },
{ GENERIC_SECRET, GOA_PASSWORD, "goa-identity", NULL },
- /* IM account password for stefwalter gmail com (gabble/jabber/stefwalter_40gmail_2ecom0) */
- { GENERIC_SECRET, TELEPATHY_PASSWORD, "account-id", "*/*/*" },
+ { GENERIC_SECRET, TELEPATHY_PASSWORD, "account", "*/*/*" },
+ { GENERIC_SECRET, EMPATHY_PASSWORD, "account-id", "*/*/*" },
/* Network secret for Auto anna/802-11-wireless-security/psk */
{ GENERIC_SECRET, NETWORK_MANAGER_SECRET, "connection-uuid", NULL },
};
+static const gchar *
+map_item_type_to_specific (const gchar *item_type,
+ GnomeKeyringAttributeList *attrs)
+{
+ const gchar *value;
+ guint i;
+
+ if (!attrs)
+ return item_type;
+
+ for (i = 0; i < G_N_ELEMENTS (MAPPING_ENTRIES); i++) {
+ if (g_str_equal (item_type, MAPPING_ENTRIES[i].item_type)) {
+ value = get_attribute_string (attrs, MAPPING_ENTRIES[i].match_attribute);
+ if (value && MAPPING_ENTRIES[i].match_pattern != NULL) {
+ if (g_pattern_match_simple (MAPPING_ENTRIES[i].match_pattern, value))
+ return MAPPING_ENTRIES[i].mapped_type;
+ } else if (value) {
+ return MAPPING_ENTRIES[i].mapped_type;
+ }
+ }
+ }
+
+ return item_type;
+}
+
enum {
PROP_0,
PROP_KEYRING_NAME,
@@ -254,6 +451,7 @@ enum {
PROP_ITEM_INFO,
PROP_ITEM_ATTRIBUTES,
PROP_HAS_SECRET,
+ PROP_DESCRIPTION,
PROP_USE
};
@@ -273,6 +471,8 @@ struct _SeahorseGkrItemPrivate {
DisplayInfo *display_info;
};
+static gboolean require_item_attrs (SeahorseGkrItem *self);
+
G_DEFINE_TYPE (SeahorseGkrItem, seahorse_gkr_item, SEAHORSE_TYPE_OBJECT);
/* -----------------------------------------------------------------------------
@@ -301,14 +501,73 @@ boxed_attributes_type (void)
return type;
}
+static void
+free_display_info (DisplayInfo *info)
+{
+ g_free (info->label);
+ g_free (info->details);
+ g_free (info);
+}
+
+static DisplayInfo *
+ensure_display_info (SeahorseGkrItem *self)
+{
+ const gchar *item_type;
+ DisplayInfo *info;
+ guint i;
+
+ if (self->pv->display_info)
+ return self->pv->display_info;
+
+ require_item_attrs (self);
+
+ info = g_new0 (DisplayInfo, 1);
+
+ item_type = map_item_type_to_string (gnome_keyring_item_info_get_type (self->pv->item_info));
+ item_type = map_item_type_to_specific (item_type, self->pv->item_attrs);
+ g_assert (item_type != NULL);
+ info->item_type = item_type;
+
+ for (i = 0; i < G_N_ELEMENTS (DISPLAY_ENTRIES); i++) {
+ if (g_str_equal (DISPLAY_ENTRIES[i].item_type, item_type)) {
+ if (DISPLAY_ENTRIES[i].custom_func != NULL)
+ (DISPLAY_ENTRIES[i].custom_func) (&DISPLAY_ENTRIES[i],
+ self->pv->item_info,
+ self->pv->item_attrs,
+ info);
+ if (!info->label && self->pv->item_info)
+ info->label = gnome_keyring_item_info_get_display_name (self->pv->item_info);
+ if (!info->description)
+ info->description = DISPLAY_ENTRIES[i].description;
+ if (!info->details)
+ info->details = g_strdup ("");
+ break;
+ }
+ }
+
+ self->pv->display_info = info;
+ return info;
+}
+
+static void
+clear_display_info (SeahorseGkrItem *self)
+{
+ if (self->pv->display_info) {
+ free_display_info (self->pv->display_info);
+ self->pv->display_info = NULL;
+ }
+}
+
static gboolean
received_result (SeahorseGkrItem *self, GnomeKeyringResult result)
{
if (result == GNOME_KEYRING_RESULT_CANCELLED)
return FALSE;
-
- if (result == GNOME_KEYRING_RESULT_OK)
+
+ if (result == GNOME_KEYRING_RESULT_OK) {
+ clear_display_info (self);
return TRUE;
+ }
/* TODO: Implement so that we can display an error icon, along with some text */
g_message ("failed to retrieve item %d from keyring %s: %s",
@@ -412,58 +671,6 @@ require_item_attrs (SeahorseGkrItem *self)
return self->pv->item_attrs != NULL;
}
-static void
-free_display_info (DisplayInfo *info)
-{
- g_free (info->label);
- g_free (info->details);
- g_free (info);
-}
-
-static DisplayInfo *
-ensure_display_info (SeahorseGkrItem *self)
-{
- const gchar *item_type;
- DisplayInfo *info;
-
- if (self->pv->display_info)
- return self->display_info;
-
- info = g_new0 (DisplayInfo, 1);
-
- item_type = map_item_type_to_string (self->pv->item_info);
- item_type = map_item_type_to_specific (item_type);
- g_assert (item_type != NULL);
- info->item_type = item_type;
-
- for (i = 0; i < G_N_ELEMENTS (DISPLAY_ENTRIES); i++) {
- if (g_str_equal (DISPLAY_ENTRIES[i].item_type, item_type)) {
- if (DISPLAY_ENTRIES[i].custom_func != NULL)
- (DISPLAY_ENTRIES[i].custom_func) (&DISPLAY_ENTRIES[i],
- self->pv->item_info,
- self->pv->item_attrs,
- info);
- if (!info->label && self->pv->item_info)
- info->label = gnome_keyring_item_info_get_display_name (self->pv->item_info);
- if (!info->description)
- info->description = DISPLAY_ENTRIES[i].description;
- if (!info->details)
- info->details = g_strdup ("");
- break;
- }
- }
-
- self->pv->display_info = info;
- return info;
-}
-
-#if 0
-static gchar *
-calc_network_item_markup (SeahorseGkrItem *self)
-{
-}
-#endif
-
static gchar*
calc_name_markup (SeahorseGkrItem *self)
{
@@ -471,14 +678,11 @@ calc_name_markup (SeahorseGkrItem *self)
DisplayInfo *info;
gchar *value;
- if (!require_item_info (self))
- return NULL;
-
info = ensure_display_info (self);
result = g_string_new ("");
value = g_markup_escape_text (info->label, -1);
g_string_append (result, value);
- g_string_append (result, "\n<span size='small' rise='0'>");
+ g_string_append (result, "<span size='small' rise='0' foreground='#555555'>\n");
g_string_append (result, info->details);
g_string_append (result, "</span>");
@@ -492,30 +696,29 @@ calc_name_markup (SeahorseGkrItem *self)
void
seahorse_gkr_item_realize (SeahorseGkrItem *self)
{
- gchar *display;
+ DisplayInfo *info;
gchar *markup;
- gchar *identifier;
GIcon *icon;
- display = calc_display_name (self, TRUE);
- markup = calc_name_markup(self);
- identifier = g_strdup_printf ("%u", self->pv->item_id);
+ if (!require_item_info (self))
+ return;
+
+ info = ensure_display_info (self);
+ markup = calc_name_markup (self);
icon = g_themed_icon_new (GCR_ICON_PASSWORD);
g_object_set (self,
- "label", display,
- "icon", icon,
- "markup", markup,
- "identifier", identifier,
- "flags", SEAHORSE_FLAG_DELETABLE,
- NULL);
+ "label", info->label,
+ "icon", icon,
+ "markup", markup,
+ "flags", SEAHORSE_FLAG_DELETABLE,
+ NULL);
g_object_unref (icon);
- g_free (display);
g_free (markup);
- g_free (identifier);
-
+
g_object_notify (G_OBJECT (self), "has-secret");
g_object_notify (G_OBJECT (self), "use");
+ g_object_notify (G_OBJECT (self), "description");
}
void
@@ -551,7 +754,8 @@ seahorse_gkr_item_get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
SeahorseGkrItem *self = SEAHORSE_GKR_ITEM (object);
-
+ DisplayInfo *info;
+
switch (prop_id) {
case PROP_KEYRING_NAME:
g_value_set_string (value, seahorse_gkr_item_get_keyring_name (self));
@@ -571,6 +775,12 @@ seahorse_gkr_item_get_property (GObject *object, guint prop_id,
case PROP_USE:
g_value_set_uint (value, seahorse_gkr_item_get_use (self));
break;
+ case PROP_DESCRIPTION:
+ if (!require_item_info (self))
+ break;
+ info = ensure_display_info (self);
+ g_value_set_string (value, info->description);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -663,6 +873,10 @@ seahorse_gkr_item_class_init (SeahorseGkrItemClass *klass)
g_param_spec_string("keyring-name", "Keyring Name", "Keyring this item is in",
"", G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (gobject_class, PROP_DESCRIPTION,
+ g_param_spec_string("description", "Description", "Item description",
+ "", G_PARAM_READABLE));
+
g_object_class_install_property (gobject_class, PROP_ITEM_ID,
g_param_spec_uint ("item-id", "Item ID", "GNOME Keyring Item ID",
0, G_MAXUINT, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
@@ -739,7 +953,8 @@ seahorse_gkr_item_set_info (SeahorseGkrItem *self, GnomeKeyringItemInfo* info)
seahorse_gkr_item_realize (self);
g_object_notify (obj, "item-info");
g_object_notify (obj, "use");
-
+ g_object_notify (obj, "description");
+
/* Get the secret out of the item info, if not already loaded */
WITH_SECURE_MEM (secret = gnome_keyring_item_info_get_secret (self->pv->item_info));
if (secret != NULL) {
@@ -793,6 +1008,7 @@ seahorse_gkr_item_set_attributes (SeahorseGkrItem *self, GnomeKeyringAttributeLi
seahorse_gkr_item_realize (self);
g_object_notify (obj, "item-attributes");
g_object_notify (obj, "use");
+ g_object_notify (obj, "description");
g_object_thaw_notify (obj);
}
@@ -826,30 +1042,12 @@ seahorse_gkr_find_string_attribute (GnomeKeyringAttributeList *attrs, const gcha
SeahorseGkrUse
seahorse_gkr_item_get_use (SeahorseGkrItem *self)
{
- const gchar *val;
-
/* Network passwords */
if (require_item_info (self)) {
if (gnome_keyring_item_info_get_type (self->pv->item_info) == GNOME_KEYRING_ITEM_NETWORK_PASSWORD) {
- if (is_network_item (self, "http"))
- return SEAHORSE_GKR_USE_WEB;
return SEAHORSE_GKR_USE_NETWORK;
}
}
-
- if (require_item_attrs (self)) {
- val = seahorse_gkr_item_get_attribute (self, "seahorse-key-type");
- if (val) {
-#ifdef WITH_PGP
- if (strcmp (val, SEAHORSE_PGP_TYPE_STR) == 0)
- return SEAHORSE_GKR_USE_PGP;
-#endif
-#ifdef WITH_SSH
- if (strcmp (val, SEAHORSE_SSH_TYPE_STR) == 0)
- return SEAHORSE_GKR_USE_SSH;
-#endif
- }
- }
-
+
return SEAHORSE_GKR_USE_OTHER;
}
diff --git a/libseahorse/seahorse-key-manager-store.c b/libseahorse/seahorse-key-manager-store.c
index 6f5f915..aa65d9e 100644
--- a/libseahorse/seahorse-key-manager-store.c
+++ b/libseahorse/seahorse-key-manager-store.c
@@ -48,73 +48,23 @@ enum {
PROP_SETTINGS
};
-static void
-on_transform_validity_to_string (const GValue *source,
- GValue *dest)
-{
- g_return_if_fail (G_VALUE_TYPE (source) == G_TYPE_UINT);
- g_value_set_string (dest, seahorse_validity_get_string (g_value_get_uint (source)));
-}
-
-static void
-on_transform_trust_to_string (const GValue *source,
- GValue *dest)
-{
- g_return_if_fail (G_VALUE_TYPE (source) == G_TYPE_UINT);
- g_value_set_string (dest, seahorse_validity_get_string (g_value_get_uint (source)));
-}
-
-static void
-on_transform_expires_to_string (const GValue *source,
- GValue *dest)
-{
- GTimeVal timeval;
- gulong expires;
-
- g_return_if_fail (G_VALUE_TYPE (source) == G_TYPE_ULONG);
- expires = g_value_get_ulong (source);
-
- if (expires == 0) {
- g_value_set_string (dest, "");
- } else {
- g_get_current_time (&timeval);
- if (timeval.tv_sec > expires) {
- g_value_set_string (dest, _("Expired"));
- } else {
- g_value_take_string (dest, seahorse_util_get_date_string (expires));
- }
- }
-}
-
enum {
COL_ICON,
- COL_USAGE,
- COL_NAME,
- COL_KEYID,
- COL_VALIDITY,
- COL_TRUST,
- COL_TYPE,
- COL_EXPIRES,
+ COL_MARKUP,
+ COL_LABEL,
+ COL_DESCRIPTION,
N_COLS
};
static GcrColumn columns[] = {
{ "icon", /* later */ 0, /* later */ 0, NULL,
0, NULL, NULL },
- { "usage", G_TYPE_UINT, G_TYPE_UINT, NULL,
- GCR_COLUMN_SORTABLE, NULL, "usage" },
{ "markup", G_TYPE_STRING, G_TYPE_STRING, NULL,
- GCR_COLUMN_SORTABLE, NULL, "label" },
- { "identifier", G_TYPE_STRING, G_TYPE_STRING, NULL,
- GCR_COLUMN_SORTABLE, NULL, "id" },
- { "validity", G_TYPE_UINT, G_TYPE_STRING, NULL,
- GCR_COLUMN_SORTABLE, on_transform_validity_to_string, "validity" },
- { "trust", G_TYPE_UINT, G_TYPE_STRING, NULL,
- GCR_COLUMN_SORTABLE, on_transform_trust_to_string, "trust" },
- { "type", G_TYPE_STRING, G_TYPE_STRING, NULL,
- GCR_COLUMN_SORTABLE, NULL, "type" },
- { "expires", G_TYPE_ULONG, G_TYPE_STRING, NULL,
- GCR_COLUMN_SORTABLE, on_transform_expires_to_string, "expires" },
+ 0, NULL, NULL },
+ { "label", G_TYPE_STRING, G_TYPE_STRING, NULL,
+ GCR_COLUMN_SORTABLE, NULL, NULL },
+ { "description", G_TYPE_STRING, G_TYPE_STRING, NULL,
+ 0, NULL, NULL },
{ NULL }
};
@@ -303,59 +253,6 @@ on_sort_column_changed (GtkTreeSortable *sort,
}
}
-static void
-on_manager_settings_changed (GSettings *settings, const gchar *key, gpointer user_data)
-{
- SeahorseKeyManagerStore *self;
- GtkTreeViewColumn *col = NULL;
- GtkTreeView *view = GTK_TREE_VIEW (user_data);
- const gchar *col_key = NULL;
- GList *columns, *l;
- gchar *sort_by;
-
- if (g_str_equal (key, "sort-by")) {
- self = SEAHORSE_KEY_MANAGER_STORE (gtk_tree_view_get_model (view));
- g_return_if_fail (SEAHORSE_IS_KEY_MANAGER_STORE (self));
- sort_by = g_settings_get_string (settings, key);
- set_sort_to (self, sort_by);
- g_free (sort_by);
- return;
- }
-
- columns = gtk_tree_view_get_columns (view);
- for (l = columns; l; l = g_list_next (l)) {
- col_key = g_object_get_data (G_OBJECT (l->data), "settings-key");
- if (col_key && g_str_equal (col_key, key)) {
- col = GTK_TREE_VIEW_COLUMN (l->data);
- break;
- }
- }
-
- if (col != NULL)
- gtk_tree_view_column_set_visible (col, g_settings_get_boolean (settings, key));
-
- g_list_free (columns);
-}
-
-static GtkTreeViewColumn*
-append_text_column (SeahorseKeyManagerStore *skstore, GtkTreeView *view,
- const gchar *label, const gint index)
-{
- GtkTreeViewColumn *column;
- GtkCellRenderer *renderer;
-
- renderer = gtk_cell_renderer_text_new ();
- g_object_set (renderer, "xpad", 3, NULL);
- g_object_set (renderer, "ypad", 2, NULL);
- g_object_set (renderer, "yalign", 0.0, NULL);
- g_object_set (renderer, "scale", PANGO_SCALE_SMALL, NULL);
- column = gtk_tree_view_column_new_with_attributes (label, renderer, "text", index, NULL);
- gtk_tree_view_column_set_resizable (column, TRUE);
- gtk_tree_view_append_column (view, column);
-
- return column;
-}
-
/* The following three functions taken from bugzilla
* (http://bugzilla.gnome.org/attachment.cgi?id=49362&action=view)
* Author: Christian Neumair
@@ -755,23 +652,41 @@ seahorse_key_manager_store_new (GcrCollection *collection,
/* add the icon column */
renderer = gtk_cell_renderer_pixbuf_new ();
g_object_set (renderer, "stock-size", GTK_ICON_SIZE_DND, NULL);
- g_object_set (renderer, "ypad", 2, NULL);
+ g_object_set (renderer, "ypad", 6, NULL);
g_object_set (renderer, "yalign", 0.0, NULL);
col = gtk_tree_view_column_new_with_attributes ("", renderer, "gicon", COL_ICON, NULL);
gtk_tree_view_column_set_resizable (col, FALSE);
gtk_tree_view_append_column (view, col);
- gtk_tree_view_column_set_sort_column_id (col, COL_USAGE);
/* Name column */
+ col = gtk_tree_view_column_new ();
renderer = gtk_cell_renderer_text_new ();
- g_object_set (renderer, "ypad", 2, NULL);
- g_object_set (renderer, "yalign", 0.0, NULL);
- g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- col = gtk_tree_view_column_new_with_attributes (_("Name"), renderer, "markup", COL_NAME, NULL);
+ g_object_set (renderer,
+ "ypad", 6,
+ "yalign", 0.0,
+ "ellipsize", PANGO_ELLIPSIZE_END,
+ NULL);
+ gtk_tree_view_column_pack_start (col, renderer, TRUE);
+ gtk_tree_view_column_set_attributes (col, renderer,
+ "markup", COL_MARKUP,
+ NULL);
+ renderer = gtk_cell_renderer_text_new ();
+ g_object_set (renderer,
+ "ypad", 6,
+ "xpad", 3,
+ "yalign", 0.0,
+ "xalign", 1.0,
+ "scale", PANGO_SCALE_SMALL,
+ "alignment", PANGO_ALIGN_RIGHT,
+ NULL);
+ gtk_tree_view_column_pack_start (col, renderer, FALSE);
+ gtk_tree_view_column_set_attributes (col, renderer,
+ "markup", COL_DESCRIPTION,
+ NULL);
gtk_tree_view_column_set_resizable (col, TRUE);
gtk_tree_view_column_set_expand (col, TRUE);
gtk_tree_view_append_column (view, col);
- gtk_tree_view_column_set_sort_column_id (col, COL_NAME);
+ gtk_tree_view_column_set_sort_column_id (col, COL_LABEL);
/* Use predicate to figure out which columns to add */
if (SEAHORSE_IS_COLLECTION (collection))
@@ -779,38 +694,6 @@ seahorse_key_manager_store_new (GcrCollection *collection,
else
pred = NULL;
- /* Key ID column, don't show for passwords */
- if (!pred || pred->usage != SEAHORSE_USAGE_CREDENTIALS) {
- col = append_text_column (self, view, _("Key ID"), COL_KEYID);
- gtk_tree_view_column_set_sort_column_id (col, COL_KEYID);
- }
-
- /* Public keys show validity */
- if (pred && pred->usage == SEAHORSE_USAGE_PUBLIC_KEY) {
- col = append_text_column (self, view, _("Validity"), COL_VALIDITY);
- g_object_set_data (G_OBJECT (col), "settings-key", "show-validity");
- gtk_tree_view_column_set_visible (col, g_settings_get_boolean (settings, "show-validity"));
- gtk_tree_view_column_set_sort_column_id (col, COL_VALIDITY);
- }
-
- /* Trust column */
- col = append_text_column (self, view, _("Trust"), COL_TRUST);
- g_object_set_data (G_OBJECT (col), "settings-key", "show-trust");
- gtk_tree_view_column_set_visible (col, g_settings_get_boolean (settings, "show-trust"));
- gtk_tree_view_column_set_sort_column_id (col, COL_TRUST);
-
- /* The key type column */
- col = append_text_column (self, view, _("Type"), COL_TYPE);
- g_object_set_data (G_OBJECT (col), "settings-key", "show-type");
- gtk_tree_view_column_set_visible (col, g_settings_get_boolean (settings, "show-type"));
- gtk_tree_view_column_set_sort_column_id (col, COL_TYPE);
-
- /* Expiry date column */
- col = append_text_column (self, view, _("Expiration Date"), COL_EXPIRES);
- g_object_set_data (G_OBJECT (col), "settings-key", "show-expiry");
- gtk_tree_view_column_set_visible (col, g_settings_get_boolean (settings, "show-expiry"));
- gtk_tree_view_column_set_sort_column_id (col, COL_EXPIRES);
-
/* Also watch for sort-changed on the store */
g_signal_connect (self, "sort-column-changed", G_CALLBACK (on_sort_column_changed), self);
@@ -822,8 +705,11 @@ seahorse_key_manager_store_new (GcrCollection *collection,
gtk_tree_view_set_enable_search (view, FALSE);
gtk_tree_view_set_show_expanders (view, FALSE);
+ gtk_tree_view_set_rules_hint (view, TRUE);
+ gtk_tree_view_set_headers_visible (view, FALSE);
- g_signal_connect_object (settings, "changed", G_CALLBACK (on_manager_settings_changed), view, 0);
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self), COL_LABEL,
+ GTK_SORT_ASCENDING);
/* Tree drag */
egg_tree_multi_drag_add_drag_support (view);
diff --git a/pgp/seahorse-pgp-key.c b/pgp/seahorse-pgp-key.c
index 08f8a76..92b7c21 100644
--- a/pgp/seahorse-pgp-key.c
+++ b/pgp/seahorse-pgp-key.c
@@ -46,7 +46,8 @@ enum {
PROP_TRUST,
PROP_EXPIRES,
PROP_LENGTH,
- PROP_ALGO
+ PROP_ALGO,
+ PROP_DESCRIPTION
};
G_DEFINE_TYPE (SeahorsePgpKey, seahorse_pgp_key, SEAHORSE_TYPE_OBJECT);
@@ -293,9 +294,9 @@ seahorse_pgp_key_realize (SeahorsePgpKey *self)
/* The type */
if (usage == SEAHORSE_USAGE_PRIVATE_KEY) {
- icon_name = SEAHORSE_ICON_SECRET;
+ icon_name = GCR_ICON_KEY_PAIR;
} else {
- icon_name = SEAHORSE_ICON_KEY;
+ icon_name = GCR_ICON_KEY;
if (usage == SEAHORSE_USAGE_NONE)
g_object_set (self, "usage", SEAHORSE_USAGE_PUBLIC_KEY, NULL);
}
@@ -326,7 +327,8 @@ seahorse_pgp_key_get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
SeahorsePgpKey *self = SEAHORSE_PGP_KEY (object);
-
+ SeahorseUsage usage;
+
switch (prop_id) {
case PROP_PHOTOS:
g_value_set_boxed (value, seahorse_pgp_key_get_photos (self));
@@ -340,6 +342,13 @@ seahorse_pgp_key_get_property (GObject *object, guint prop_id,
case PROP_FINGERPRINT:
g_value_set_string (value, seahorse_pgp_key_get_fingerprint (self));
break;
+ case PROP_DESCRIPTION:
+ g_object_get (self, "usage", &usage, NULL);
+ if (usage == SEAHORSE_USAGE_PRIVATE_KEY)
+ g_value_set_string (value, _("Personal PGP key"));
+ else
+ g_value_set_string (value, _("PGP key"));
+ break;
case PROP_EXPIRES:
g_value_set_ulong (value, seahorse_pgp_key_get_expires (self));
break;
@@ -444,6 +453,10 @@ seahorse_pgp_key_class_init (SeahorsePgpKeyClass *klass)
g_param_spec_string ("fingerprint", "Fingerprint", "Unique fingerprint for this key",
"", G_PARAM_READABLE));
+ g_object_class_install_property (gobject_class, PROP_DESCRIPTION,
+ g_param_spec_string ("description", "Description", "Description for key",
+ "", G_PARAM_READABLE));
+
g_object_class_install_property (gobject_class, PROP_VALIDITY,
g_param_spec_uint ("validity", "Validity", "Validity of this key",
0, G_MAXUINT, 0, G_PARAM_READABLE));
diff --git a/ssh/seahorse-ssh-key.c b/ssh/seahorse-ssh-key.c
index d8ab2d5..e81adb7 100644
--- a/ssh/seahorse-ssh-key.c
+++ b/ssh/seahorse-ssh-key.c
@@ -22,14 +22,14 @@
#include "config.h"
-#include <string.h>
+#include <gcr/gcr.h>
#include <glib.h>
-
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <errno.h>
+#include <string.h>
#include "seahorse-source.h"
#include "seahorse-ssh-source.h"
@@ -42,6 +42,7 @@ enum {
PROP_0,
PROP_KEY_DATA,
PROP_FINGERPRINT,
+ PROP_DESCRIPTION,
PROP_VALIDITY,
PROP_TRUST,
PROP_EXPIRES,
@@ -74,6 +75,8 @@ changed_key (SeahorseSSHKey *self)
gchar *identifier;
gchar *simple = NULL;
GIcon *icon;
+ gchar *filename;
+ gchar *markup;
if (self->keydata) {
@@ -96,7 +99,6 @@ changed_key (SeahorseSSHKey *self)
}
if (!self->keydata || !self->keydata->fingerprint) {
-
g_object_set (self,
"label", "",
"icon", NULL,
@@ -105,18 +107,29 @@ changed_key (SeahorseSSHKey *self)
"flags", SEAHORSE_FLAG_DISABLED,
NULL);
return;
-
}
- if (self->keydata->privfile)
+ if (self->keydata->privfile) {
usage = SEAHORSE_USAGE_PRIVATE_KEY;
- else
+ icon = g_themed_icon_new (GCR_ICON_KEY_PAIR);
+ } else {
usage = SEAHORSE_USAGE_PUBLIC_KEY;
+ icon = g_themed_icon_new (GCR_ICON_KEY);
+ }
+
+ if (self->keydata->privfile)
+ filename = g_path_get_basename (self->keydata->privfile);
+ else
+ filename = g_path_get_basename (self->keydata->pubfile);
+
+ markup = g_markup_printf_escaped ("%s<span size='small' rise='0' foreground='#555555'>\n%s</span>",
+ display, filename);
identifier = seahorse_ssh_key_calc_identifier (self->keydata->fingerprint);
icon = g_themed_icon_new (SEAHORSE_ICON_KEY_SSH);
g_object_set (obj,
+ "markup", markup,
"label", display,
"icon", icon,
"usage", usage,
@@ -126,6 +139,7 @@ changed_key (SeahorseSSHKey *self)
NULL);
g_object_unref (icon);
g_free (identifier);
+ g_free (markup);
}
static guint
@@ -159,7 +173,8 @@ seahorse_ssh_key_get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
SeahorseSSHKey *skey = SEAHORSE_SSH_KEY (object);
-
+ SeahorseUsage usage;
+
switch (prop_id) {
case PROP_KEY_DATA:
g_value_set_pointer (value, skey->keydata);
@@ -167,6 +182,13 @@ seahorse_ssh_key_get_property (GObject *object, guint prop_id,
case PROP_FINGERPRINT:
g_value_set_string (value, skey->keydata ? skey->keydata->fingerprint : NULL);
break;
+ case PROP_DESCRIPTION:
+ g_object_get (skey, "usage", &usage, NULL);
+ if (usage == SEAHORSE_USAGE_PRIVATE_KEY)
+ g_value_set_string (value, _("Personal SSH key"));
+ else
+ g_value_set_string (value, _("SSH key"));
+ break;
case PROP_VALIDITY:
g_value_set_uint (value, calc_validity (skey));
break;
@@ -237,6 +259,10 @@ seahorse_ssh_key_class_init (SeahorseSSHKeyClass *klass)
g_param_spec_string ("fingerprint", "Fingerprint", "Unique fingerprint for this key",
"", G_PARAM_READABLE));
+ g_object_class_install_property (gobject_class, PROP_DESCRIPTION,
+ g_param_spec_string ("description", "Description", "Description",
+ "", G_PARAM_READABLE));
+
g_object_class_install_property (gobject_class, PROP_VALIDITY,
g_param_spec_uint ("validity", "Validity", "Validity of this key",
0, G_MAXUINT, 0, G_PARAM_READABLE));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
