From ba47eedfe3e9858629029bc9162683a2736b93be Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Fri, 23 Jul 2010 11:55:21 +0000
Subject: [PATCH] fixed GPG password freeze

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3311 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/ChannelFeed.cpp |  8 +++-----
 retroshare-gui/src/gui/ChannelFeed.h   | 27 ++++++++++++++------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/retroshare-gui/src/gui/ChannelFeed.cpp b/retroshare-gui/src/gui/ChannelFeed.cpp
index dc60f91af..f08fbf671 100644
--- a/retroshare-gui/src/gui/ChannelFeed.cpp
+++ b/retroshare-gui/src/gui/ChannelFeed.cpp
@@ -45,7 +45,7 @@
 
 /** Constructor */
 ChannelFeed::ChannelFeed(QWidget *parent)
-: MainPage (parent)
+: RsAutoUpdatePage(1000,parent)
 {
   	/* Invoke the Qt Designer generated object setup routine */
   	setupUi(this);
@@ -123,9 +123,7 @@ ChannelFeed::ChannelFeed(QWidget *parent)
     channelpushButton->setMenu(channelmenu);
 
 	
-	QTimer *timer = new QTimer(this);
-	timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate()));
-	timer->start(1000);
+
 }
 
 void ChannelFeed::channelListCustomPopupMenu( QPoint point )
@@ -285,7 +283,7 @@ void ChannelFeed::selectChannel(const QModelIndex &index)
 	updateChannelMsgs();
 }
 
-void ChannelFeed::checkUpdate()
+void ChannelFeed::updateDisplay()
 {
 	std::list<std::string> chanIds;
 	std::list<std::string>::iterator it;
diff --git a/retroshare-gui/src/gui/ChannelFeed.h b/retroshare-gui/src/gui/ChannelFeed.h
index 9144c1ccf..42103ee26 100644
--- a/retroshare-gui/src/gui/ChannelFeed.h
+++ b/retroshare-gui/src/gui/ChannelFeed.h
@@ -23,6 +23,8 @@
 #define _CHANNEL_FEED_DIALOG_H
 
 #include "mainpage.h"
+#include "RsAutoUpdatePage.h"
+
 #include "ui_ChannelFeed.h"
 
 #include <QStandardItemModel>
@@ -36,7 +38,7 @@
 
 class ChanMsgItem;
 
-class ChannelFeed : public MainPage, public FeedHolder, private Ui::ChannelFeed
+class ChannelFeed : public RsAutoUpdatePage, public FeedHolder, private Ui::ChannelFeed
 {
   Q_OBJECT
 
@@ -46,8 +48,11 @@ public:
   /** Default Destructor */
 
 
-virtual void deleteFeedItem(QWidget *item, uint32_t type);
-virtual void openChat(std::string peerId);
+    virtual void deleteFeedItem(QWidget *item, uint32_t type);
+    virtual void openChat(std::string peerId);
+
+    /* overloaded from RsAuthUpdatePage */ 
+    virtual void updateDisplay();
 
 public slots:
 
@@ -57,9 +62,7 @@ public slots:
 
 private slots:
 
-  void channelListCustomPopupMenu( QPoint point );
-
-	void checkUpdate();
+    void channelListCustomPopupMenu( QPoint point );
 
 	void createChannel();
 
@@ -70,10 +73,10 @@ private slots:
 	
 	void createMsg();
 
-  void showChannelDetails();
-  void restoreChannelKeys();
-  void editChannelDetail();
-  void shareKey();
+    void showChannelDetails();
+    void restoreChannelKeys();
+    void editChannelDetail();
+    void shareKey();
 
 private:
 
@@ -102,8 +105,8 @@ private:
 	QAction* unsubscribechannelAct;
 	QAction* channeldetailsAct;
 	QAction* restoreKeysAct;
-        QAction* editChannelDetailAct;
-        QAction* shareKeyAct;
+    QAction* editChannelDetailAct;
+    QAction* shareKeyAct;
 
 };