casa-mp-base

diff --git a/src/psiaccount.cpp b/src/psiaccount.cpp

index 98aa922..945d411 100644

--- a/src/psiaccount.cpp

+++ b/src/psiaccount.cpp

@@ -1286,6 +1286,10 @@ void PsiAccount::login()

 // disconnect or stop reconnecting

 void PsiAccount::logout(bool fast, const Status &s)

 {

+#ifdef PSI_PLUGINS  

+    PluginManager::instance()->logout(this);

+#endif

+

    if(!isActive())

        return;

@@ -1887,6 +1891,10 @@ void PsiAccount::client_resourceAvailable(const Jid &j, const Resource &r)

        UserResourceList::Iterator rit = u->userResourceList().find(j.resource());

        bool found = (rit == u->userResourceList().end()) ? false: true;

        if(!found) {

+#ifdef PSI_PLUGINS

+           PluginManager::instance()->contactOnline(this, j.node() + "@" + j.domain());

+#endif

+

            popupType = PopupOnline;

            UserResource ur(r);

@@ -2043,6 +2051,10 @@ void PsiAccount::client_resourceUnavailable(const Jid &j, const Resource &r)

        PsiGrowlNotifier::instance()->popup(this, PsiPopup::AlertOffline, j, r, u);

 #endif

    }

+#ifdef PSI_PLUGINS

+   PluginManager::instance()->contactOffline(this, j.node() + "@" + j.domain());

+#endif

+

 }

 void PsiAccount::client_presenceError(const Jid &j, int, const QString &str)

@@ -3001,7 +3013,6 @@ ChatDlg *PsiAccount::ensureChatDlg(const Jid &j)

            if(!pp.isNull())

                p = pp;

 #ifdef __GNUC__

-#warning "Removed reparenting call from qwextend"

 #endif

            //reparent_good(window, 0, false);

            if(!p.isNull())

@@ -3638,6 +3649,25 @@ void PsiAccount::dj_sendMessage(const Message &m, bool log)

        }

    }

+#ifdef PSI_PLUGINS

+   if (nm.type() != "groupchat" && !nm.body().isEmpty())

+   {

+       QString body = nm.body();

+       QString subject = nm.subject();

+

+       PluginManager::instance()->processOutgoingMessage(this, nm.to().full(),

+                                                         body, subject);

+       if (body != nm.body())

+       {

+           nm.setBody(body);

+       }

+       if (subject != nm.subject())

+       {