[seahorse-sharing] Build fixes

[Stefan Walter <stefw src gnome org>]

commit 1837c7f99fe4db0810cb70e2f521c3e3f5c34fed
Author: Stef Walter <stefw collabora co uk>
Date:   Sun Sep 18 11:24:48 2011 +0200

    Build fixes
    
     * Remove binary from git archive
     * Depend on GTK+3.0 and fix issues
     * Initialize GPGME properly

 configure.ac                 |    8 ++++----
 daemon/seahorse-hkp-server.c |   20 ++++++++++++++------
 daemon/seahorse-sharing      |  Bin 140447 -> 0 bytes
 libegg/eggsmclient-private.h |    2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index da4d502..0a02ebc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,12 +21,12 @@ AC_PROG_INTLTOOL([0.35.0])
 AM_PROG_LIBTOOL
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18)
+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
 AC_SUBST([GTK_LIBS])
 AC_SUBST([GTK_CFLAGS])
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-PKG_CHECK_MODULES(SEAHORSE, gthread-2.0 gtk+-2.0 >= 2.10.0)
+PKG_CHECK_MODULES(SEAHORSE, gthread-2.0 gtk+-3.0 >= 3.0)
 
 dnl **************************************************************
 dnl GPG / GPGME CHECKS
@@ -198,11 +198,11 @@ AM_GLIB_GNU_GETTEXT
 
 dnl ****************************************************************************
 ## here we get the flags we'll actually use
-PKG_CHECK_MODULES(EGG, gtk+-2.0 >= 2.5.0)
+PKG_CHECK_MODULES(EGG, gtk+-3.0 >= 3.0)
 AC_SUBST(EGG_LIBS)
 AC_SUBST(EGG_CFLAGS)
 
-PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-2.0)
+PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-3.0)
 AC_SUBST(EGG_SMCLIENT_LIBS)
 AC_SUBST(EGG_SMCLIENT_CFLAGS)
 
diff --git a/daemon/seahorse-hkp-server.c b/daemon/seahorse-hkp-server.c
index ab1b94c..6925fad 100644
--- a/daemon/seahorse-hkp-server.c
+++ b/daemon/seahorse-hkp-server.c
@@ -589,14 +589,22 @@ seahorse_hkp_server_start(GError **err)
 	/* Initialize GPGME context */
 	if (gpgme_ctx == NULL) {
 		gpgme_protocol_t proto = GPGME_PROTOCOL_OpenPGP;
-		gpgme_error_t err = gpgme_engine_check_version (proto);
-		g_return_val_if_fail (err == 0, FALSE);
+		gpgme_error_t gerr;
 
-		err = gpgme_new (&gpgme_ctx);
-		g_return_val_if_fail (err == 0, FALSE);
+		if (!gpgme_check_version (NULL))
+			g_return_val_if_reached (FALSE);
 
-		err = gpgme_set_protocol (gpgme_ctx, proto);
-		g_return_val_if_fail (err == 0, FALSE);
+		gerr = gpgme_engine_check_version (proto);
+		g_return_val_if_fail (gerr == 0, FALSE);
+
+		gerr = gpgme_new (&gpgme_ctx);
+		if (gerr != 0) {
+			g_warning ("couldn't initialize gpgme: %s", gpgme_strerror (gerr));
+			return FALSE;
+		}
+
+		gerr = gpgme_set_protocol (gpgme_ctx, proto);
+		g_return_val_if_fail (gerr == 0, FALSE);
 	}
 
 	/* Now start the HTTP server */
diff --git a/libegg/eggsmclient-private.h b/libegg/eggsmclient-private.h
index ccb10bf..e391218 100644
--- a/libegg/eggsmclient-private.h
+++ b/libegg/eggsmclient-private.h
@@ -20,7 +20,7 @@
 #ifndef __EGG_SM_CLIENT_PRIVATE_H__
 #define __EGG_SM_CLIENT_PRIVATE_H__
 
-#include <gdkconfig.h>
+#include <gdk/gdk.h>
 #include "eggsmclient.h"
 
 G_BEGIN_DECLS