Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweaks to nogui to remove rsiface references.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6586 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-08-21 21:51:36 +00:00
parent a45a70a1d5
commit ed8abf6411
3 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
retroshare-nogui/src/notifytxt.cc
View File

@ -184,51 +184,33 @@ void NotifyTxt::displayFriends()
void NotifyTxt::displayDirectories() void NotifyTxt::displayDirectories()
{ {
iface->lockData(); /* Lock Interface */
std::ostringstream out; std::ostringstream out;
std::cerr << out.str(); std::cerr << out.str();
iface->unlockData(); /* UnLock Interface */
} }
void NotifyTxt::displaySearch() void NotifyTxt::displaySearch()
{ {
iface->lockData(); /* Lock Interface */
std::ostringstream out; std::ostringstream out;
std::cerr << out.str(); std::cerr << out.str();
iface->unlockData(); /* UnLock Interface */
} }
void NotifyTxt::displayMessages() void NotifyTxt::displayMessages()
{ {
iface->lockData(); /* Lock Interface */
iface->unlockData(); /* UnLock Interface */
} }
void NotifyTxt::displayChannels() void NotifyTxt::displayChannels()
{ {
iface->lockData(); /* Lock Interface */
std::ostringstream out; std::ostringstream out;
std::cerr << out.str(); std::cerr << out.str();
iface->unlockData(); /* UnLock Interface */
} }
void NotifyTxt::displayTransfers() void NotifyTxt::displayTransfers()
{ {
iface->lockData(); /* Lock Interface */
std::ostringstream out; std::ostringstream out;
std::cerr << out.str(); std::cerr << out.str();
iface->unlockData(); /* UnLock Interface */
} }

4
retroshare-nogui/src/notifytxt.h
View File

@ -37,7 +37,6 @@ class NotifyTxt: public NotifyBase
public: public:
NotifyTxt():mNotifyMtx("NotifyMtx") { return; } NotifyTxt():mNotifyMtx("NotifyMtx") { return; }
virtual ~NotifyTxt() { return; } virtual ~NotifyTxt() { return; }
void setRsIface(RsIface *i) { iface = i; }
virtual void notifyListChange(int list, int type); virtual void notifyListChange(int list, int type);
virtual void notifyErrorMsg(int list, int sev, std::string msg); virtual void notifyErrorMsg(int list, int sev, std::string msg);
@ -69,9 +68,6 @@ class NotifyTxt: public NotifyBase
void displayChannels(); void displayChannels();
void displayTransfers(); void displayTransfers();
RsIface *iface; /* so we can get the data */
/* store TurtleSearchResults */ /* store TurtleSearchResults */
RsMutex mNotifyMtx; RsMutex mNotifyMtx;

5
retroshare-nogui/src/retroshare.cc
View File

@ -234,12 +234,9 @@ int main(int argc, char **argv)
* if you want to receive notifications of events */ * if you want to receive notifications of events */
NotifyTxt *notify = new NotifyTxt(); NotifyTxt *notify = new NotifyTxt();
RsIface *iface = createRsIface(*notify); RsControl *rsServer = createRsControl(*notify);
RsControl *rsServer = createRsControl(*iface, *notify);
rsicontrol = rsServer ; rsicontrol = rsServer ;
notify->setRsIface(iface);
std::string preferredId, gpgId, gpgName, gpgEmail, sslName; std::string preferredId, gpgId, gpgName, gpgEmail, sslName;
RsInit::getPreferedAccountId(preferredId); RsInit::getPreferedAccountId(preferredId);