[pan2/testing: 163/279] bla

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

commit c1b43e30e18c07d620afadb62b0138a3975f8884
Author: Heinrich MÃller <sphemuel stud informatik uni-erlangen de>
Date:   Sat Jul 9 10:18:07 2011 +0200

    bla

 pan/gui/pan.cc                    |    2 +-
 pan/icons/icon_pan.png            |  Bin 4909 -> 3837 bytes
 pan/icons/icon_pan_about_logo.png |  Bin 2203 -> 9389 bytes
 pan/tasks/encoder.cc              |   10 ++++++----
 4 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc
index 03f6612..5d8a8e4 100644
--- a/pan/gui/pan.cc
+++ b/pan/gui/pan.cc
@@ -328,7 +328,7 @@ main (int argc, char *argv[])
 
     //////////////////////////
     /// DBG!!!!
-    GIOChannelSocketSSL::Creator socket_creator;
+    GIOChannelSocket::Creator socket_creator;
     //////////////////////////
 
     Queue queue (data, data, &socket_creator, worker_pool,
diff --git a/pan/icons/icon_pan.png b/pan/icons/icon_pan.png
index b7cc52a..7991cdf 100644
Binary files a/pan/icons/icon_pan.png and b/pan/icons/icon_pan.png differ
diff --git a/pan/icons/icon_pan_about_logo.png b/pan/icons/icon_pan_about_logo.png
index d11da5d..8e6b816 100644
Binary files a/pan/icons/icon_pan_about_logo.png and b/pan/icons/icon_pan_about_logo.png differ
diff --git a/pan/tasks/encoder.cc b/pan/tasks/encoder.cc
index 7ed9772..21d8266 100644
--- a/pan/tasks/encoder.cc
+++ b/pan/tasks/encoder.cc
@@ -125,18 +125,20 @@ Encoder :: do_work()
 
       int enc(YENC_ENCODED);
       std::ofstream out;
-      std::string txt;
+      std::stringstream txt;
       switch (encode_mode)
       {
           case TaskUpload::YENC:
               enc = YENC_ENCODED;
               break;
           case TaskUpload::PLAIN:
-              file :: get_text_file_contents (filename, txt);
-              cache->get_filename(cachename, Quark(buf));//it->second.message_id));
+              std::ifstream in(filename.c_str(), std::ios::in);
+              char buf[4096];
+              cache->get_filename(cachename, it->second.message_id);
               out.open(cachename, std::ios::out);
-              out << txt;
+              while (in.getline(buf,sizeof(buf))) out << buf;
               out.close();
+              in.close();
               res = UURET_OK;
               goto _no_encode;
               break;