[seahorse] Fix compile warnings.
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse] Fix compile warnings.
- Date: Wed, 6 Oct 2010 21:56:04 +0000 (UTC)
commit 2ddd0ffe2e1105fe9cb7e38252ba6ac9966f9467
Author: Stef Walter <stef memberwebs com>
Date: Wed Oct 6 19:51:10 2010 +0000
Fix compile warnings.
Fix compiler warnings in seahorse_gpgme_get_keytype_table()
and seahorse_service_generate_credentials()
daemon/seahorse-service.c | 12 ++++++------
pgp/seahorse-gpgme.c | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/daemon/seahorse-service.c b/daemon/seahorse-service.c
index 2b361f4..35a4fcc 100644
--- a/daemon/seahorse-service.c
+++ b/daemon/seahorse-service.c
@@ -37,9 +37,10 @@
#include "seahorse-util.h"
#if WITH_PGP
- #include "../pgp/seahorse-pgp.h"
- #include "../pgp/seahorse-gpgme-source.h"
- #include "../pgp/seahorse-gpgme-key-op.h"
+#include "pgp/seahorse-pgp.h"
+#include "pgp/seahorse-gpgme-source.h"
+#include "pgp/seahorse-gpgme-dialogs.h"
+#include "pgp/seahorse-gpgme-key-op.h"
#endif
#include <gio/gio.h>
@@ -194,7 +195,6 @@ seahorse_service_generate_credentials (SeahorseService *svc, gchar *ktype,
gchar *name=NULL;
gchar *email=NULL;
gchar *comment=NULL;
- SeahorseWidget *swidget;
#if WITH_PGP
sksrc = seahorse_context_find_source (seahorse_context_for_app (),
@@ -218,8 +218,8 @@ seahorse_service_generate_credentials (SeahorseService *svc, gchar *ktype,
if ((pval) && (G_VALUE_TYPE (pval) == G_TYPE_STRING))
comment=g_value_dup_string (pval);
- seahorse_gpgme_generate_key(sksrc, name, email, comment,
- DSA_ELGAMAL, 2048,0);
+ seahorse_gpgme_generate_key(SEAHORSE_GPGME_SOURCE (sksrc),
+ name, email, comment, DSA_ELGAMAL, 2048,0);
g_free (name);
name = NULL;
diff --git a/pgp/seahorse-gpgme.c b/pgp/seahorse-gpgme.c
index d472b6e..dbe39e4 100644
--- a/pgp/seahorse-gpgme.c
+++ b/pgp/seahorse-gpgme.c
@@ -227,13 +227,13 @@ seahorse_gpgme_get_keytype_table (SeahorseKeyTypeTable *table)
ver = seahorse_util_parse_version (engine->version);
if (ver >= VER_2012 || (ver >= VER_1410 && ver < VER_190))
- *table = &KEYTYPES_2012;
+ *table = (SeahorseKeyTypeTable)&KEYTYPES_2012;
else if (ver >= VER_140 || ver >= VER_190)
- *table = &KEYTYPES_140;
+ *table = (SeahorseKeyTypeTable)&KEYTYPES_140;
else if (ver >= VER_124)
- *table = &KEYTYPES_124;
+ *table = (SeahorseKeyTypeTable)&KEYTYPES_124;
else if (ver >= VER_120)
- *table = &KEYTYPES_120;
+ *table = (SeahorseKeyTypeTable)&KEYTYPES_120;
else // older versions not supported
gerr = GPG_E (GPG_ERR_USER_2);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]