[git] GPA - branch, master, updated. gpa-0.9.9-7-gd8fd5f4
by Werner Koch
cvs at cvs.gnupg.org
Fri Sep 16 21:14:58 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Assistant".
The branch, master has been updated
via d8fd5f4a75668ce25d42af87959cee4b70d80603 (commit)
from 774dbffef812c23caa6d76001f10ae184b0e36b1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d8fd5f4a75668ce25d42af87959cee4b70d80603
Author: Werner Koch <wk at gnupg.org>
Date: Fri Sep 16 21:11:59 2016 +0200
Remove the keyid column from two lists.
* src/keylist.c (GPA_KEYLIST_COLUMN_KEYID): Remove.
(gpa_keylist_init): Remove corresponding entry.
(gpa_keylist_next): Remove keyid setting.
(search_keylist_function): Remove keyid searching.
(setup_columns): Don't fill keyid column.
* src/gpakeyselector.c: Include gtktools.h and convert.h.
(GPA_KEY_SELECTOR_COLUMN_KEYID): Renamed to
GPA_KEY_SELECTOR_COLUMN_CREATED.
(gpa_key_selector_init): Show Creation date instead of Keyid.
--
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/src/gpakeyselector.c b/src/gpakeyselector.c
index b8f56a7..fbdf1fe 100644
--- a/src/gpakeyselector.c
+++ b/src/gpakeyselector.c
@@ -23,6 +23,8 @@
#include "gpa.h"
#include "gpakeyselector.h"
#include "keytable.h"
+#include "gtktools.h"
+#include "convert.h"
/* Callbacks */
@@ -35,7 +37,7 @@ static GObjectClass *parent_class = NULL;
static void
gpa_key_selector_finalize (GObject *object)
-{
+{
GpaKeySelector *sel = GPA_KEY_SELECTOR (object);
/* Dereference all keys in the list */
@@ -49,7 +51,7 @@ static void
gpa_key_selector_class_init (GpaKeySelectorClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
+
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gpa_key_selector_finalize;
@@ -57,7 +59,7 @@ gpa_key_selector_class_init (GpaKeySelectorClass *klass)
typedef enum
{
- GPA_KEY_SELECTOR_COLUMN_KEYID,
+ GPA_KEY_SELECTOR_COLUMN_CREATED,
GPA_KEY_SELECTOR_COLUMN_USERID,
GPA_KEY_SELECTOR_COLUMN_KEY,
GPA_KEY_SELECTOR_N_COLUMNS
@@ -69,7 +71,7 @@ gpa_key_selector_init (GpaKeySelector *selector)
GtkListStore *store;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
- GtkTreeSelection *selection =
+ GtkTreeSelection *selection =
gtk_tree_view_get_selection (GTK_TREE_VIEW (selector));
selector->secret = FALSE;
@@ -83,12 +85,14 @@ gpa_key_selector_init (GpaKeySelector *selector)
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (selector), TRUE);
renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Key ID"), renderer,
- "text",
- GPA_KEY_SELECTOR_COLUMN_KEYID,
- NULL);
+ column = gtk_tree_view_column_new_with_attributes
+ (NULL, renderer, "text", GPA_KEY_SELECTOR_COLUMN_CREATED, NULL);
+ gpa_set_column_title
+ (column, _("Created"),
+ _("The Creation Date is the date the certificate was created."));
gtk_tree_view_append_column (GTK_TREE_VIEW (selector), column);
- gtk_tree_view_column_set_sort_column_id (column, GPA_KEY_SELECTOR_COLUMN_KEYID);
+ gtk_tree_view_column_set_sort_column_id
+ (column, GPA_KEY_SELECTOR_COLUMN_CREATED);
gtk_tree_view_column_set_sort_indicator (column, TRUE);
renderer = gtk_cell_renderer_text_new ();
@@ -107,7 +111,7 @@ GType
gpa_key_selector_get_type (void)
{
static GType key_selector_type = 0;
-
+
if (!key_selector_type)
{
static const GTypeInfo key_selector_info =
@@ -122,12 +126,12 @@ gpa_key_selector_get_type (void)
0, /* n_preallocs */
(GInstanceInitFunc) gpa_key_selector_init,
};
-
+
key_selector_type = g_type_register_static (GTK_TYPE_TREE_VIEW,
"GpaKeySelector",
&key_selector_info, 0);
}
-
+
return key_selector_type;
}
@@ -152,13 +156,13 @@ gpa_key_selector_new (gboolean secret, gboolean only_usable_keys)
* shouldn't matter much.
*/
gpa_keytable_force_reload (gpa_keytable_get_secret_instance (),
- gpa_key_selector_next_key,
+ gpa_key_selector_next_key,
gpa_key_selector_done, sel);
}
else
{
gpa_keytable_list_keys (gpa_keytable_get_public_instance (),
- gpa_key_selector_next_key,
+ gpa_key_selector_next_key,
gpa_key_selector_done, sel);
}
@@ -170,7 +174,7 @@ gpa_key_selector_new (gboolean secret, gboolean only_usable_keys)
GList *
gpa_key_selector_get_selected_keys (GpaKeySelector * selector)
{
- GtkTreeSelection *selection =
+ GtkTreeSelection *selection =
gtk_tree_view_get_selection (GTK_TREE_VIEW (selector));
GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector));
GList *list = gtk_tree_selection_get_selected_rows (selection, &model);
@@ -194,43 +198,43 @@ gpa_key_selector_get_selected_keys (GpaKeySelector * selector)
g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL);
g_list_free (list);
-
+
return keys;
}
-gboolean
+gboolean
gpa_key_selector_has_selection (GpaKeySelector * selector)
{
- int selected = gtk_tree_selection_count_selected_rows
+ int selected = gtk_tree_selection_count_selected_rows
(gtk_tree_view_get_selection (GTK_TREE_VIEW (selector)));
return (selected > 0);
}
/* Internal */
-void
+void
gpa_key_selector_next_key (gpgme_key_t key, gpointer data)
{
GpaKeySelector *selector = data;
GtkListStore *store;
GtkTreeIter iter;
- const gchar *keyid;
+ gchar *created;
gchar *userid;
if (key && selector->only_usable_keys
&& (key->revoked || key->disabled || key->expired || key->invalid))
return;
-
+
selector->keys = g_list_prepend (selector->keys, key);
store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (selector)));
- /* The Key ID */
- keyid = gpa_gpgme_key_get_short_keyid (key);
+ /* The Creation date */
+ created = gpa_creation_date_string (key->subkeys->timestamp);
/* The user ID */
userid = gpa_gpgme_key_get_userid (key->uids);
/* Append it to the list */
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
- GPA_KEY_SELECTOR_COLUMN_KEYID, keyid,
+ GPA_KEY_SELECTOR_COLUMN_CREATED, created,
GPA_KEY_SELECTOR_COLUMN_USERID, userid,
GPA_KEY_SELECTOR_COLUMN_KEY, key, -1);
/* If this is a secret key selector, select the default key */
@@ -239,21 +243,22 @@ gpa_key_selector_next_key (gpgme_key_t key, gpointer data)
const char *key_fpr = key->subkeys->fpr;
gpgme_key_t akey;
const char *default_key;
-
+
akey = gpa_options_get_default_key (gpa_options_get_instance());
default_key = akey? akey->subkeys->fpr : NULL;
- if (default_key && g_str_equal (key_fpr, default_key))
+ if (default_key && g_str_equal (key_fpr, default_key))
{
- gtk_tree_selection_select_iter
+ gtk_tree_selection_select_iter
(gtk_tree_view_get_selection (GTK_TREE_VIEW (selector)),&iter);
}
}
/* Clean up */
g_free (userid);
+ g_free (created);
}
-void
+void
gpa_key_selector_done (gpointer data)
{
GpaKeySelector *selector = data;
diff --git a/src/keylist.c b/src/keylist.c
index 7a89d92..442da08 100644
--- a/src/keylist.c
+++ b/src/keylist.c
@@ -55,7 +55,6 @@ typedef enum
/* These are the displayed columns */
GPA_KEYLIST_COLUMN_IMAGE,
GPA_KEYLIST_COLUMN_KEYTYPE,
- GPA_KEYLIST_COLUMN_KEYID,
GPA_KEYLIST_COLUMN_CREATED,
GPA_KEYLIST_COLUMN_EXPIRY,
GPA_KEYLIST_COLUMN_OWNERTRUST,
@@ -201,7 +200,6 @@ gpa_keylist_init (GTypeInstance *instance, void *class_ptr)
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_STRING,
- G_TYPE_STRING,
G_TYPE_POINTER,
G_TYPE_INT,
G_TYPE_ULONG,
@@ -426,7 +424,7 @@ gpa_keylist_next (gpgme_key_t key, gpointer data)
GpaKeyList *list = data;
GtkListStore *store;
GtkTreeIter iter;
- const gchar *keyid, *ownertrust, *validity;
+ const gchar *ownertrust, *validity;
gchar *userid, *created, *expiry;
gboolean has_secret;
long int val_value;
@@ -472,7 +470,6 @@ gpa_keylist_next (gpgme_key_t key, gpointer data)
list->keys = g_list_append (list->keys, key);
store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (list)));
/* Get the column values */
- keyid = gpa_gpgme_key_get_short_keyid (key);
keytype = (key->protocol == GPGME_PROTOCOL_OpenPGP? "P" :
key->protocol == GPGME_PROTOCOL_CMS? "X" : "?");
created = gpa_creation_date_string (key->subkeys->timestamp);
@@ -507,7 +504,6 @@ gpa_keylist_next (gpgme_key_t key, gpointer data)
gtk_list_store_set (store, &iter,
GPA_KEYLIST_COLUMN_KEYTYPE, keytype,
- GPA_KEYLIST_COLUMN_KEYID, keyid,
GPA_KEYLIST_COLUMN_CREATED, created,
GPA_KEYLIST_COLUMN_EXPIRY, expiry,
GPA_KEYLIST_COLUMN_OWNERTRUST, ownertrust,
@@ -567,21 +563,17 @@ search_keylist_function (GtkTreeModel *model, gint column,
gpointer search_data)
{
gboolean result = TRUE;
- gchar *key_id, *user_id;
+ gchar *user_id;
gint search_len;
gtk_tree_model_get (model, iter,
- GPA_KEYLIST_COLUMN_KEYID, &key_id,
GPA_KEYLIST_COLUMN_USERID, &user_id, -1);
search_len = strlen (key_to_search_for);
- if (!g_ascii_strncasecmp (key_id, key_to_search_for, search_len))
- result=FALSE;
if (!g_ascii_strncasecmp (user_id, key_to_search_for, search_len))
result=FALSE;
- g_free (key_id);
g_free (user_id);
return result;
@@ -625,16 +617,6 @@ setup_columns (GpaKeyList *keylist, gboolean detailed)
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes
- (NULL, renderer, "text", GPA_KEYLIST_COLUMN_KEYID, NULL);
- gpa_set_column_title
- (column, _("Key ID"),
- _("The key ID is a short number to identify a certificate."));
- gtk_tree_view_append_column (GTK_TREE_VIEW (keylist), column);
- gtk_tree_view_column_set_sort_column_id (column, GPA_KEYLIST_COLUMN_KEYID);
- gtk_tree_view_column_set_sort_indicator (column, TRUE);
-
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes
(NULL, renderer, "text", GPA_KEYLIST_COLUMN_CREATED, NULL);
gpa_set_column_title
(column, _("Created"),
-----------------------------------------------------------------------
Summary of changes:
src/gpakeyselector.c | 61 ++++++++++++++++++++++++++++------------------------
src/keylist.c | 22 ++-----------------
2 files changed, 35 insertions(+), 48 deletions(-)
hooks/post-receive
--
The GNU Privacy Assistant
http://git.gnupg.org
More information about the Gnupg-commits
mailing list