[pan2: 8/8] merged rss branch

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

commit 0b3bdeb7e7416b53cf326024353a14811d63b571
Merge: 12b3fed c7ee1e5
Author: Heinrich Müller <henmull src gnome org>
Date:   Fri Jun 7 14:02:30 2013 +0200

    merged rss branch

 pan/gui/actions.cc     |    4 +-
 pan/gui/gui.cc         |   40 +++++++++++---
 pan/gui/gui.h          |    4 +-
 pan/gui/pan-ui.h       |    3 +-
 pan/gui/search-pane.cc |  138 ++++++++++++++++++++++++------------------------
 pan/gui/search-pane.h  |    7 +--
 6 files changed, 112 insertions(+), 84 deletions(-)
---
diff --cc pan/gui/gui.h
index b60b54d,2961339..02b8524
--- a/pan/gui/gui.h
+++ b/pan/gui/gui.h
@@@ -42,8 -42,8 +42,9 @@@ namespace pa
  {
    class GroupPane;
    class HeaderPane;
 +  class SearchPane;
    class BodyPane;
+   class SearchPane;
    class ProgressView;
  
    /**