mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-11 02:25:34 -04:00
Updated the notification system. Main changes are:
- the notification system is now a service, p3Notify, that is a public RsNotify. - RsNotify does nothing except providing a registration system for new notify clients. - Clients should derive a notify client from the NotifyClient class and register it to rsNotify - all registered clients get all notifications, so only derive the needed methods. This should allow plugins to get notifications as well. - updated the code to call RsServer::notify()->[notification method] from inside libretroshare - pqiNotify has been removed. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
3cc8c144a8
commit
630824aa1b
47 changed files with 482 additions and 484 deletions
|
@ -155,8 +155,12 @@ int main(int argc, char *argv[])
|
|||
|
||||
Q_INIT_RESOURCE(images);
|
||||
|
||||
// This is needed to allocate rsNotify, so that it can be used to ask for PGP passphrase
|
||||
//
|
||||
RsControl::earlyInitNotificationSystem() ;
|
||||
|
||||
NotifyQt *notify = NotifyQt::Create();
|
||||
createRsControl(*notify);
|
||||
rsNotify->registerNotifyClient(notify);
|
||||
|
||||
/* RetroShare Core Objects */
|
||||
RsInit::InitRsConfig();
|
||||
|
@ -303,7 +307,7 @@ int main(int argc, char *argv[])
|
|||
splashScreen.showMessage(rshare.translate("SplashScreen", "Load configuration"), Qt::AlignHCenter | Qt::AlignBottom);
|
||||
|
||||
/* stop Retroshare if startup fails */
|
||||
if (!rsicontrol->StartupRetroShare())
|
||||
if (!RsControl::instance()->StartupRetroShare())
|
||||
{
|
||||
std::cerr << "libretroshare failed to startup!" << std::endl;
|
||||
return 1;
|
||||
|
@ -419,7 +423,7 @@ int main(int argc, char *argv[])
|
|||
RsGxsUpdateBroadcast::cleanup();
|
||||
#endif
|
||||
|
||||
rsicontrol->rsGlobalShutDown();
|
||||
RsControl::instance()->rsGlobalShutDown();
|
||||
|
||||
delete(soundManager);
|
||||
soundManager = NULL;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue