[PATCH] Fix for 54209

[Ravikiran Rajagopal]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,
  This trivial patch fixes bug 54209. We should not be using methods not 
available when KDE_NO_COMPAT is defined. Is it ok to commit? To both 
branches?

Regards,
Ravi

PS: Please cc me on any replies as I am not subscribed to kfm-devel.

Index: khtmlimage.cpp
===================================================================
RCS file: /home/kde/kdelibs/khtml/khtmlimage.cpp,v
retrieving revision 1.29
diff -u -p -r1.29 khtmlimage.cpp
- --- khtmlimage.cpp      21 Feb 2003 01:11:06 -0000      1.29
+++ khtmlimage.cpp      24 Mar 2003 23:17:07 -0000
@@ -140,14 +140,23 @@ void KHTMLImage::slotPopupMenu( KXMLGUIC
 {
     KAction *encodingAction = cl->actionCollection()->action( "setEncoding" 
);
     if ( encodingAction )
- -        cl->actionCollection()->take( encodingAction );
+    {
+        encodingAction->unplugAll();
+        delete encodingAction;
+    }
     KAction *viewSourceAction= cl->actionCollection()->action( 
"viewDocumentSource" );
     if ( viewSourceAction )
- -        cl->actionCollection()->take( viewSourceAction );
+    {
+        viewSourceAction->unplugAll();
+        delete viewSourceAction;
+    }

     KAction *selectAllAction= cl->actionCollection()->action( "selectAll" );
     if ( selectAllAction )
- -        cl->actionCollection()->take( selectAllAction );
+    {
+        selectAllAction->unplugAll();
+        delete selectAllAction;
+    }

     emit m_ext->popupMenu( cl, pos, u, m_mimeType, mode );
 }
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)

iD8DBQE+f5LAbI8Y8y0oVXcRAn9dAJ9q3VPGVJy3cycmDXbLKDONOwuirgCbBto0
XtHxyXRgbMIMLhpVw1nfwtg=
=Ef3t
-----END PGP SIGNATURE-----