[pan2: 69/268] [Pan-users] having problems with your GIT release branch at 772e690 (Re: New Feature - Uploading bin

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

commit 5acc022d72206dfc2647373440c2e9621a620ec6
Author: Heinrich MÃller <sphemuel stud informatik uni-erlangen de>
Date:   Tue Jun 14 21:43:54 2011 +0200

    [Pan-users] having problems with your GIT release branch at 772e690 (Re: New Feature - Uploading binaries)

 pan/gui/gui.cc               |    3 +--
 pan/icons/Makefile.am        |    1 -
 pan/icons/icon_pan_new.png   |  Bin 25196 -> 0 bytes
 pan/tasks/task-xover.cc      |    1 -
 pan/usenet-utils/Makefile.am |    6 ++----
 5 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index e265885..01de4da 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -1308,8 +1308,7 @@ void GUI :: do_about_pan ()
   const gchar * authors [] = { "Charles Kerr <charles rebelbase com> - Pan Author", "Calin Culianu <calin ajvar org> - Threaded Decoding", "K. Haley <haleykd users sf net> - Contributor",
   "Petr Kovar <pknbe volny cz> - Contributor", "Heinrich Mueller <eddie_v gmx de> - Contributor", "Christophe Lambin <chris rebelbase com> - Original Pan Development",
   "Matt Eagleson <matt rebelbase com> - Original Pan Development", 0 };
-    GdkPixbuf * logo = gdk_pixbuf_new_from_inline(-1, icon_pan_about_logo, 0, 0);
-//  GdkPixbuf * logo = gdk_pixbuf_new_from_inline(-1, icon_pan_about_logo_new, 0, 0);
+  GdkPixbuf * logo = gdk_pixbuf_new_from_inline(-1, icon_pan_about_logo, 0, 0);
   GtkAboutDialog * w (GTK_ABOUT_DIALOG (gtk_about_dialog_new ()));
   gtk_about_dialog_set_program_name (w, _("Pan"));
   gtk_about_dialog_set_version (w, PACKAGE_VERSION);
diff --git a/pan/icons/Makefile.am b/pan/icons/Makefile.am
index 06e8236..5974064 100644
--- a/pan/icons/Makefile.am
+++ b/pan/icons/Makefile.am
@@ -31,7 +31,6 @@ stock_images = \
 	icon_layout_5.png \
 	icon_pan_logo.png \
 	icon_pan_about_logo.png \
-	icon_pan_about_logo_new.png \
 	icon_pan.png \
 	icon_read_group.png \
 	icon_read_more.png \
diff --git a/pan/tasks/task-xover.cc b/pan/tasks/task-xover.cc
index 6f6a04a..bfcbfb4 100644
--- a/pan/tasks/task-xover.cc
+++ b/pan/tasks/task-xover.cc
@@ -30,7 +30,6 @@ extern "C" {
 }
 #include <fstream>
 #include <iostream>
-#include <pan/usenet-utils/gzstream.h>
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
 #include <pan/general/messages.h>
diff --git a/pan/usenet-utils/Makefile.am b/pan/usenet-utils/Makefile.am
index c9e7acd..be2611a 100644
--- a/pan/usenet-utils/Makefile.am
+++ b/pan/usenet-utils/Makefile.am
@@ -11,8 +11,7 @@ libusenetutils_a_SOURCES = \
  scorefile.cc \
  text-massager.cc \
  url-find.cc \
- MersenneTwister.h \
- gzstream.cc
+ MersenneTwister.h 
 
 noinst_HEADERS = \
  defgroup.h \
@@ -23,8 +22,7 @@ noinst_HEADERS = \
  numbers.h \
  scorefile.h \
  text-massager.h \
- url-find.h \
- gzstream.h
+ url-find.h 
 
 noinst_PROGRAMS = \
  gnksa-test \