mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-28 08:59:37 -05:00
Tweaks to nogui to remove rsiface references.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6586 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
a45a70a1d5
commit
ed8abf6411
@ -184,51 +184,33 @@ void NotifyTxt::displayFriends()
|
||||
|
||||
void NotifyTxt::displayDirectories()
|
||||
{
|
||||
iface->lockData(); /* Lock Interface */
|
||||
|
||||
std::ostringstream out;
|
||||
std::cerr << out.str();
|
||||
|
||||
iface->unlockData(); /* UnLock Interface */
|
||||
}
|
||||
|
||||
|
||||
void NotifyTxt::displaySearch()
|
||||
{
|
||||
iface->lockData(); /* Lock Interface */
|
||||
|
||||
std::ostringstream out;
|
||||
std::cerr << out.str();
|
||||
|
||||
iface->unlockData(); /* UnLock Interface */
|
||||
}
|
||||
|
||||
|
||||
void NotifyTxt::displayMessages()
|
||||
{
|
||||
iface->lockData(); /* Lock Interface */
|
||||
iface->unlockData(); /* UnLock Interface */
|
||||
}
|
||||
|
||||
void NotifyTxt::displayChannels()
|
||||
{
|
||||
iface->lockData(); /* Lock Interface */
|
||||
|
||||
std::ostringstream out;
|
||||
std::cerr << out.str();
|
||||
|
||||
iface->unlockData(); /* UnLock Interface */
|
||||
}
|
||||
|
||||
|
||||
void NotifyTxt::displayTransfers()
|
||||
{
|
||||
iface->lockData(); /* Lock Interface */
|
||||
|
||||
std::ostringstream out;
|
||||
std::cerr << out.str();
|
||||
|
||||
iface->unlockData(); /* UnLock Interface */
|
||||
}
|
||||
|
||||
|
||||
|
@ -37,7 +37,6 @@ class NotifyTxt: public NotifyBase
|
||||
public:
|
||||
NotifyTxt():mNotifyMtx("NotifyMtx") { return; }
|
||||
virtual ~NotifyTxt() { return; }
|
||||
void setRsIface(RsIface *i) { iface = i; }
|
||||
|
||||
virtual void notifyListChange(int list, int type);
|
||||
virtual void notifyErrorMsg(int list, int sev, std::string msg);
|
||||
@ -69,9 +68,6 @@ class NotifyTxt: public NotifyBase
|
||||
void displayChannels();
|
||||
void displayTransfers();
|
||||
|
||||
RsIface *iface; /* so we can get the data */
|
||||
|
||||
|
||||
/* store TurtleSearchResults */
|
||||
RsMutex mNotifyMtx;
|
||||
|
||||
|
@ -234,12 +234,9 @@ int main(int argc, char **argv)
|
||||
* if you want to receive notifications of events */
|
||||
|
||||
NotifyTxt *notify = new NotifyTxt();
|
||||
RsIface *iface = createRsIface(*notify);
|
||||
RsControl *rsServer = createRsControl(*iface, *notify);
|
||||
RsControl *rsServer = createRsControl(*notify);
|
||||
rsicontrol = rsServer ;
|
||||
|
||||
notify->setRsIface(iface);
|
||||
|
||||
std::string preferredId, gpgId, gpgName, gpgEmail, sslName;
|
||||
RsInit::getPreferedAccountId(preferredId);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user