[pan2] change gnutls version string result

[Heinrich MÃller <henmull src gnome org>]

commit 7e72a7a1a876710e3edeb572ae7dd5b0d35ea300
Author: Heinrich MÃlller <henmull src gnome org>
Date:   Tue May 1 15:32:50 2012 +0200

    change gnutls version string result

 configure.in        |    6 ++++--
 pan/gui/body-pane.h |    5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/configure.in b/configure.in
index 85052a9..4ef7c9a 100644
--- a/configure.in
+++ b/configure.in
@@ -159,9 +159,11 @@ dnl GnuTLS support
 gnutls_msg=no
 AC_ARG_WITH(gnutls, AS_HELP_STRING([--with-gnutls],[enable GnuTLS support (normally: no)]), [want_gnutls=$withval], [want_gnutls=no])
 if test "x$want_gnutls" = "xyes" ; then
-  GNUTLS_VER=`echo pkg-config --modversion gnutls`	
+  
   PKG_CHECK_MODULES([GNUTLS],[gnutls >= $GNUTLS_REQUIRED],
-  [gnutls_msg="yes = $GNUTLS_VER"
+  [
+  GNUTLS_VER=`pkg-config --modversion gnutls`	
+  gnutls_msg="yes = $GNUTLS_VER"
   AC_DEFINE(HAVE_GNUTLS,[1],[GnuTLS support])],
   [gnutls_msg=no
   AC_MSG_RESULT(no)])
diff --git a/pan/gui/body-pane.h b/pan/gui/body-pane.h
index aee892c..10e2e66 100644
--- a/pan/gui/body-pane.h
+++ b/pan/gui/body-pane.h
@@ -156,9 +156,12 @@ namespace pan
 #endif
       int _attachments;
       int _cur_col, _cur_row;
-      std::set<char*> _freeme;
+      std::set<char*> _attach_names; //attachment names
       MenuSelection _selection;
 
+      GdkCursor ** cursors;
+      pixbufs_t emoticon_pixbufs;
+
     public:
       const char* _current_attachment;