[Gpa-commits] r897 - trunk/src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-05-27 16:42:24 +0200 (Tue, 27 May 2008)
New Revision: 897

Modified:
   trunk/src/ChangeLog
   trunk/src/gpastreamsignop.c
Log:
2008-05-27  Marcus Brinkmann  <marcus at ulysses.g10code.com>

	* gpastreamsignop.c (gpa_stream_sign_operation_ctor): Force armor
	and sig_mode.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2008-05-09 18:11:13 UTC (rev 896)
+++ trunk/src/ChangeLog	2008-05-27 14:42:24 UTC (rev 897)
@@ -1,3 +1,8 @@
+2008-05-27  Marcus Brinkmann  <marcus at ulysses.g10code.com>
+
+	* gpastreamsignop.c (gpa_stream_sign_operation_ctor): Force armor
+	and sig_mode.
+
 2008-05-09  Werner Koch  <wk at g10code.com>
 
 	* confdialog.c (create_dialog_tabs_2): Use a localized group name.

Modified: trunk/src/gpastreamsignop.c
===================================================================
--- trunk/src/gpastreamsignop.c	2008-05-09 18:11:13 UTC (rev 896)
+++ trunk/src/gpastreamsignop.c	2008-05-27 14:42:24 UTC (rev 897)
@@ -149,7 +149,18 @@
   op = GPA_STREAM_SIGN_OPERATION (object);
 
   op->sign_dialog = gpa_file_sign_dialog_new (GPA_OPERATION (op)->window);
-  /* FIXME: MBSIGN */
+  {
+    GpaFileSignDialog *dialog = GPA_FILE_SIGN_DIALOG (op->sign_dialog);
+
+    /* Note: The information here is wrong.  The actual sig_mode and
+       armor settings are determined from the selected key (which
+       determines the protocol).  We set the values here to those for
+       OpenPGP, and force (==hide) the selection widgets.  */
+    gpa_file_sign_dialog_set_armor (dialog, TRUE);
+    gpa_file_sign_dialog_set_force_armor (dialog, TRUE);
+    gpa_file_sign_dialog_set_sig_mode (dialog, GPGME_SIG_MODE_NORMAL);
+    gpa_file_sign_dialog_set_force_sig_mode (dialog, TRUE);
+  }
   g_signal_connect (G_OBJECT (op->sign_dialog), "response",
                     G_CALLBACK (response_cb), op);