Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-11 00:39:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed GPG password freeze

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3311 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-07-23 11:55:21 +00:00
parent 8bfc74485a
commit ba47eedfe3
2 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/ChannelFeed.cpp
View file

@ -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;

9
retroshare-gui/src/gui/ChannelFeed.h
View file

@ -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
@ -49,6 +51,9 @@ public:
virtual void deleteFeedItem(QWidget *item, uint32_t type);
virtual void openChat(std::string peerId);
/* overloaded from RsAuthUpdatePage */
virtual void updateDisplay();
public slots:
void selectChannel( std::string );
@ -59,8 +64,6 @@ private slots:
void channelListCustomPopupMenu( QPoint point );
void checkUpdate();
void createChannel();
void channelSelection();