[Gpa-commits] r921 - in trunk: m4 pixmaps po src

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Tue Dec 16 12:00:17 CET 2008 

Author: werner
Date: 2008-12-16 12:00:13 +0100 (Tue, 16 Dec 2008)
New Revision: 921

Added:
   trunk/pixmaps/smartcard.xpm
Modified:
   trunk/m4/ChangeLog
   trunk/pixmaps/ChangeLog
   trunk/pixmaps/Makefile.am
   trunk/po/ChangeLog
   trunk/po/ar.po
   trunk/po/cs.po
   trunk/po/es.po
   trunk/po/ja.po
   trunk/po/nl.po
   trunk/po/pl.po
   trunk/po/pt_BR.po
   trunk/po/ru.po
   trunk/po/tr.po
   trunk/po/zh_TW.Big5.po
   trunk/src/ChangeLog
   trunk/src/cardman.c
   trunk/src/gpa.c
   trunk/src/gpa.h
   trunk/src/gpacardreloadop.c
   trunk/src/gpacardreloadop.h
   trunk/src/icons.c
   trunk/src/keygenwizard.c
   trunk/src/keyring.c
   trunk/src/keytable.c
   trunk/src/server_access.c
   trunk/src/utils.c
Log:
Add smartcard icon.
Minor cleanups for the card manager.


Modified: trunk/m4/ChangeLog
===================================================================
--- trunk/m4/ChangeLog	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/m4/ChangeLog	2008-12-16 11:00:13 UTC (rev 921)
@@ -1,3 +1,14 @@
+2008-12-15  gettextize  <bug-gnu-gettext at gnu.org>
+
+	* gettext.m4: Upgrade to gettext-0.17.
+	* iconv.m4: Upgrade to gettext-0.17.
+	* lib-ld.m4: Upgrade to gettext-0.17.
+	* lib-link.m4: Upgrade to gettext-0.17.
+	* lib-prefix.m4: Upgrade to gettext-0.17.
+	* nls.m4: Upgrade to gettext-0.17.
+	* po.m4: Upgrade to gettext-0.17.
+	* progtest.m4: Upgrade to gettext-0.17.
+
 2008-09-04  Marcus Brinkmann  <marcus at g10code.com>
 
 	* Makefile.am (EXTRA_DIST): Reset to only the manually included

Modified: trunk/pixmaps/ChangeLog
===================================================================
--- trunk/pixmaps/ChangeLog	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/pixmaps/ChangeLog	2008-12-16 11:00:13 UTC (rev 921)
@@ -1,3 +1,7 @@
+2008-12-16  Werner Koch  <wk at g10code.com>
+
+	* smartcard.xpm: New. Create simple smartcard icon.
+
 2008-01-24  Marcus Brinkmann  <marcus at g10code.de>
 
 	* Makefile.am (noinst_HEADERS): Add keyringeditor.xpm.

Modified: trunk/pixmaps/Makefile.am
===================================================================
--- trunk/pixmaps/Makefile.am	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/pixmaps/Makefile.am	2008-12-16 11:00:13 UTC (rev 921)
@@ -3,4 +3,4 @@
 	folder.xpm gpa_blue_key.xpm gpa_logo.xpm gpa_yellow_key.xpm \
 	harddisk.xpm help.xpm import.xpm keyring.xpm openfile.xpm \
 	open_folder.xpm sign.xpm verify.xpm wizard_backup.xpm \
-	wizard_genkey.xpm keyringeditor.xpm
+	wizard_genkey.xpm keyringeditor.xpm smartcard.xpm

Added: trunk/pixmaps/smartcard.xpm
===================================================================
--- trunk/pixmaps/smartcard.xpm	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/pixmaps/smartcard.xpm	2008-12-16 11:00:13 UTC (rev 921)
@@ -0,0 +1,32 @@
+/* XPM */
+static char * smartcard_xpm[] = {
+"24 24 5 1",
+" 	c None",
+".	c #FFFFFF",
+"+	c #CDCDCD",
+"@	c #FFD700",
+"#	c #FF9D00",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"  ....................  ",
+"+...................... ",
+"+...................... ",
+"+...................... ",
+"+..@@@#................ ",
+"+..#@@@................ ",
+"+..@@@#................ ",
+"+..#@@@................ ",
+"+...................... ",
+"+...................... ",
+"+...................... ",
+"+...................... ",
+"+...................... ",
+" +....................+ ",
+"  ++++++++++++++++++++  ",
+"                        ",
+"                        ",
+"                        ",
+"                        "};

Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/po/ChangeLog	2008-12-16 11:00:13 UTC (rev 921)
@@ -1,3 +1,7 @@
+2008-12-15  gettextize  <bug-gnu-gettext at gnu.org>
+
+	* Rules-quot: Upgrade to gettext-0.17.
+
 2008-12-04  Marcus Brinkmann  <marcus at g10code.com>
 
 	* fr.po: New version by gozer at progrock.com.

Modified: trunk/po/ar.po
===================================================================
--- trunk/po/ar.po	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/po/ar.po	2008-12-16 11:00:13 UTC (rev 921)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GPA\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-05-08 14:53+0200\n"
+"POT-Creation-Date: 2008-05-09 19:19+0200\n"
 "PO-Revision-Date: 2008-03-17 13:05+0100\n"
 "Last-Translator: \n"
 "Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -21,7 +21,7 @@
 msgid "Open File"
 msgstr "افتح ملفا"
 
-#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
+#: src/clipboard.c:404 src/confdialog.c:1274 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "رسالة GPA"
 
@@ -138,31 +138,31 @@
 msgid "<b>Main</b>"
 msgstr "<b>الرئيسي</b>"
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 msgid "Use default values"
 msgstr "يستخدم القيم البدئية"
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 msgid "Use default value"
 msgstr "استخدم القيمة البدئية"
 
-#: src/confdialog.c:1147
+#: src/confdialog.c:1154
 msgid "Do not use option"
 msgstr "لا تستخدم الخيار"
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom values"
 msgstr "يستخدم قيم معينة"
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom value"
 msgstr "استخدم قيمة معينة"
 
-#: src/confdialog.c:1156
+#: src/confdialog.c:1163
 msgid "Use default argument"
 msgstr "استخدم المعطى البدئي"
 
-#: src/confdialog.c:1281
+#: src/confdialog.c:1288
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
@@ -170,31 +170,31 @@
 "هناك تغييرات قمت بها لم تُطبّق. تغيير إعداد الخبير سيُطبّق هذه التغييرات.  أتريد "
 "المواصلة؟"
 
-#: src/confdialog.c:1326
+#: src/confdialog.c:1333
 msgid "Crypto Backend Configuration"
 msgstr "إعدادات محرّك التعمية"
 
-#: src/confdialog.c:1332
+#: src/confdialog.c:1339
 msgid "Reset"
 msgstr "صفّر"
 
-#: src/confdialog.c:1351
+#: src/confdialog.c:1358
 msgid "Configure the tools of the GnuPG system."
 msgstr "اضبط أدوات نظام GnuPG."
 
-#: src/confdialog.c:1355
+#: src/confdialog.c:1362
 msgid "Level:"
 msgstr "المستوى:"
 
-#: src/confdialog.c:1364
+#: src/confdialog.c:1371
 msgid "Basic"
 msgstr "أساسي"
 
-#: src/confdialog.c:1365
+#: src/confdialog.c:1372
 msgid "Advanced"
 msgstr "متقدّم"
 
-#: src/confdialog.c:1366
+#: src/confdialog.c:1373
 msgid "Expert"
 msgstr "خبير"
 

Modified: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/po/cs.po	2008-12-16 11:00:13 UTC (rev 921)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-05-08 14:53+0200\n"
+"POT-Creation-Date: 2008-05-09 19:19+0200\n"
 "PO-Revision-Date: 2007-05-24 15:04+0200\n"
 "Last-Translator: Zdeněk Hataš <zdenek.hatas at gmail.com>\n"
 "Language-Team: czech <cs at li.org>\n"
@@ -22,7 +22,7 @@
 msgid "Open File"
 msgstr "Otevřít soubor"
 
-#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
+#: src/clipboard.c:404 src/confdialog.c:1274 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "Zpráva GPA"
 
@@ -147,66 +147,66 @@
 msgid "<b>Main</b>"
 msgstr ""
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 #, fuzzy
 msgid "Use default values"
 msgstr "Standard-Schlüssel festlegen"
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 #, fuzzy
 msgid "Use default value"
 msgstr "Standard-Schlüssel festlegen"
 
-#: src/confdialog.c:1147
+#: src/confdialog.c:1154
 msgid "Do not use option"
 msgstr ""
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom values"
 msgstr ""
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom value"
 msgstr ""
 
-#: src/confdialog.c:1156
+#: src/confdialog.c:1163
 #, fuzzy
 msgid "Use default argument"
 msgstr "Empfängerliste festlegen"
 
-#: src/confdialog.c:1281
+#: src/confdialog.c:1288
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
 msgstr ""
 
-#: src/confdialog.c:1326
+#: src/confdialog.c:1333
 msgid "Crypto Backend Configuration"
 msgstr ""
 
-#: src/confdialog.c:1332
+#: src/confdialog.c:1339
 msgid "Reset"
 msgstr ""
 
-#: src/confdialog.c:1351
+#: src/confdialog.c:1358
 msgid "Configure the tools of the GnuPG system."
 msgstr ""
 
-#: src/confdialog.c:1355
+#: src/confdialog.c:1362
 #, fuzzy
 msgid "Level:"
 msgstr "Úroveň"
 
-#: src/confdialog.c:1364
+#: src/confdialog.c:1371
 #, fuzzy
 msgid "Basic"
 msgstr "_Zpět"
 
-#: src/confdialog.c:1365
+#: src/confdialog.c:1372
 msgid "Advanced"
 msgstr ""
 
-#: src/confdialog.c:1366
+#: src/confdialog.c:1373
 #, fuzzy
 msgid "Expert"
 msgstr "Exportovat"

Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/po/es.po	2008-12-16 11:00:13 UTC (rev 921)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.7.0\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-05-08 14:53+0200\n"
+"POT-Creation-Date: 2008-05-09 19:19+0200\n"
 "PO-Revision-Date: 2008-03-11 09:35+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <es at li.org>\n"
@@ -22,7 +22,7 @@
 msgid "Open File"
 msgstr "Abrir Archivo"
 
-#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
+#: src/clipboard.c:404 src/confdialog.c:1274 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "Mensaje de GPA"
 
@@ -141,31 +141,31 @@
 msgid "<b>Main</b>"
 msgstr "<b>Principal</b>"
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 msgid "Use default values"
 msgstr "Usar valores predeterminados"
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 msgid "Use default value"
 msgstr "Usar valor predeterminado"
 
-#: src/confdialog.c:1147
+#: src/confdialog.c:1154
 msgid "Do not use option"
 msgstr "No usar la opción"
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom values"
 msgstr "Usar valores personalizados"
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom value"
 msgstr "Usar valor personalizado"
 
-#: src/confdialog.c:1156
+#: src/confdialog.c:1163
 msgid "Use default argument"
 msgstr "Usar argumentos predeterminados"
 
-#: src/confdialog.c:1281
+#: src/confdialog.c:1288
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
@@ -173,31 +173,31 @@
 "Hay cambios que no han sido aplicados. Al cambiar la configuración experta "
 "estos cambios se aplicarán. ¿Desea continuar?"
 
-#: src/confdialog.c:1326
+#: src/confdialog.c:1333
 msgid "Crypto Backend Configuration"
 msgstr "Configuración del motor de cifrado"
 
-#: src/confdialog.c:1332
+#: src/confdialog.c:1339
 msgid "Reset"
 msgstr "Restablecer"
 
-#: src/confdialog.c:1351
+#: src/confdialog.c:1358
 msgid "Configure the tools of the GnuPG system."
 msgstr "Configurar las herramientas del sistema GnuPG."
 
-#: src/confdialog.c:1355
+#: src/confdialog.c:1362
 msgid "Level:"
 msgstr "Nivel:"
 
-#: src/confdialog.c:1364
+#: src/confdialog.c:1371
 msgid "Basic"
 msgstr "Básico"
 
-#: src/confdialog.c:1365
+#: src/confdialog.c:1372
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: src/confdialog.c:1366
+#: src/confdialog.c:1373
 msgid "Expert"
 msgstr "Experto"
 

Modified: trunk/po/ja.po
===================================================================
--- trunk/po/ja.po	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/po/ja.po	2008-12-16 11:00:13 UTC (rev 921)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.6.1-cvs\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-05-08 14:53+0200\n"
+"POT-Creation-Date: 2008-05-09 19:19+0200\n"
 "PO-Revision-Date: 2003-11-03 17:11+0100\n"
 "Last-Translator: TAKAHASHI Tamotsu <ttakah at lapis.plala.or.jp>\n"
 "Language-Team: Japanese <gnupg-i18n at gnupg.org>\n"
@@ -19,7 +19,7 @@
 msgid "Open File"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
-#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
+#: src/clipboard.c:404 src/confdialog.c:1274 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "GPA ¥á¥Ã¥»¡¼¥¸"
 
@@ -144,66 +144,66 @@
 msgid "<b>Main</b>"
 msgstr ""
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 #, fuzzy
 msgid "Use default values"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¸°¤òÀßÄê"
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 #, fuzzy
 msgid "Use default value"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¸°¤òÀßÄê"
 
-#: src/confdialog.c:1147
+#: src/confdialog.c:1154
 msgid "Do not use option"
 msgstr ""
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom values"
 msgstr ""
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom value"
 msgstr ""
 
-#: src/confdialog.c:1156
+#: src/confdialog.c:1163
 #, fuzzy
 msgid "Use default argument"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Î°¸Àè¤ÎÀßÄê"
 
-#: src/confdialog.c:1281
+#: src/confdialog.c:1288
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
 msgstr ""
 
-#: src/confdialog.c:1326
+#: src/confdialog.c:1333
 msgid "Crypto Backend Configuration"
 msgstr ""
 
-#: src/confdialog.c:1332
+#: src/confdialog.c:1339
 msgid "Reset"
 msgstr ""
 
-#: src/confdialog.c:1351
+#: src/confdialog.c:1358
 msgid "Configure the tools of the GnuPG system."
 msgstr ""
 
-#: src/confdialog.c:1355
+#: src/confdialog.c:1362
 #, fuzzy
 msgid "Level:"
 msgstr "¥ì¥Ù¥ë"
 
-#: src/confdialog.c:1364
+#: src/confdialog.c:1371
 #, fuzzy
 msgid "Basic"
 msgstr "/¥Ð¥Ã¥¯¥¢¥Ã¥×... (_B)"
 
-#: src/confdialog.c:1365
+#: src/confdialog.c:1372
 msgid "Advanced"
 msgstr ""
 
-#: src/confdialog.c:1366
+#: src/confdialog.c:1373
 #, fuzzy
 msgid "Expert"
 msgstr "¥¨¥¯¥¹¥Ý¡¼¥È"

Modified: trunk/po/nl.po
===================================================================
--- trunk/po/nl.po	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/po/nl.po	2008-12-16 11:00:13 UTC (rev 921)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.5.1\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-05-08 14:53+0200\n"
+"POT-Creation-Date: 2008-05-09 19:19+0200\n"
 "PO-Revision-Date: 2003-10-19 14:29+0200\n"
 "Last-Translator: Michael Anckaert <michael.anckaert at pi.be>\n"
 "Language-Team: DUTCH <nl at li.org>\n"
@@ -16,7 +16,7 @@
 msgid "Open File"
 msgstr "Open bestand"
 
-#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
+#: src/clipboard.c:404 src/confdialog.c:1274 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "GPA Bericht"
 
@@ -141,66 +141,66 @@
 msgid "<b>Main</b>"
 msgstr ""
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 #, fuzzy
 msgid "Use default values"
 msgstr "Stel standaard sleutel in"
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 #, fuzzy
 msgid "Use default value"
 msgstr "Stel standaard sleutel in"
 
-#: src/confdialog.c:1147
+#: src/confdialog.c:1154
 msgid "Do not use option"
 msgstr ""
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom values"
 msgstr ""
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom value"
 msgstr ""
 
-#: src/confdialog.c:1156
+#: src/confdialog.c:1163
 #, fuzzy
 msgid "Use default argument"
 msgstr "Stel standaard sleutel in"
 
-#: src/confdialog.c:1281
+#: src/confdialog.c:1288
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
 msgstr ""
 
-#: src/confdialog.c:1326
+#: src/confdialog.c:1333
 msgid "Crypto Backend Configuration"
 msgstr ""
 
-#: src/confdialog.c:1332
+#: src/confdialog.c:1339
 msgid "Reset"
 msgstr ""
 
-#: src/confdialog.c:1351
+#: src/confdialog.c:1358
 msgid "Configure the tools of the GnuPG system."
 msgstr ""
 
-#: src/confdialog.c:1355
+#: src/confdialog.c:1362
 #, fuzzy
 msgid "Level:"
 msgstr "Niveau"
 
-#: src/confdialog.c:1364
+#: src/confdialog.c:1371
 #, fuzzy
 msgid "Basic"
 msgstr "/_Backup...."
 
-#: src/confdialog.c:1365
+#: src/confdialog.c:1372
 msgid "Advanced"
 msgstr ""
 
-#: src/confdialog.c:1366
+#: src/confdialog.c:1373
 #, fuzzy
 msgid "Expert"
 msgstr "Exporteer"

Modified: trunk/po/pl.po
===================================================================
--- trunk/po/pl.po	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/po/pl.po	2008-12-16 11:00:13 UTC (rev 921)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gpa-0.7\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-05-08 14:53+0200\n"
+"POT-Creation-Date: 2008-05-09 19:19+0200\n"
 "PO-Revision-Date: 2004-08-22 02:23+0200\n"
 "Last-Translator: Emilian Nowak <emil5 at go2.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
@@ -19,7 +19,7 @@
 msgid "Open File"
 msgstr "Otwórz plik"
 
-#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
+#: src/clipboard.c:404 src/confdialog.c:1274 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "Komunikat GPA"
 
@@ -142,63 +142,63 @@
 msgid "<b>Main</b>"
 msgstr ""
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 msgid "Use default values"
 msgstr ""
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 msgid "Use default value"
 msgstr ""
 
-#: src/confdialog.c:1147
+#: src/confdialog.c:1154
 msgid "Do not use option"
 msgstr ""
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom values"
 msgstr ""
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom value"
 msgstr ""
 
-#: src/confdialog.c:1156
+#: src/confdialog.c:1163
 msgid "Use default argument"
 msgstr ""
 
-#: src/confdialog.c:1281
+#: src/confdialog.c:1288
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
 msgstr ""
 
-#: src/confdialog.c:1326
+#: src/confdialog.c:1333
 msgid "Crypto Backend Configuration"
 msgstr ""
 
-#: src/confdialog.c:1332
+#: src/confdialog.c:1339
 msgid "Reset"
 msgstr ""
 
-#: src/confdialog.c:1351
+#: src/confdialog.c:1358
 msgid "Configure the tools of the GnuPG system."
 msgstr ""
 
-#: src/confdialog.c:1355
+#: src/confdialog.c:1362
 #, fuzzy
 msgid "Level:"
 msgstr "Poziom"
 
-#: src/confdialog.c:1364
+#: src/confdialog.c:1371
 #, fuzzy
 msgid "Basic"
 msgstr "/_Kopia zapasowa..."
 
-#: src/confdialog.c:1365
+#: src/confdialog.c:1372
 msgid "Advanced"
 msgstr ""
 
-#: src/confdialog.c:1366
+#: src/confdialog.c:1373
 #, fuzzy
 msgid "Expert"
 msgstr "Eksport"

Modified: trunk/po/pt_BR.po
===================================================================
--- trunk/po/pt_BR.po	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/po/pt_BR.po	2008-12-16 11:00:13 UTC (rev 921)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.6.1\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-05-08 14:53+0200\n"
+"POT-Creation-Date: 2008-05-09 19:19+0200\n"
 "PO-Revision-Date: 2003-01-20 18:39+0100\n"
 "Last-Translator: Renato Martini <rmartini at cipsga.org.br>\n"
 "Language-Team: PORTUGUES <rmartini at cipsga.org.br>\n"
@@ -18,7 +18,7 @@
 msgid "Open File"
 msgstr "Abrir arquivo"
 
-#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
+#: src/clipboard.c:404 src/confdialog.c:1274 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "Mensagem do GPA"
 
@@ -141,66 +141,66 @@
 msgid "<b>Main</b>"
 msgstr ""
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 #, fuzzy
 msgid "Use default values"
 msgstr "Indicar chave secreta padrão."
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 #, fuzzy
 msgid "Use default value"
 msgstr "Indicar chave secreta padrão."
 
-#: src/confdialog.c:1147
+#: src/confdialog.c:1154
 msgid "Do not use option"
 msgstr ""
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom values"
 msgstr ""
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom value"
 msgstr ""
 
-#: src/confdialog.c:1156
+#: src/confdialog.c:1163
 #, fuzzy
 msgid "Use default argument"
 msgstr "Indicar destinatários default"
 
-#: src/confdialog.c:1281
+#: src/confdialog.c:1288
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
 msgstr ""
 
-#: src/confdialog.c:1326
+#: src/confdialog.c:1333
 msgid "Crypto Backend Configuration"
 msgstr ""
 
-#: src/confdialog.c:1332
+#: src/confdialog.c:1339
 msgid "Reset"
 msgstr ""
 
-#: src/confdialog.c:1351
+#: src/confdialog.c:1358
 msgid "Configure the tools of the GnuPG system."
 msgstr ""
 
-#: src/confdialog.c:1355
+#: src/confdialog.c:1362
 #, fuzzy
 msgid "Level:"
 msgstr "Nunca"
 
-#: src/confdialog.c:1364
+#: src/confdialog.c:1371
 #, fuzzy
 msgid "Basic"
 msgstr "/_Backup..."
 
-#: src/confdialog.c:1365
+#: src/confdialog.c:1372
 msgid "Advanced"
 msgstr ""
 
-#: src/confdialog.c:1366
+#: src/confdialog.c:1373
 #, fuzzy
 msgid "Expert"
 msgstr "Exportar"

Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/po/ru.po	2008-12-16 11:00:13 UTC (rev 921)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.8\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-05-08 14:53+0200\n"
+"POT-Creation-Date: 2008-05-09 19:19+0200\n"
 "PO-Revision-Date: 2008-03-18 20:12+0300\n"
 "Last-Translator: Sergei Smirnov <moscow at hro.org>\n"
 "Language-Team: Russian <moscow at hro.org>\n"
@@ -22,7 +22,7 @@
 msgid "Open File"
 msgstr "Открыть файл"
 
-#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
+#: src/clipboard.c:404 src/confdialog.c:1274 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "Сообщение GPA"
 
@@ -139,31 +139,31 @@
 msgid "<b>Main</b>"
 msgstr "<b>Главное</b>"
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 msgid "Use default values"
 msgstr "Использовать значения по умолчанию"
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 msgid "Use default value"
 msgstr "Использовать значение по умолчанию"
 
-#: src/confdialog.c:1147
+#: src/confdialog.c:1154
 msgid "Do not use option"
 msgstr "Не использовать опцию"
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom values"
 msgstr "Использовать свои значения"
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom value"
 msgstr "Использовать свое значение"
 
-#: src/confdialog.c:1156
+#: src/confdialog.c:1163
 msgid "Use default argument"
 msgstr "Использовать аргумент по умолчанию"
 
-#: src/confdialog.c:1281
+#: src/confdialog.c:1288
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
@@ -171,31 +171,31 @@
 "Есть незафиксированные изменения. Изменение экспертной установки поможет их "
 "запомнить. Продолжить?"
 
-#: src/confdialog.c:1326
+#: src/confdialog.c:1333
 msgid "Crypto Backend Configuration"
 msgstr "Настройки шифровальной программы"
 
-#: src/confdialog.c:1332
+#: src/confdialog.c:1339
 msgid "Reset"
 msgstr "Сбросить"
 
-#: src/confdialog.c:1351
+#: src/confdialog.c:1358
 msgid "Configure the tools of the GnuPG system."
 msgstr "Настройки инструментов GnuPG."
 
-#: src/confdialog.c:1355
+#: src/confdialog.c:1362
 msgid "Level:"
 msgstr "Уровень:"
 
-#: src/confdialog.c:1364
+#: src/confdialog.c:1371
 msgid "Basic"
 msgstr "Обычный"
 
-#: src/confdialog.c:1365
+#: src/confdialog.c:1372
 msgid "Advanced"
 msgstr "Расширенный"
 
-#: src/confdialog.c:1366
+#: src/confdialog.c:1373
 msgid "Expert"
 msgstr "Экспертный"
 

Modified: trunk/po/tr.po
===================================================================
--- trunk/po/tr.po	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/po/tr.po	2008-12-16 11:00:13 UTC (rev 921)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gpa 0.7.0\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-05-08 14:53+0200\n"
+"POT-Creation-Date: 2008-05-09 19:19+0200\n"
 "PO-Revision-Date: 2004-06-20 14:42+0300\n"
 "Last-Translator: Mert Çetin <mertc at su.sabanciuniv.edu>\n"
 "Language-Team: xTc & Déjà Vu\n"
@@ -19,7 +19,7 @@
 msgid "Open File"
 msgstr "Dosyayý Aç"
 
-#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
+#: src/clipboard.c:404 src/confdialog.c:1274 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "GPA Mesajý"
 
@@ -142,63 +142,63 @@
 msgid "<b>Main</b>"
 msgstr ""
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 msgid "Use default values"
 msgstr ""
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 msgid "Use default value"
 msgstr ""
 
-#: src/confdialog.c:1147
+#: src/confdialog.c:1154
 msgid "Do not use option"
 msgstr ""
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom values"
 msgstr ""
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom value"
 msgstr ""
 
-#: src/confdialog.c:1156
+#: src/confdialog.c:1163
 msgid "Use default argument"
 msgstr ""
 
-#: src/confdialog.c:1281
+#: src/confdialog.c:1288
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
 msgstr ""
 
-#: src/confdialog.c:1326
+#: src/confdialog.c:1333
 msgid "Crypto Backend Configuration"
 msgstr ""
 
-#: src/confdialog.c:1332
+#: src/confdialog.c:1339
 msgid "Reset"
 msgstr ""
 
-#: src/confdialog.c:1351
+#: src/confdialog.c:1358
 msgid "Configure the tools of the GnuPG system."
 msgstr ""
 
-#: src/confdialog.c:1355
+#: src/confdialog.c:1362
 #, fuzzy
 msgid "Level:"
 msgstr "Seviye"
 
-#: src/confdialog.c:1364
+#: src/confdialog.c:1371
 #, fuzzy
 msgid "Basic"
 msgstr "/_Yedekle..."
 
-#: src/confdialog.c:1365
+#: src/confdialog.c:1372
 msgid "Advanced"
 msgstr ""
 
-#: src/confdialog.c:1366
+#: src/confdialog.c:1373
 #, fuzzy
 msgid "Expert"
 msgstr "Dýþarý Yaz"

Modified: trunk/po/zh_TW.Big5.po
===================================================================
--- trunk/po/zh_TW.Big5.po	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/po/zh_TW.Big5.po	2008-12-16 11:00:13 UTC (rev 921)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gpa-0.7.0\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-05-08 14:53+0200\n"
+"POT-Creation-Date: 2008-05-09 19:19+0200\n"
 "PO-Revision-Date: 2003-10-20 11:55+0200\n"
 "Last-Translator: Shell Hung <shell at linux.org.hk>\n"
 "Language-Team: Hong Kong Linux User Group <info at linux.org.hk>\n"
@@ -18,7 +18,7 @@
 msgid "Open File"
 msgstr "¶}±ÒÀÉ®×"
 
-#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
+#: src/clipboard.c:404 src/confdialog.c:1274 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "GPA °T®§"
 
@@ -141,63 +141,63 @@
 msgid "<b>Main</b>"
 msgstr ""
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 msgid "Use default values"
 msgstr ""
 
-#: src/confdialog.c:1144
+#: src/confdialog.c:1151
 msgid "Use default value"
 msgstr ""
 
-#: src/confdialog.c:1147
+#: src/confdialog.c:1154
 msgid "Do not use option"
 msgstr ""
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom values"
 msgstr ""
 
-#: src/confdialog.c:1152
+#: src/confdialog.c:1159
 msgid "Use custom value"
 msgstr ""
 
-#: src/confdialog.c:1156
+#: src/confdialog.c:1163
 msgid "Use default argument"
 msgstr ""
 
-#: src/confdialog.c:1281
+#: src/confdialog.c:1288
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
 msgstr ""
 
-#: src/confdialog.c:1326
+#: src/confdialog.c:1333
 msgid "Crypto Backend Configuration"
 msgstr ""
 
-#: src/confdialog.c:1332
+#: src/confdialog.c:1339
 msgid "Reset"
 msgstr ""
 
-#: src/confdialog.c:1351
+#: src/confdialog.c:1358
 msgid "Configure the tools of the GnuPG system."
 msgstr ""
 
-#: src/confdialog.c:1355
+#: src/confdialog.c:1362
 #, fuzzy
 msgid "Level:"
 msgstr "µ{«×"
 
-#: src/confdialog.c:1364
+#: src/confdialog.c:1371
 #, fuzzy
 msgid "Basic"
 msgstr "/³Æ¥÷... (&B)"
 
-#: src/confdialog.c:1365
+#: src/confdialog.c:1372
 msgid "Advanced"
 msgstr ""
 
-#: src/confdialog.c:1366
+#: src/confdialog.c:1373
 #, fuzzy
 msgid "Expert"
 msgstr "¿é¥X"

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/src/ChangeLog	2008-12-16 11:00:13 UTC (rev 921)
@@ -1,9 +1,28 @@
+2008-12-16  Werner Koch  <wk at g10code.com>
+
+	* gpa.c (gpa_args_t): Add field start_card_manager.
+
+	* keygenwizard.c (string_strip_dup): Make arg const char and get
+	rid of the stupid "gchar".
+
+	* utils.c (decode_c_string, hextobyte): New.  Based on code taken
+	GPGME (conversion.c).
+
+	* gpacardreloadop.h: Remove include files. Re-indent macros.  
+	(_GpaCardReloadOperation) 
+	(_GpaCardReloadOperationClass): Move to gpacardreloadop.c.
+
+	* icons.c: Include smartcard.xpm.
+	(xpm): Add it to the list.
+	(register_stock_icons): Remove fake icon.
+	* cardman.c (gpa_card_manager_constructor): Use cardman icon.
+
 2008-12-13  Moritz  <moritz at gnu.org>
 
-	* gpacardreloadop.c, gpacardreloadop.h, gpagenkeycardop.c,
-	gpagenkeycardop.h, cardman.c, cardman.h: New files.
+	* gpacardreloadop.c, gpacardreloadop.h, gpagenkeycardop.c
+	* gpagenkeycardop.h, cardman.c, cardman.h: New files.
 
-	* Makefile.am (gpa_SOURCES): Added: cardman.c, cardman.h,
+	* Makefile.am (gpa_SOURCES): Add cardman.c, cardman.h,
 	gpacardreloadop.c, gpacardreloadop.h, gpagenkeycardop.c,
 	gpagenkeycardop.h.
 
@@ -78,6 +97,16 @@
 
 	* server.c (cmd_sender): Add missing label.
 
+2008-10-30  Werner Koch  <wk at g10code.com>
+
+	* keyring.c (keyring_editor_selection_changed): Use validating
+	keylist mode.
+
+2008-10-24  Werner Koch  <wk at g10code.com>
+
+	* server_access.c (helper_path): Use gpg2keys_ with fallback to
+	gpgkeys_.
+
 2008-10-15  Werner Koch  <wk at g10code.com>
 
 	* server.c (struct conn_ctrl_s): Add SENDER_PROTOCOL_HINT.

Modified: trunk/src/cardman.c
===================================================================
--- trunk/src/cardman.c	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/src/cardman.c	2008-12-16 11:00:13 UTC (rev 921)
@@ -1,6 +1,5 @@
 /* cardman.c  -  The GNU Privacy Assistant: card manager.
-   Copyright (C) 2000, 2001 G-N-U GmbH.
-   Copyright (C) 2007, 2008 g10 Code GmbH
+   Copyright (C) 2008 g10 Code GmbH
 
    This file is part of GPA.
 
@@ -181,7 +180,11 @@
   else if (strcmp (identifier, "lang") == 0 && idx == 0)
     gtk_entry_set_text (GTK_ENTRY (cardman->entryLanguage), string);
   else if (strcmp (identifier, "url") == 0 && idx == 0)
-    gtk_entry_set_text (GTK_ENTRY (cardman->entryPubkeyUrl), string);
+    {
+      char *tmp = decode_c_string (string);
+      gtk_entry_set_text (GTK_ENTRY (cardman->entryPubkeyUrl), tmp);
+      xfree (tmp);
+    }
   else if (strcmp (identifier, "vendor") == 0 && idx == 1)
     gtk_entry_set_text (GTK_ENTRY (cardman->entryManufacturer), string);
   else if (strcmp (identifier, "version") == 0 && idx == 0)
@@ -362,8 +365,10 @@
 #define ADD_TABLE_ROW(label, widget) \
   { \
     GtkWidget *tmp_label = gtk_label_new (_(label)); \
-    gtk_table_attach (GTK_TABLE (table), tmp_label, 0, 1, rowidx, rowidx + 1, GTK_FILL, GTK_SHRINK, 0, 0); \
-    gtk_table_attach (GTK_TABLE (table), widget, 1, 2, rowidx, rowidx + 1, GTK_FILL, GTK_SHRINK, 0, 0); \
+    gtk_table_attach (GTK_TABLE (table), tmp_label, 0, 1, \
+                      rowidx, rowidx + 1, GTK_FILL, GTK_SHRINK, 0, 0); \
+    gtk_table_attach (GTK_TABLE (table), widget, 1, 2, \
+                      rowidx, rowidx + 1, GTK_FILL, GTK_SHRINK, 0, 0); \
     rowidx++; \
   }
   
@@ -373,7 +378,7 @@
 
   cardman->entryVersion = gtk_entry_new ();
   gtk_editable_set_editable (GTK_EDITABLE (cardman->entryVersion), FALSE);
-  ADD_TABLE_ROW ("Version: ", cardman->entryVersion);
+  ADD_TABLE_ROW ("Card Version: ", cardman->entryVersion);
 
   cardman->entryManufacturer = gtk_entry_new ();
   gtk_editable_set_editable (GTK_EDITABLE (cardman->entryManufacturer), FALSE);
@@ -402,7 +407,7 @@
 
   cardman->entryLogin = gtk_entry_new ();
   gtk_editable_set_editable (GTK_EDITABLE (cardman->entryLogin), FALSE);
-  ADD_TABLE_ROW ("Login data: ", cardman->entryLogin);
+  ADD_TABLE_ROW ("Login Data: ", cardman->entryLogin);
 
   cardman->entryPubkeyUrl = gtk_entry_new ();
   gtk_editable_set_editable (GTK_EDITABLE (cardman->entryPubkeyUrl), FALSE);
@@ -479,11 +484,11 @@
   gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, TRUE, 0);
 
 
-  /* Add a fancy label that tells us: This is the file manager.  */
+  /* Add a fancy label that tells us: This is the card manager.  */
   hbox = gtk_hbox_new (FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
   
-  icon = gtk_image_new_from_stock ("gtk-directory", GTK_ICON_SIZE_DND);
+  icon = gtk_image_new_from_stock (GPA_STOCK_CARDMAN, GTK_ICON_SIZE_DND);
   gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, TRUE, 0);
 
   label = gtk_label_new (NULL);

Modified: trunk/src/gpa.c
===================================================================
--- trunk/src/gpa.c	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/src/gpa.c	2008-12-16 11:00:13 UTC (rev 921)
@@ -60,9 +60,9 @@
 {
   gboolean start_keyring_editor;
   gboolean start_file_manager;
+  gboolean start_card_manager;
   gboolean start_clipboard;
   gboolean start_settings;
-  gboolean start_card_manager;
   gboolean start_only_server;
   gchar *options_filename;
 } gpa_args_t;
@@ -96,12 +96,12 @@
       N_("Open keyring editor (default)"), NULL },
     { "files", 'f', 0, G_OPTION_ARG_NONE, &args.start_file_manager,
       N_("Open file manager"), NULL },
+    { "card", 'C', 0, G_OPTION_ARG_NONE, &args.start_card_manager,
+      N_("Open the card manager"), NULL },
     { "clipboard", 'c', 0, G_OPTION_ARG_NONE, &args.start_clipboard,
       N_("Open clipboard"), NULL },
     { "settings", 's', 0, G_OPTION_ARG_NONE, &args.start_settings,
       N_("Open the settings dialog"), NULL },
-    { "card", 'C', 0, G_OPTION_ARG_NONE, &args.start_card_manager,
-      N_("Open the card manager"), NULL },
     { "daemon", 'd', 0, G_OPTION_ARG_NONE, &args.start_only_server,
       N_("Enable the UI server (implies --cms)"), NULL },
     { "options", 'o', 0, G_OPTION_ARG_FILENAME, &args.options_filename,
@@ -165,8 +165,10 @@
 static void
 quit_if_no_window (void)
 {
-  if (!keyringeditor && !gpa_file_manager_is_open ()
-      && !gpa_clipboard_is_open () && !args.start_only_server
+  if (!keyringeditor 
+      && !args.start_only_server
+      && !gpa_file_manager_is_open ()
+      && !gpa_clipboard_is_open ()
       && !gpa_card_manager_is_open ())
     gpa_stop_server ();
 }
@@ -388,8 +390,10 @@
     cms_hack = 1; 
 
   /* Start the keyring editor by default.  */
-  if (!args.start_keyring_editor && !args.start_file_manager
-      && !args.start_clipboard && !args.start_settings
+  if (!args.start_keyring_editor 
+      && !args.start_file_manager
+      && !args.start_clipboard
+      && !args.start_settings
       && !args.start_card_manager)
     args.start_keyring_editor = TRUE;
 

Modified: trunk/src/gpa.h
===================================================================
--- trunk/src/gpa.h	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/src/gpa.h	2008-12-16 11:00:13 UTC (rev 921)
@@ -115,7 +115,9 @@
 
 int translate_sys2libc_fd (assuan_fd_t fd, int for_write);
 
+char *decode_c_string (const char *src);
 
+
 /*-- Convenience macros. -- */
 #define DIM(v)		     (sizeof(v)/sizeof((v)[0]))
 #define DIMof(type,member)   DIM(((type *)0)->member)

Modified: trunk/src/gpacardreloadop.c
===================================================================
--- trunk/src/gpacardreloadop.c	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/src/gpacardreloadop.c	2008-12-16 11:00:13 UTC (rev 921)
@@ -1,32 +1,50 @@
 /* gpacardreloadop.c - The GpaCardReloadOperation object.
- *	Copyright (C) 2003 Miguel Coca.
  *	Copyright (C) 2008 g10 Code GmbH.
  *
  * 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 2 of the License, or
+ * 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 distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GPA is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+ * License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
+#include <gtk/gtk.h>
 #include <gpgme.h>
+
 #include "gpa.h"
-#include "i18n.h"
 #include "gtktools.h"
+#include "gpaoperation.h"
 #include "gpacardreloadop.h"
 
+
+struct _GpaCardReloadOperation 
+{
+  GpaOperation parent;
+
+  gpa_card_reload_cb_t card_reload_cb;
+  void *card_reload_cb_opaque;
+  gpgme_data_t gpgme_output;
+};
+
+struct _GpaCardReloadOperationClass 
+{
+  GpaOperationClass parent_class;
+};
+
+
 static GObjectClass *parent_class = NULL;
 
 static void gpa_card_reload_operation_done_cb (GpaContext *context, 
@@ -219,6 +237,7 @@
   return op;
 }
 
+
 /* Internal */
 
 /* Called during idle loop; triggers the actual GPGME card-list

Modified: trunk/src/gpacardreloadop.h
===================================================================
--- trunk/src/gpacardreloadop.h	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/src/gpacardreloadop.h	2008-12-16 11:00:13 UTC (rev 921)
@@ -4,71 +4,71 @@
  *
  * 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 2 of the License, or
+ * 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 distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GPA is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+ * License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GPA_CARD_RELOAD_OP_H
 #define GPA_CARD_RELOAD_OP_H
 
-#include "gpa.h"
-#include <glib.h>
-#include <glib-object.h>
-#include "gpgmeedit.h"
-#include "gpaoperation.h"
+/* Definitions to define the object.  */
+#define GPA_CARD_RELOAD_OPERATION_TYPE \
+          (gpa_card_reload_operation_get_type ())
 
-/* GObject stuff */
-#define GPA_CARD_RELOAD_OPERATION_TYPE (gpa_card_reload_operation_get_type ())
 #define GPA_CARD_RELOAD_OPERATION(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GPA_CARD_RELOAD_OPERATION_TYPE, GpaCardReloadOperation))
+          (G_TYPE_CHECK_INSTANCE_CAST \
+            ((obj), GPA_CARD_RELOAD_OPERATION_TYPE,\
+              GpaCardReloadOperation))
+
 #define GPA_CARD_RELOAD_OPERATION_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST ((klass), GPA_CARD_RELOAD_OPERATION_TYPE, GpaCardReloadOperationClass))
+          (G_TYPE_CHECK_CLASS_CAST \
+            ((klass), GPA_CARD_RELOAD_OPERATION_TYPE,\
+              GpaCardReloadOperationClass))
+
 #define GPA_IS_CARD_RELOAD_OPERATION(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GPA_CARD_RELOAD_OPERATION_TYPE))
+          (G_TYPE_CHECK_INSTANCE_TYPE \
+            ((obj), GPA_CARD_RELOAD_OPERATION_TYPE))
+
 #define GPA_IS_CARD_RELOAD_OPERATION_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE ((klass), GPA_CARD_RELOAD_OPERATION_TYPE))
+          (G_TYPE_CHECK_CLASS_TYPE \
+            ((klass), GPA_CARD_RELOAD_OPERATION_TYPE))
+
 #define GPA_CARD_RELOAD_OPERATION_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), GPA_CARD_RELOAD_OPERATION_TYPE, GpaCardReloadOperationClass))
+          (G_TYPE_INSTANCE_GET_CLASS \
+            ((obj), GPA_CARD_RELOAD_OPERATION_TYPE,\
+              GpaCardReloadOperationClass))
 
+
 typedef struct _GpaCardReloadOperation GpaCardReloadOperation;
 typedef struct _GpaCardReloadOperationClass GpaCardReloadOperationClass;
 
-/* Type for the callback passed to GpaCardReloadOp object creation,
-   which is used for passing card data items to the caller. */
-typedef void (*gpa_card_reload_cb_t) (void *opaque,
-				      const char *identifier, int idx, const void *value);
+GType gpa_card_reload_operation_get_type (void) G_GNUC_CONST;
 
-struct _GpaCardReloadOperation {
-  GpaOperation parent;
 
-  gpa_card_reload_cb_t card_reload_cb;
-  void *card_reload_cb_opaque;
-  gpgme_data_t gpgme_output;
-};
+/************************************
+ ************ Public API ************
+ ************************************/
 
-struct _GpaCardReloadOperationClass {
-  GpaOperationClass parent_class;
-};
+/* Type for the callback passed to GpaCardReloadOp object creation,
+   which is used for passing card data items to the caller. */
+typedef void (*gpa_card_reload_cb_t) 
+     (void *opaque, const char *identifier, int idx, const void *value);
 
-GType gpa_card_reload_operation_get_type (void) G_GNUC_CONST;
-
-/* API */					   
-
 /* Create a new GpaCardReloadOperation object. Use CB for passing card
    data items to the caller. OPAQUE is the opaque argument for CB.  */
 GpaCardReloadOperation *gpa_card_reload_operation_new (GtkWidget *window,
 						       gpa_card_reload_cb_t cb,
 						       void *opaque);
 
-#endif
+#endif /*GPA_CARD_RELOAD_OP_H*/
+

Modified: trunk/src/icons.c
===================================================================
--- trunk/src/icons.c	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/src/icons.c	2008-12-16 11:00:13 UTC (rev 921)
@@ -50,6 +50,7 @@
 #include "sign.xpm"
 #include "wizard_backup.xpm"
 #include "wizard_genkey.xpm"
+#include "smartcard.xpm"
 
 
 struct {
@@ -74,6 +75,7 @@
   { GPA_STOCK_SECRET_KEY, blue_yellow_key_xpm },
   { "wizard_genkey", wizard_genkey_xpm},
   { "wizard_backup", wizard_backup_xpm},
+  { GPA_STOCK_CARDMAN, smartcard_xpm },
   { NULL, NULL }
 };
 
@@ -184,12 +186,6 @@
   icon_set = gtk_icon_set_copy (icon_set);
   gtk_icon_factory_add (icon_factory, GPA_STOCK_FILEMAN, icon_set);
 
-  /* Add a fake stock icon for the card manager window.  */
-  /* FIXME: this is a FLOPPY icon. We need a smartcard icon. -mo */
-  icon_set = gtk_icon_factory_lookup_default (GTK_STOCK_FLOPPY);
-  icon_set = gtk_icon_set_copy (icon_set);
-  gtk_icon_factory_add (icon_factory, GPA_STOCK_CARDMAN, icon_set);
-
   gtk_icon_factory_add_default (icon_factory); 
 
   g_object_unref (icon_factory);

Modified: trunk/src/keygenwizard.c
===================================================================
--- trunk/src/keygenwizard.c	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/src/keygenwizard.c	2008-12-16 11:00:13 UTC (rev 921)
@@ -48,8 +48,8 @@
  
 /* Return a copy of string with leading and trailing whitespace
    stripped.  */
-static gchar *
-string_strip_dup (gchar *string)
+static char *
+string_strip_dup (const char *string)
 {
   return g_strstrip (g_strdup (string));
 }

Modified: trunk/src/keyring.c
===================================================================
--- trunk/src/keyring.c	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/src/keyring.c	2008-12-16 11:00:13 UTC (rev 921)
@@ -683,12 +683,15 @@
       key = (gpgme_key_t) selection->data;
       old_mode = gpgme_get_keylist_mode (editor->ctx->ctx);
 
-      /* With all the signatures.  Note that we should not save and
-         restore the old protocol because the protocol should not be
-         changed before the gpgme_op_keylist_end.  Saving and
-         restoring the keylist mode is okay. */
+      /* With all the signatures and validating for the sake of X.509.
+         Note that we should not save and restore the old protocol
+         because the protocol should not be changed before the
+         gpgme_op_keylist_end.  Saving and restoring the keylist mode
+         is okay. */
       gpgme_set_keylist_mode (editor->ctx->ctx, 
-			      old_mode | GPGME_KEYLIST_MODE_SIGS);
+			      (old_mode 
+                               | GPGME_KEYLIST_MODE_SIGS
+                               | GPGME_KEYLIST_MODE_VALIDATE));
       gpgme_set_protocol (editor->ctx->ctx, key->protocol);
       err = gpgme_op_keylist_start (editor->ctx->ctx, key->subkeys->fpr, 
 				    FALSE);

Modified: trunk/src/keytable.c
===================================================================
--- trunk/src/keytable.c	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/src/keytable.c	2008-12-16 11:00:13 UTC (rev 921)
@@ -195,7 +195,7 @@
       return;
     }
   
-  /* Now continue with a key listing for X.509 keys put save the error
+  /* Now continue with a key listing for X.509 keys but save the error
      of the the PGP key listing.  */
   keytable->first_half_err = err;
   keytable->did_first_half = 1;

Modified: trunk/src/server_access.c
===================================================================
--- trunk/src/server_access.c	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/src/server_access.c	2008-12-16 11:00:13 UTC (rev 921)
@@ -215,11 +215,23 @@
         *name = 0;
       helper = name;
     }
-  path = g_strdup_printf ("%s\\gpgkeys_%s.exe", helper, scheme);
+  path = g_strdup_printf ("%s\\gpg2keys_%s.exe", helper, scheme);
+  if (access (path, F_OK))
+    {
+      g_free (path)
+      path = g_strdup_printf ("%s\\gpgkeys_%s.exe", helper, scheme);
+    }
 #else
-  helper = g_strdup_printf ("gpgkeys_%s", scheme);
+  helper = g_strdup_printf ("gpg2keys_%s", scheme);
   path = g_build_filename (GPA_KEYSERVER_HELPERS_DIR, helper, NULL);
   g_free (helper);
+  if (access (path, F_OK))
+    {
+      g_free (path);
+      helper = g_strdup_printf ("gpgkeys_%s", scheme);
+      path = g_build_filename (GPA_KEYSERVER_HELPERS_DIR, helper, NULL);
+      g_free (helper);
+    }
 #endif  
   return path;
 }

Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c	2008-12-13 22:34:51 UTC (rev 920)
+++ trunk/src/utils.c	2008-12-16 11:00:13 UTC (rev 921)
@@ -130,3 +130,119 @@
 }
 #endif /*HAVE_W32_SYSTEM*/
 
+
+/* Convert two hexadecimal digits from STR to the value they
+   represent.  Returns -1 if one of the characters is not a
+   hexadecimal digit.  */
+static int
+hextobyte (const char *str)
+{
+  int val = 0;
+  int i;
+
+#define NROFHEXDIGITS 2
+  for (i = 0; i < NROFHEXDIGITS; i++)
+    {
+      if (*str >= '0' && *str <= '9')
+	val += *str - '0';
+      else if (*str >= 'A' && *str <= 'F')
+	val += 10 + *str - 'A';
+      else if (*str >= 'a' && *str <= 'f')
+	val += 10 + *str - 'a';
+      else
+	return -1;
+      if (i < NROFHEXDIGITS - 1)
+	val *= 16;
+      str++;
+    }
+#undef NROFHEXDIGITS
+  return val;
+}
+
+
+/* Decode the C formatted string SRC and return the result in a newly
+   allocated buffer.  */
+char *
+decode_c_string (const char *src)
+{
+  char *buffer, *dest;
+
+  /* The converted string will never be larger than the original
+     string.  */
+  dest = buffer = xmalloc (strlen (src) + 1);
+
+  while (*src)
+    {
+      if (*src != '\\')
+	{
+	  *(dest++) = *(src++);
+	  continue;
+	}
+
+#define DECODE_ONE(match,result)	\
+	case match:			\
+	  src += 2;			\
+	  *(dest++) = result;		\
+	  break;
+
+      switch (src[1])
+	{
+
+	  DECODE_ONE ('\'', '\'');
+	  DECODE_ONE ('\"', '\"');
+	  DECODE_ONE ('\?', '\?');
+	  DECODE_ONE ('\\', '\\');
+	  DECODE_ONE ('a', '\a');
+	  DECODE_ONE ('b', '\b');
+	  DECODE_ONE ('f', '\f');
+	  DECODE_ONE ('n', '\n');
+	  DECODE_ONE ('r', '\r');
+	  DECODE_ONE ('t', '\t');
+	  DECODE_ONE ('v', '\v');
+
+	case 'x':
+	  {
+	    int val = hextobyte (&src[2]);
+
+	    if (val == -1)
+	      {
+		/* Should not happen.  */
+		*(dest++) = *(src++);
+		*(dest++) = *(src++);
+		if (*src)
+		  *(dest++) = *(src++);
+		if (*src)
+		  *(dest++) = *(src++);
+	      }
+	    else
+	      {
+		if (!val)
+		  {
+		    /* A binary zero is not representable in a C
+		       string thus we keep the C-escaping.  Note that
+		       this will also never be larger than the source
+		       string.  */
+		    *(dest++) = '\\';
+		    *(dest++) = '0'; 
+		  }
+		else 
+		  *((unsigned char *) dest++) = val;
+		src += 4;
+	      }
+	  }
+	  break;
+
+	default:
+	  {
+	    /* Should not happen.  */
+	    *(dest++) = *(src++);
+	    *(dest++) = *(src++);
+	  }
+        }
+#undef DECODE_ONE
+    }
+  *(dest++) = 0;
+
+  return buffer;
+}
+

More information about the Gpa-commits mailing list