[pan2/testing: 202/279] ssl removed for good

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

commit 28fd2a1ed1309892079d743e484b4d717021f06e
Author: Heinrich MÃller <sphemuel stud informatik uni-erlangen de>
Date:   Wed Sep 14 12:12:59 2011 +0200

    ssl removed for good

 pan/gui/Makefile.am |    2 +-
 pan/gui/gui.cc      |   19 +++++++++++++++----
 pan/gui/gui.h       |    1 +
 3 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/pan/gui/Makefile.am b/pan/gui/Makefile.am
index 522948f..b50a5ff 100644
--- a/pan/gui/Makefile.am
+++ b/pan/gui/Makefile.am
@@ -93,7 +93,7 @@ WINRCOBJ =
 endif
 
 pan_SOURCES = gui.cc pan.cc $(WINRC)
-pan_LDADD = -lssl ./libpangui.a $(WINRCOBJ) ../data-impl/libpandata.a ../tasks/libtasks.a ../data/libdata.a ../usenet-utils/libusenetutils.a ../general/libgeneralutils.a ../../uulib/libuu.a @GTKSPELL_LIBS@ @GTK_LIBS@ @GMIME_LIBS@ @GLIB_LIBS@
+pan_LDADD = ./libpangui.a $(WINRCOBJ) ../data-impl/libpandata.a ../tasks/libtasks.a ../data/libdata.a ../usenet-utils/libusenetutils.a ../general/libgeneralutils.a ../../uulib/libuu.a @GTKSPELL_LIBS@ @GTK_LIBS@ @GMIME_LIBS@ @GLIB_LIBS@
 
 if HAVE_WIN32
 pan_LDFLAGS = -mwindows
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index 86efe25..b44b18c 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -212,6 +212,7 @@ GUI :: GUI (Data& data, Queue& queue, ArticleCache& cache, EncodeCache& encode_c
 
   _group_pane = new GroupPane (*this, data, _prefs);
   _header_pane = new HeaderPane (*this, data, _queue, _cache, _prefs, _group_prefs, *this);
+  _header_panes.push_back(_header_pane);
   _body_pane = new BodyPane (data, _cache, _prefs);
 
   std::string path = "/ui/main-window-toolbar";
@@ -236,7 +237,6 @@ GUI :: GUI (Data& data, Queue& queue, ArticleCache& cache, EncodeCache& encode_c
   //GtkWidget * item = gtk_ui_manager_get_widget (_ui_manager, path);
   //gtk_container_add (GTK_CONTAINER(item), _group_pane->create_filter_entry());
 
-
   // workarea
   _workarea_bin = gtk_event_box_new ();
   do_tabbed_layout (is_action_active ("tabbed-layout"));
@@ -652,7 +652,8 @@ void GUI :: do_save_articles ()
     copies.push_back (**it);
 
   if (!copies.empty()) {
-    SaveDialog * dialog = new SaveDialog (_prefs, _group_prefs, _data, _data, _cache, _data, _queue, get_window(_root), _header_pane->get_group(), copies);
+    SaveDialog * dialog = new SaveDialog (_prefs, _group_prefs, _data, _data, _cache,
+                                          _data, _queue, get_window(_root), _header_pane->get_group(), copies);
     gtk_widget_show (dialog->root());
   }
 }
@@ -1754,8 +1755,18 @@ void GUI :: do_read_selected_group ()
 
   // update the header pane
   watch_cursor_on ();
-  const bool changed (_header_pane->set_group (group));
-  _header_pane->set_focus ();
+  const Quark old_group(_header_pane->get_group());
+  const bool changed  (old_group != group);
+  if (changed)
+  {
+    HeaderPane * tmp = new HeaderPane (*this, _data, _queue, _cache, _prefs, _group_prefs, *this);
+
+//    g_object_ref (tmp->root());
+    _header_pane = tmp;
+    _header_pane->set_group (group);
+    _header_pane->set_focus ();
+    _header_panes.push_back(tmp);
+  }
   watch_cursor_off ();
 
   // periodically save our state
diff --git a/pan/gui/gui.h b/pan/gui/gui.h
index 5c74462..e3efe87 100644
--- a/pan/gui/gui.h
+++ b/pan/gui/gui.h
@@ -203,6 +203,7 @@ namespace pan
       GtkWidget * _toolbar;
       GroupPane * _group_pane;
       HeaderPane * _header_pane;
+      std::vector<HeaderPane*> _header_panes;
       BodyPane * _body_pane;
       GtkUIManager * _ui_manager;