[pan2] removed typedefs again, hardcoded unsigned long

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

commit 6ce780b683b6249572b689a7abd4e3a2e6f2dc21
Author: Heinrich MÃller <henmull src gnome org>
Date:   Tue Apr 10 22:52:12 2012 +0200

    removed typedefs again, hardcoded unsigned long

 configure.in                  |    4 ++--
 pan/gui/gui.cc                |    4 ++--
 pan/gui/gui.h                 |    2 +-
 pan/usenet-utils/mime-utils.h |    8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/configure.in b/configure.in
index 41a3b9c..0fb0142 100644
--- a/configure.in
+++ b/configure.in
@@ -240,8 +240,8 @@ case $host_os in
 esac
 AM_CONDITIONAL([HAVE_WIN32],[test "$win32" = "yes"])
 
-CXXFLAGS="$CXXFLAGS -Wall"
-CPPFLAGS="$CPPFLAGS -Wall"
+dnl CXXFLAGS="$CXXFLAGS -Wall"
+dnl CPPFLAGS="$CPPFLAGS -Wall"
 
 dnl Build the output files
 AC_SUBST(panlocaledir)
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index 9f335c3..18b72d0 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -2171,8 +2171,8 @@ GUI :: set_queue_size_label (unsigned int running,
     g_snprintf (str, sizeof(str), "%s: %u/%u", _("Tasks"), running, size);
 
   // build the tooltip
-  gulong queued, unused, stopped;
-  guint64 KiB_remain;
+  unsigned long queued, unused, stopped;
+  unsigned long KiB_remain;
   double KiBps;
   int hr, min, sec;
   _queue.get_stats (queued, unused, stopped,
diff --git a/pan/gui/gui.h b/pan/gui/gui.h
index a0b4ea0..984b8fd 100644
--- a/pan/gui/gui.h
+++ b/pan/gui/gui.h
@@ -32,7 +32,7 @@
 #include <pan/gui/prefs.h>
 #include <pan/gui/group-prefs.h>
 #include <pan/gui/wait.h>
-#include <pan/general/typedefs.h>
+//#include <pan/general/typedefs.h>
 
 #include "gtk-compat.h"
 
diff --git a/pan/usenet-utils/mime-utils.h b/pan/usenet-utils/mime-utils.h
index 66802e2..a00c9af 100644
--- a/pan/usenet-utils/mime-utils.h
+++ b/pan/usenet-utils/mime-utils.h
@@ -120,10 +120,10 @@ namespace pan
 
   char * __g_mime_iconv_strndup (iconv_t cd, const char *str, size_t n, const char* charset=0);
 
-//  static char * __g_mime_iconv_strdup (iconv_t cd, const char *str, const char* charset=0)
-//  {
-//    return __g_mime_iconv_strndup(cd, str, strlen(str), charset);
-//  }
+  static char * __g_mime_iconv_strdup (iconv_t cd, const char *str, const char* charset=0)
+  {
+    return __g_mime_iconv_strndup(cd, str, strlen(str), charset);
+  }
 
 }