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

List:       kde-commits
Subject:    kdenox/konq-embed
From:       Eva Brucherseifer <eva () kde ! org>
Date:       2006-05-02 22:27:49
Message-ID: 1146608869.137263.6568.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 536751 by eva:

ups, didn't save before committing...



 M  +5 -0      dropin/kdialog.h  
 M  +4 -0      dropin/kio/scheduler.cpp  
 M  +3 -0      prepare_kde_src  
 M  +4 -1      src/main.cc  


--- trunk/kdenox/konq-embed/dropin/kdialog.h #536750:536751
@@ -35,8 +35,13 @@
     KDialog( QWidget *parent, const char *name, bool modal = false, WFlags f = 0 );
     virtual ~KDialog();
 
+#ifdef _QT_QPE_
+    static int marginHint() { return 6; }
+    static int spacingHint() { return 3; }
+#else
     static int marginHint() { return 12; }
     static int spacingHint() { return 6; }
+#endif
 };
 
 #endif
--- trunk/kdenox/konq-embed/dropin/kio/scheduler.cpp #536750:536751
@@ -66,6 +66,10 @@
 
 Scheduler::~Scheduler()
 {
+    QDictIterator<ProtocolInfo> it( m_schedule );
+    for (; it.current(); ++it ) 
+        for (QPtrListIterator <JobInfo>job_it(it.current()->m_jobs); \
job_it.current(); ++job_it)  +		job_it.current()->m_job->kill();
 }
 
 bool Scheduler::doJob( SimpleJob *job )
--- trunk/kdenox/konq-embed/prepare_kde_src #536750:536751
@@ -518,6 +518,9 @@
 	    patch -s -d ./kdesrc/kssl/ -p0  -i  ./patches/kssl_qt2.3.patch 
             echo "*** patching kutils ..."
 	    patch -s -d ./kdesrc/kutils/ -p0  -i  ./patches/kutils_qt2.3.patch 
+		echo "*** applying cookiewin patch..."
+		patch -s -d ./kdesrc/kio -p0 -i  patches/cookiewin_qtopia.patch
+
 	    ;;
     *) echo "Remove special dropins for qt/e 2.x.x (if available)"
 		perl -pi -e "s,KDE_USE_QT(2.3),KDE_USE_QT(3.1)," ../configure.in.in
--- trunk/kdenox/konq-embed/src/main.cc #536750:536751
@@ -37,8 +37,11 @@
 #include <qmessagebox.h>
 #include <qdir.h>
 #include <qrect.h>
+
 #include <kio/launcher.h>
 #include <kio/uiserver.h>
+#include <kio/scheduler.h>
+
 #include <kssld.h>
 #include <kconfig.h>
 #include <mimehandler.h>
@@ -326,7 +329,7 @@
     UIServer uiserver;
     uiserver.setObjId( "UIServer" );
 #endif
-   
+ 
 #if defined(ENABLE_JAVASCRIPT) && !defined(DLOPEN_JAVASCRIPT)
     KLibLoader::self()->library( "kjs_html", KLibLoader::CreateStaticWrapper \
)->registerSymbol( "kjs_html_init", (void *)&kjs_html_init );  #endif


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