[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/kopete/libkopete/ui
From:       Jason Keirstead <jason () keirstead ! org>
Date:       2003-03-15 4:50:43
[Download RAW message or body]

CVS commit by brunes: 

Oops, do the same check for if the member exists before the custom context menu \
action


  M +4 -3      chatview.cpp   1.205


--- kdenonbeta/kopete/libkopete/ui/chatview.cpp  #1.204:1.205
@@ -895,7 +895,8 @@ void ChatView::slotRightClick( const QSt
 
         HTMLElement e = n;
+        KopeteMessage m = messageFromNode( e );
+
         if( !e.isNull() && e.className() == QString::fromLatin1("KopeteDisplayName") \
)  {
-                KopeteMessage m = messageFromNode( e );
                 if( msgManager()->members().contains( m.from() ) )
                 {
@@ -914,5 +915,5 @@ void ChatView::slotRightClick( const QSt
         if( chatWindowPopup )
         {
-                if( !n.isNull() )
+                if( !n.isNull() && msgManager()->members().contains( m.from() ) )
                 {
                         QPtrList<KopetePlugin> ps = \
LibraryLoader::pluginLoader()->plugins(); @@ -923,5 +924,5 @@ void \
                ChatView::slotRightClick( const QSt
                                 if( !p->inherits("KopeteProtocol") || \
((KopeteProtocol*)p) == msgManager()->protocol() )  {
-                                        KActionCollection *customActions = \
p->customChatWindowPopupActions( messageFromNode(n), n ); +                           \
                KActionCollection *customActions = p->customChatWindowPopupActions( \
                m, n );
                                         if( customActions  && \
!customActions->isEmpty() )  {


[prev in list] [next in list] [prev in thread] [next in thread]