[git] GPA - branch, master, updated. gpa-0.9.9-3-g60ddc17

[by Werner Koch]

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  60ddc172ba09d7c0c57835e23ddb6074a695e258 (commit)
       via  d06a5f540ed8a39547e85fd28c3347ccf3f6787d (commit)
      from  2ece041f8cc18ce8c125a96db23067e4daa3e972 (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 60ddc172ba09d7c0c57835e23ddb6074a695e258
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Sep 11 10:55:35 2015 +0200

    Fix segv when if build against gpgme 1.6.1.
    
    * src/gpasubkeylist.c (gpa_subkey_list_new): Remove one STRING column
    for gpgme >= 1.6.1.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/gpasubkeylist.c b/src/gpasubkeylist.c
index fccef74..9862521 100644
--- a/src/gpasubkeylist.c
+++ b/src/gpasubkeylist.c
@@ -68,7 +68,9 @@ gpa_subkey_list_new (void)
 
   /* Init the model */
   store = gtk_list_store_new (SUBKEY_N_COLUMNS,
+#if GPGME_VERSION_NUMBER < 0x010601  /* GPGME < 1.6.1 */
 			      G_TYPE_STRING,
+#endif
 			      G_TYPE_STRING,
 			      G_TYPE_STRING,
 			      G_TYPE_STRING,

commit d06a5f540ed8a39547e85fd28c3347ccf3f6787d
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Sep 11 10:53:59 2015 +0200

    Allow deletion of X.509 keys.
    
    * src/gpakeydeleteop.c (gpa_key_delete_operation_start): Set the
    protocol before calling the delete function.
    --
    
    In the past this worked only if the context was already set to the
    X.509 protocol.
    
    GnuPG-bug-id: 2094

diff --git a/src/gpakeydeleteop.c b/src/gpakeydeleteop.c
index bebf079..c41c206 100644
--- a/src/gpakeydeleteop.c
+++ b/src/gpakeydeleteop.c
@@ -35,10 +35,10 @@
 
 /* Internal functions */
 static gboolean gpa_key_delete_operation_idle_cb (gpointer data);
-static void gpa_key_delete_operation_done_error_cb (GpaContext *context, 
+static void gpa_key_delete_operation_done_error_cb (GpaContext *context,
 						    gpg_error_t err,
 						    GpaKeyDeleteOperation *op);
-static void gpa_key_delete_operation_done_cb (GpaContext *context, 
+static void gpa_key_delete_operation_done_cb (GpaContext *context,
 					      gpg_error_t err,
 					      GpaKeyDeleteOperation *op);
 
@@ -48,7 +48,7 @@ static GObjectClass *parent_class = NULL;
 
 static void
 gpa_key_delete_operation_finalize (GObject *object)
-{  
+{
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
@@ -88,7 +88,7 @@ static void
 gpa_key_delete_operation_class_init (GpaKeyDeleteOperationClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  
+
   parent_class = g_type_class_peek_parent (klass);
 
   object_class->constructor = gpa_key_delete_operation_constructor;
@@ -99,7 +99,7 @@ GType
 gpa_key_delete_operation_get_type (void)
 {
   static GType key_delete_operation_type = 0;
-  
+
   if (!key_delete_operation_type)
     {
       static const GTypeInfo key_delete_operation_info =
@@ -114,12 +114,12 @@ gpa_key_delete_operation_get_type (void)
         0,              /* n_preallocs */
         (GInstanceInitFunc) gpa_key_delete_operation_init,
       };
-      
-      key_delete_operation_type = g_type_register_static 
+
+      key_delete_operation_type = g_type_register_static
 	(GPA_KEY_OPERATION_TYPE, "GpaKeyDeleteOperation",
 	 &key_delete_operation_info, 0);
     }
-  
+
   return key_delete_operation_type;
 }
 
@@ -131,7 +131,7 @@ GpaKeyDeleteOperation*
 gpa_key_delete_operation_new (GtkWidget *window, GList *keys)
 {
   GpaKeyDeleteOperation *op;
-  
+
   op = g_object_new (GPA_KEY_DELETE_OPERATION_TYPE,
 		     "window", window,
 		     "keys", keys,
@@ -144,7 +144,7 @@ gpa_key_delete_operation_new (GtkWidget *window, GList *keys)
 
 static gpg_error_t
 gpa_key_delete_operation_start (GpaKeyDeleteOperation *op)
-{ 
+{
   gpg_error_t err;
   gpgme_key_t key;
 
@@ -154,6 +154,7 @@ gpa_key_delete_operation_start (GpaKeyDeleteOperation *op)
   if (! gpa_delete_dialog_run (GPA_OPERATION (op)->window, key))
     return gpg_error (GPG_ERR_CANCELED);
 
+  gpgme_set_protocol (GPA_OPERATION (op)->context->ctx, key->protocol);
   err = gpgme_op_delete_start (GPA_OPERATION(op)->context->ctx, key, TRUE);
   if (err)
     {
@@ -194,7 +195,7 @@ gpa_key_delete_operation_next (GpaKeyDeleteOperation *op)
   g_signal_emit_by_name (GPA_OPERATION (op), "completed", err);
 }
 
-static void gpa_key_delete_operation_done_error_cb (GpaContext *context, 
+static void gpa_key_delete_operation_done_error_cb (GpaContext *context,
 						    gpg_error_t err,
 						    GpaKeyDeleteOperation *op)
 {
@@ -210,7 +211,7 @@ static void gpa_key_delete_operation_done_error_cb (GpaContext *context,
     }
 }
 
-static void gpa_key_delete_operation_done_cb (GpaContext *context, 
+static void gpa_key_delete_operation_done_cb (GpaContext *context,
 					      gpg_error_t err,
 					      GpaKeyDeleteOperation *op)
 {

-----------------------------------------------------------------------

Summary of changes:
 src/gpakeydeleteop.c | 25 +++++++++++++------------
 src/gpasubkeylist.c  |  2 ++
 2 files changed, 15 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Assistant
http://git.gnupg.org