diff --git a/retroshare-nogui/src/notifytxt.cc b/retroshare-nogui/src/notifytxt.cc index a29a7a17c..2fa56596a 100644 --- a/retroshare-nogui/src/notifytxt.cc +++ b/retroshare-nogui/src/notifytxt.cc @@ -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 */ } diff --git a/retroshare-nogui/src/notifytxt.h b/retroshare-nogui/src/notifytxt.h index 14c01d3a1..caeb73123 100644 --- a/retroshare-nogui/src/notifytxt.h +++ b/retroshare-nogui/src/notifytxt.h @@ -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; diff --git a/retroshare-nogui/src/retroshare.cc b/retroshare-nogui/src/retroshare.cc index 21cf1cc80..44d8712a7 100644 --- a/retroshare-nogui/src/retroshare.cc +++ b/retroshare-nogui/src/retroshare.cc @@ -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);