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

List:       kde-commits
Subject:    kdegraphics/kolourpaint
From:       Clarence Dang <dang () kde ! org>
Date:       2005-02-02 12:12:47
Message-ID: 20050202121247.475941D020 () office ! kde ! org
[Download RAW message or body]

CVS commit by dang: 

Fix compile - blind merges do not work.  Also, celery is good for you.


  M +6 -3      kpview.cpp   1.51


--- kdegraphics/kolourpaint/kpview.cpp  #1.50:1.51
@@ -1122,5 +1122,6 @@ void kpView::imStartEvent (QIMEvent *e)
 #endif
 
-    m_mainWindow->tool ()->imStartEvent (e);
+    if (tool ())
+        tool ()->imStartEvent (e);
     e->accept();
 }
@@ -1133,5 +1134,6 @@ void kpView::imComposeEvent (QIMEvent *e
 #endif
 
-    m_mainWindow->tool ()->imComposeEvent (e);
+    if (tool ())
+        tool ()->imComposeEvent (e);
     e->accept();
 }
@@ -1144,5 +1146,6 @@ void kpView::imEndEvent (QIMEvent *e)
 #endif
 
-    m_mainWindow->tool ()->imEndEvent (e);
+    if (tool ())
+        tool ()->imEndEvent (e);
     e->accept();
 }


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