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

List:       kde-commits
Subject:    kdenetwork/kopete/kopete
From:       Olivier Goffart <ogoffart () tiscalinet ! be>
Date:       2003-09-23 17:10:08
[Download RAW message or body]

CVS commit by ogoffart: 

Use the chatwindows winId for incomming messages notification.
this should fix the bug 64807

CCMAIL: 64807-done@bugs.kde.org

(i did not yet tested it because my KDE CVS installation is not working)


  M +1 -1      eventsrc   1.93
  M +0 -4      chatwindow/chatview.cpp   1.77
  M +0 -3      chatwindow/kopeteemailwindow.cpp   1.21
  M +5 -2      chatwindow/kopeteviewmanager.cpp   1.25


--- kdenetwork/kopete/kopete/eventsrc  #1.92:1.93
@@ -239,5 +239,5 @@
 Comment[sv]=Ett meddelande markerades eftersom det innehöll ditt smeknamn
 default_sound=Kopete_Received.ogg
-default_presentation=1
+default_presentation=65
 
 

--- kdenetwork/kopete/kopete/chatwindow/chatview.cpp  #1.76:1.77
@@ -733,8 +733,4 @@ void ChatView::appendMessage(KopeteMessa
                         case KopeteMessage::Highlight:
                                 setTabState( Highlighted );
-#if KDE_IS_VERSION( 3, 1, 90 )
-                                if( m_mainWindow )
-                                        KWin::setState( m_mainWindow->winId(), \
                NET::DemandsAttention );
-#endif
                                 break;
                         case KopeteMessage::Normal:

--- kdenetwork/kopete/kopete/chatwindow/kopeteemailwindow.cpp  #1.20:1.21
@@ -413,7 +413,4 @@ void KopeteEmailWindow::appendMessage(Ko
                 d->unreadMessageFrom = message.from()->displayName();
                 QTimer::singleShot( 1000, this, SLOT(slotMarkMessageRead()) );
-#if KDE_IS_VERSION( 3, 1, 90 )
-                KWin::setState( winId(), NET::DemandsAttention );
-#endif
         }
 }

--- kdenetwork/kopete/kopete/chatwindow/kopeteviewmanager.cpp  #1.24:1.25
@@ -181,6 +181,9 @@ void KopeteViewManager::messageAppended(
                                 msgText = msgText.left(88) + \
QString::fromLatin1("...");  
-                        int winId = 0;  //TODO: use the chatwindoiws's winid
-                                //KopeteSystemTray::systemTray() ? \
KopeteSystemTray::systemTray()->winId() : 0; +                        int winId = 0;  \
//KopeteSystemTray::systemTray() ? KopeteSystemTray::systemTray()->winId() : 0; +     \
QWidget *w=dynamic_cast<QWidget*>(manager->view(false)); +                        \
while(w && !w->isTopLevel()) +                                \
w=w->parentWidget(true); +                        if(w) winId=w->winId();
 
                         switch( msg.importance() )


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