[pan2] dsfsdfds
- From: Heinrich MÃller <henmull src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2] dsfsdfds
- Date: Mon, 9 Jan 2012 13:39:14 +0000 (UTC)
commit b321a41fefa4e3bc67a22975db67af83ea2ad9b9
Author: Heinrich MÃller <henmull src gnome org>
Date: Mon Jan 9 02:21:39 2012 +0100
dsfsdfds
configure.in | 8 +++-----
pan/gui/body-pane.cc | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/configure.in b/configure.in
index a7a1e76..13427ca 100644
--- a/configure.in
+++ b/configure.in
@@ -87,11 +87,9 @@ AM_GLIB_GNU_GETTEXT
panlocaledir='${prefix}/${DATADIRNAME}/locale'
AM_PATH_GLIB_2_0($GLIB_REQUIRED,,exit 1,gobject gmodule gthread)
-dnl PKG_CHECK_MODULES([GMIME], [ gmime-2.6 >= $GMIME26_REQUIRED ],
-dnl AC_DEFINE(HAVE_GMIME_CRYPTO,[1],[crypto support (pgp) with gmime 2.6])],
- dnl [
- PKG_CHECK_MODULES( [GMIME], [gmime-2.4 >= $GMIME24_REQUIRED] )
- dnl ] )
+PKG_CHECK_MODULES([GMIME], [ gmime-2.6 >= $GMIME26_REQUIRED ],
+AC_DEFINE(HAVE_GMIME_CRYPTO,[1],[crypto support (pgp) with gmime 2.6])],
+[PKG_CHECK_MODULES( [GMIME], [gmime-2.4 >= $GMIME24_REQUIRED] )] )
AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus], [Enable DBUS support]), [want_dbus=$withval], [want_dbus=yes])
if test "x$want_dbus" = "xyes" ; then
diff --git a/pan/gui/body-pane.cc b/pan/gui/body-pane.cc
index 6c22b79..5756bbe 100644
--- a/pan/gui/body-pane.cc
+++ b/pan/gui/body-pane.cc
@@ -1712,10 +1712,10 @@ BodyPane :: BodyPane (Data& data, ArticleCache& cache, Prefs& prefs, GroupPrefs
for (guint i=0; i<NUM_ICONS; ++i)
icons[i].pixbuf = gdk_pixbuf_new_from_inline (-1, icons[i].pixbuf_txt, FALSE, 0);
-#ifdef HAVE_GMIME_CRYPTO
+
// signature pgp valid/invalid icon
_sig_icon = gtk_image_new();
-#endif
+
// menu for popup menu for attachments
_menu = gtk_menu_new ();
GtkWidget* l = gtk_menu_item_new_with_label(_("Save attachment as ...."));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]