[pan2] https://bugzilla.gnome.org/show_bug.cgi?id=443702

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

commit 14c818f28b388936242b11913e82ee41635eb310
Author: Heinrich MÃller <henmull src gnome org>
Date:   Tue Jun 12 23:11:58 2012 +0200

    https://bugzilla.gnome.org/show_bug.cgi?id=443702

 pan/gui/header-pane.cc |   21 ++++++++++++++++++++-
 pan/gui/header-pane.h  |    2 ++
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/pan/gui/header-pane.cc b/pan/gui/header-pane.cc
index 4868863..05bdeea 100644
--- a/pan/gui/header-pane.cc
+++ b/pan/gui/header-pane.cc
@@ -483,6 +483,20 @@ HeaderPane :: column_compare_func (GtkTreeModel  * model,
   return ret;
 }
 
+void
+HeaderPane :: sort_column_changed_cb (GtkTreeSortable *sortable,
+                                      gpointer         user_data)
+{
+
+  HeaderPane * self(static_cast<HeaderPane*>(user_data));
+
+  const articles_set old_selection (self->get_full_selection ());
+
+  if (!old_selection.empty())
+    self->select_message_id ((*(old_selection.begin()))->message_id);
+
+}
+
 PanTreeStore*
 HeaderPane :: build_model (const Quark               & group,
                            Data::ArticleTree         * atree,
@@ -531,6 +545,7 @@ namespace
 void
 HeaderPane :: rebuild ()
 {
+
   quarks_t selectme;
   if (1) {
     const articles_set old_selection (get_full_selection ());
@@ -554,6 +569,9 @@ HeaderPane :: rebuild ()
   gtk_tree_view_set_model (view, model);
   g_object_unref (G_OBJECT(_tree_store)); // store is deleted w/view
 
+  // add signal here to avoid loop
+  g_signal_connect (GTK_TREE_SORTABLE(_tree_store), "sort-column-changed", G_CALLBACK(sort_column_changed_cb), this);
+
   if (_prefs.get_flag ("expand-threads-when-entering-group", false))
     gtk_tree_view_expand_all (view);
 
@@ -671,6 +689,7 @@ namespace
 void
 HeaderPane :: select_message_id (const Quark& mid, bool do_scroll)
 {
+
   HeaderPane::Row * row = get_row (mid);
   GtkTreePath * path (_tree_store->get_path(row));
   GtkTreeView * view (GTK_TREE_VIEW(_tree_view));
@@ -1793,7 +1812,7 @@ HeaderPane :: create_filter_entry ()
 }
 
 void
-HeaderPane :: on_selection_changed (GtkTreeSelection*, gpointer self_gpointer)
+HeaderPane :: on_selection_changed (GtkTreeSelection* sel, gpointer self_gpointer)
 {
   HeaderPane * self (static_cast<HeaderPane*>(self_gpointer));
 
diff --git a/pan/gui/header-pane.h b/pan/gui/header-pane.h
index 9bfeb8d..8be7260 100644
--- a/pan/gui/header-pane.h
+++ b/pan/gui/header-pane.h
@@ -366,6 +366,8 @@ namespace pan
     private:
       static void on_selection_changed (GtkTreeSelection*, gpointer);
       static gboolean on_selection_changed_idle (gpointer);
+      static void sort_column_changed_cb (GtkTreeSortable *sortable,
+                                           gpointer         user_data);
 
     private:
       void find_next_iterator_from (GtkTreeModel            * model,