[pan2] - forgot to commit actions-extern.h - dbus is back in, i think i found the bug

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

commit d3dbbc272b5a37245ee9ac4015a187680516a02f
Author: Heinrich MÃller <henmull src gnome org>
Date:   Fri Jan 27 10:07:50 2012 +0100

    - forgot to commit actions-extern.h
    - dbus is back in, i think i found the bug

 configure.in               |    8 ++++----
 pan/data-impl/data-impl.cc |    4 ++--
 pan/gui/actions-extern.h   |   38 ++++++++++++++++++++++++++++++++++++++
 pan/gui/pan.cc             |    6 +-----
 4 files changed, 45 insertions(+), 11 deletions(-)
---
diff --git a/configure.in b/configure.in
index 7de9bcf..13999ae 100644
--- a/configure.in
+++ b/configure.in
@@ -116,10 +116,10 @@ if test "x$want_gmime_crypto" = "xyes" ; then
 fi
 
 
-dnl AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus], [Enable DBUS support]), [want_dbus=$withval], [want_dbus=yes])
-dnl if test "x$want_dbus" = "xyes" ; then
-dnl   AC_DEFINE(HAVE_DBUS,[1],[DBUS support for multiple Pan instances])
-dnl fi
+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
+  AC_DEFINE(HAVE_DBUS,[1],[DBUS support for multiple Pan instances])
+fi
 
 gtkspell_msg=no
 AC_ARG_WITH(gtkspell, AC_HELP_STRING([--with-gtkspell], [Enable GtkSpell support]), [want_gtkspell=$withval], [want_gtkspell=yes])
diff --git a/pan/data-impl/data-impl.cc b/pan/data-impl/data-impl.cc
index 6d03af6..14424e8 100644
--- a/pan/data-impl/data-impl.cc
+++ b/pan/data-impl/data-impl.cc
@@ -131,7 +131,7 @@ DataImpl :: save_state ()
 GnomeKeyringResult
 DataImpl :: password_encrypt (const PasswordData* pw)
 {
-  g_return_val_if_fail (gnome_keyring_is_available(), GNOME_KEYRING_RESULT_NO_KEYRING_DAEMON);
+//  g_return_val_if_fail (gnome_keyring_is_available(), GNOME_KEYRING_RESULT_NO_KEYRING_DAEMON);
 
   return (
     gnome_keyring_store_password_sync (
@@ -151,7 +151,7 @@ DataImpl :: password_decrypt (PasswordData* pw) const
 {
 
   gchar* pwd(0);
-  g_return_val_if_fail (gnome_keyring_is_available(), GNOME_KEYRING_RESULT_NO_KEYRING_DAEMON);
+//  g_return_val_if_fail (gnome_keyring_is_available(), GNOME_KEYRING_RESULT_NO_KEYRING_DAEMON);
 
   GnomeKeyringResult ret =
     gnome_keyring_find_password_sync (
diff --git a/pan/gui/actions-extern.h b/pan/gui/actions-extern.h
new file mode 100644
index 0000000..5134240
--- /dev/null
+++ b/pan/gui/actions-extern.h
@@ -0,0 +1,38 @@
+
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * Pan - A Newsreader for Gtk+
+ * Copyright (C) 2002-2006  Charles Kerr <charles rebelbase com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef ACTION_EXTERN_H
+#define ACTION_EXTERN_H
+
+#include <map>
+
+namespace pan
+{
+
+//  extern GtkActionEntry entries[];
+//  extern GtkActionEntry toggle_entries[];
+//  extern int ACTION_ENTRIES;
+//  extern int TOGGLE_ACTION_ENTRIES;
+
+    extern std::map<std::string,std::string> action_trans;
+
+}
+
+#endif
diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc
index 303ea62..4eb10f9 100644
--- a/pan/gui/pan.cc
+++ b/pan/gui/pan.cc
@@ -73,10 +73,8 @@ extern "C" {
   #include <gnome-keyring-1/gnome-keyring-memory.h>
 #endif
 
-
-/* NOTE : Dbus is disabled for now, my implementation is buggy */
 //#define DEBUG_LOCALE 1
-#define DEBUG_PARALLEL 1
+//#define DEBUG_PARALLEL 1
 
 using namespace pan;
 
@@ -807,8 +805,6 @@ _("General Options\n"
 
     dbus_connection = g_bus_get_sync  (G_BUS_TYPE_SESSION , NULL, NULL);
 
-//    while (!pan->name_valid && !pan->lost_name) std::cerr<<pan->name_valid<<" "<<pan->lost_name<<"\n";
-
     std::cerr<<"dbus id "<<pan->dbus_id<<" "<<dbus_connection<<"\n";
   }