[git] GPA - branch, master, updated. gpa-0.9.10-6-g0a78795
by Werner Koch
cvs at cvs.gnupg.org
Fri Feb 24 13:23:49 CET 2017
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 0a78795146661234070681737b3e08228616441f (commit)
via 710b734dffc8f896ed36e287355b55adfac9342f (commit)
from 26443b0c76b24b9a4d60d8d015461b0f4e7536e3 (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 0a78795146661234070681737b3e08228616441f
Author: Werner Koch <wk at gnupg.org>
Date: Fri Feb 24 13:20:36 2017 +0100
Change license of card application modules to LGPLv3+/GPLv2+.
All code was written by me and Moritz Schulte who was at that time an
employee of g10 Code GmbH. I am CEO of that company.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/src/cm-dinsig.c b/src/cm-dinsig.c
index a8d1e14..3d9ba71 100644
--- a/src/cm-dinsig.c
+++ b/src/cm-dinsig.c
@@ -3,10 +3,20 @@
*
* This file is part of GPA.
*
- * GPA is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * GPA is free software; you can redistribute and/or modify this part
+ * of GPA under the terms of either
+ *
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
*
* GPA is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
diff --git a/src/cm-dinsig.h b/src/cm-dinsig.h
index 35ed749..a77b601 100644
--- a/src/cm-dinsig.h
+++ b/src/cm-dinsig.h
@@ -3,6 +3,21 @@
*
* This file is part of GPA.
*
+ * GPA is free software; you can redistribute and/or modify this part
+ * of GPA under the terms of either
+ *
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
+ *
* GPA is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
@@ -14,7 +29,7 @@
* License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CM_DINSIG_H
diff --git a/src/cm-geldkarte.c b/src/cm-geldkarte.c
index 577b4c8..4c56abe 100644
--- a/src/cm-geldkarte.c
+++ b/src/cm-geldkarte.c
@@ -3,10 +3,20 @@
*
* This file is part of GPA.
*
- * GPA is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * GPA is free software; you can redistribute and/or modify this part
+ * of GPA under the terms of either
+ *
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
*
* GPA is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
diff --git a/src/cm-geldkarte.h b/src/cm-geldkarte.h
index 6fff652..d8ab6bf 100644
--- a/src/cm-geldkarte.h
+++ b/src/cm-geldkarte.h
@@ -3,10 +3,20 @@
*
* This file is part of GPA.
*
- * GPA is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * GPA is free software; you can redistribute and/or modify this part
+ * of GPA under the terms of either
+ *
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
*
* GPA is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -14,7 +24,7 @@
* License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CM_GELDKARTE_H
diff --git a/src/cm-netkey.c b/src/cm-netkey.c
index 5f027cc..405c105 100644
--- a/src/cm-netkey.c
+++ b/src/cm-netkey.c
@@ -3,10 +3,20 @@
*
* This file is part of GPA.
*
- * GPA is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * GPA is free software; you can redistribute and/or modify this part
+ * of GPA under the terms of either
+ *
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
*
* GPA is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
diff --git a/src/cm-netkey.h b/src/cm-netkey.h
index e5d3719..68140b1 100644
--- a/src/cm-netkey.h
+++ b/src/cm-netkey.h
@@ -3,10 +3,20 @@
*
* This file is part of GPA.
*
- * GPA is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * GPA is free software; you can redistribute and/or modify this part
+ * of GPA under the terms of either
+ *
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
*
* GPA is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -14,7 +24,7 @@
* License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CM_NETKEY_H
diff --git a/src/cm-object.c b/src/cm-object.c
index 28e36b0..be3d7fe 100644
--- a/src/cm-object.c
+++ b/src/cm-object.c
@@ -3,10 +3,20 @@
*
* This file is part of GPA.
*
- * GPA is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * GPA is free software; you can redistribute and/or modify this part
+ * of GPA under the terms of either
+ *
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
*
* GPA is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -14,7 +24,7 @@
* License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
@@ -26,7 +36,7 @@
#include <string.h>
#include <assert.h>
-#include "gpa.h"
+#include "gpa.h"
#include "cm-object.h"
@@ -52,14 +62,14 @@ static void gpa_cm_object_finalize (GObject *object);
-/************************************************************
+/************************************************************
******************* Implementation *********************
************************************************************/
-/************************************************************
+/************************************************************
****************** Object Management ********************
************************************************************/
@@ -102,10 +112,10 @@ gpa_cm_object_init (GTypeInstance *instance, void *class_ptr)
static void
gpa_cm_object_finalize (GObject *object)
-{
+{
/* GpaCMObject *card = GPA_CM_OBJECT (object); */
-
+
parent_class->finalize (object);
}
@@ -115,7 +125,7 @@ GType
gpa_cm_object_get_type (void)
{
static GType this_type = 0;
-
+
if (!this_type)
{
static const GTypeInfo this_info =
@@ -130,17 +140,17 @@ gpa_cm_object_get_type (void)
0, /* n_preallocs */
gpa_cm_object_init
};
-
+
this_type = g_type_register_static (GTK_TYPE_VBOX,
"GpaCMObject",
&this_info, 0);
}
-
+
return this_type;
}
-/************************************************************
+/************************************************************
********************** Public API ************************
************************************************************/
@@ -151,7 +161,7 @@ gpa_cm_object_update_status (GpaCMObject *obj, const char *text)
{
g_return_if_fail (obj);
g_return_if_fail (GPA_CM_OBJECT (obj));
-
+
if (!text)
text = "";
@@ -164,6 +174,6 @@ gpa_cm_object_alert_dialog (GpaCMObject *obj, const gchar *messageg)
{
g_return_if_fail (obj);
g_return_if_fail (GPA_CM_OBJECT (obj));
-
+
g_signal_emit (obj, signals[ALERT_DIALOG], 0, messageg);
}
diff --git a/src/cm-object.h b/src/cm-object.h
index dbe3118..ab22894 100644
--- a/src/cm-object.h
+++ b/src/cm-object.h
@@ -3,10 +3,20 @@
*
* This file is part of GPA.
*
- * GPA is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * GPA is free software; you can redistribute and/or modify this part
+ * of GPA under the terms of either
+ *
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
*
* GPA is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -14,7 +24,7 @@
* License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CM_OBJECT_H
@@ -49,7 +59,7 @@ GType gpa_cm_object_get_type (void) G_GNUC_CONST;
/* Object's class definition. */
-struct _GpaCMObjectClass
+struct _GpaCMObjectClass
{
GtkVBoxClass parent_class;
diff --git a/src/cm-openpgp.c b/src/cm-openpgp.c
index 0c81bf7..857baed 100644
--- a/src/cm-openpgp.c
+++ b/src/cm-openpgp.c
@@ -3,10 +3,20 @@
*
* This file is part of GPA.
*
- * GPA is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * GPA is free software; you can redistribute and/or modify this part
+ * of GPA under the terms of either
+ *
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
*
* GPA is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
diff --git a/src/cm-openpgp.h b/src/cm-openpgp.h
index e34c359..0c82003 100644
--- a/src/cm-openpgp.h
+++ b/src/cm-openpgp.h
@@ -3,10 +3,20 @@
*
* This file is part of GPA.
*
- * GPA is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * GPA is free software; you can redistribute and/or modify this part
+ * of GPA under the terms of either
+ *
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
*
* GPA is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -14,7 +24,7 @@
* License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CM_OPENPGP_H
diff --git a/src/cm-unknown.c b/src/cm-unknown.c
index db27058..e560b84 100644
--- a/src/cm-unknown.c
+++ b/src/cm-unknown.c
@@ -3,10 +3,20 @@
*
* This file is part of GPA.
*
- * GPA is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * GPA is free software; you can redistribute and/or modify this part
+ * of GPA under the terms of either
+ *
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
*
* GPA is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -17,7 +27,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-/* UNKNOWN is a dummy application used for, weel, unknown cards. It
+/* UNKNOWN is a dummy application used for, well, unknown cards. It
does only print the the ATR of the card. */
#ifdef HAVE_CONFIG_H
diff --git a/src/cm-unknown.h b/src/cm-unknown.h
index 41f44ff..352cd97 100644
--- a/src/cm-unknown.h
+++ b/src/cm-unknown.h
@@ -3,10 +3,20 @@
*
* This file is part of GPA.
*
- * GPA is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * GPA is free software; you can redistribute and/or modify this part
+ * of GPA under the terms of either
+ *
+ * - the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * or
+ *
+ * - the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * or both in parallel, as here.
*
* GPA is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
commit 710b734dffc8f896ed36e287355b55adfac9342f
Author: Werner Koch <wk at gnupg.org>
Date: Thu Feb 9 09:48:28 2017 +0100
Add mimetimes to gpa.desktop
--
Suggested-by: Olivier Mehani <shtrom at ssji.net>
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/gpa.desktop b/gpa.desktop
index 789ce7c..abeffe5 100644
--- a/gpa.desktop
+++ b/gpa.desktop
@@ -5,8 +5,9 @@ Name[en_US.ISO8859-1]=gpa
GenericName=GNU Privacy Assistant
GenericName[sv]=GNU Integritets-hjälpreda
GenericName[en_US.ISO8859-1]=GNU Privacy Assistant
-Exec=gpa
+Exec=gpa %f
Icon=gpa
Terminal=false
Type=Application
Categories=GTK;Application;Security;Utility;
+MimeType=application/pgp-encrypted;application/pgp-signature
-----------------------------------------------------------------------
Summary of changes:
gpa.desktop | 3 ++-
src/cm-dinsig.c | 18 ++++++++++++++----
src/cm-dinsig.h | 17 ++++++++++++++++-
src/cm-geldkarte.c | 18 ++++++++++++++----
src/cm-geldkarte.h | 20 +++++++++++++++-----
src/cm-netkey.c | 18 ++++++++++++++----
src/cm-netkey.h | 20 +++++++++++++++-----
src/cm-object.c | 42 ++++++++++++++++++++++++++----------------
src/cm-object.h | 22 ++++++++++++++++------
src/cm-openpgp.c | 18 ++++++++++++++----
src/cm-openpgp.h | 20 +++++++++++++++-----
src/cm-unknown.c | 20 +++++++++++++++-----
src/cm-unknown.h | 18 ++++++++++++++----
13 files changed, 190 insertions(+), 64 deletions(-)
hooks/post-receive
--
The GNU Privacy Assistant
http://git.gnupg.org
More information about the Gnupg-commits
mailing list