[Gzz-commits] storm/kde/kmd kmd.cpp kmd.h

[Benja Fallenstein]

CVSROOT:        /cvsroot/storm
Module name:    storm
Changes by:     Benja Fallenstein <address@hidden>      03/05/21 16:18:13

Modified files:
        kde/kmd        : kmd.cpp kmd.h 

Log message:
        retrieval from fishy works

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/kmd/kmd.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/kde/kmd/kmd.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: storm/kde/kmd/kmd.cpp
diff -u storm/kde/kmd/kmd.cpp:1.8 storm/kde/kmd/kmd.cpp:1.9
--- storm/kde/kmd/kmd.cpp:1.8   Wed May 21 15:56:49 2003
+++ storm/kde/kmd/kmd.cpp       Wed May 21 16:18:13 2003
@@ -65,20 +65,52 @@
 /* 
----------------------------------------------------------------------------------
 */
 void kio_kmdProtocol::get(const KURL& url )
 {
+  request(url, 0);
+}
+
+
+void kio_kmdProtocol::mimetype(const KURL & url)
+{
+  request(url, 1);
+}
+
+/* --------------------------------------------------------------------------- 
*/
+void kio_kmdProtocol::slotResponseHeaderReceived(const QHttpResponseHeader & 
resp)
+{
+  if(resp.hasContentType())
+    mimeType(resp.contentType());
+  if(isMimeTypeRequest)
+    isFinished = 1;
+}
+
+void kio_kmdProtocol::slotReadyRead()
+{
+  //kdDebug() << "kio_urn -> data received" << endl;
+  if(http->bytesAvailable() > 0)
+    data(http->readAll());
+}
+
+void kio_kmdProtocol::slotRequestFinished(int req)
+{
+  if(req == requestNr)
+    isFinished = true;
+  //kdDebug() << "kio_urn -> reqfinished " << req << endl;
+}
+
+
+/* --------------------------------------------------------------------------- 
*/
+void kio_kmdProtocol::request(const KURL& url, int isMimeTypeRequest0) {
   isFinished = 0;
+  isMimeTypeRequest = isMimeTypeRequest0;
 
   //kdDebug() << "kio_urn::get(const KURL& url)" << endl ;
 
   //kdDebug() << "myURL: " << url.prettyURL() << endl;
 
-  if(url.prettyURL() == "kmd:wait") { mimeType("text/html"); finished(); 
return; }
-
-  mimeType("text/html");
-
   //kdDebug() << "0" << endl;
   http = new QHttp();
-  connect(http,  SIGNAL(stateChanged(int)),
-         this, SLOT(slotStateChanged(int)));
+  connect(http,  SIGNAL(responseHeaderReceived(const QHttpResponseHeader &)),
+         this, SLOT(slotResponseHeaderReceived(const QHttpResponseHeader &)));
   //kdDebug() << "1" << endl;
   connect(http,  SIGNAL(readyRead(const QHttpResponseHeader &)),
          this, SLOT(slotReadyRead()));
@@ -94,31 +126,4 @@
   }
   //kdDebug() << "done" << endl;
   finished();
-}
-
-
-void kio_kmdProtocol::mimetype(const KURL & /*url*/)
-{
-  mimeType("text/html");
-  finished();
-}
-
-/* --------------------------------------------------------------------------- 
*/
-void kio_kmdProtocol::slotStateChanged(int state)
-{
-  //kdDebug() << "kio_urn -> state " << state << endl;
-}
-
-void kio_kmdProtocol::slotReadyRead()
-{
-  //kdDebug() << "kio_urn -> data received" << endl;
-  if(http->bytesAvailable() > 0)
-    data(http->readAll());
-}
-
-void kio_kmdProtocol::slotRequestFinished(int req)
-{
-  if(req == requestNr)
-    isFinished = true;
-  //kdDebug() << "kio_urn -> reqfinished " << req << endl;
 }
Index: storm/kde/kmd/kmd.h
diff -u storm/kde/kmd/kmd.h:1.4 storm/kde/kmd/kmd.h:1.5
--- storm/kde/kmd/kmd.h:1.4     Wed May 21 15:47:13 2003
+++ storm/kde/kmd/kmd.h Wed May 21 16:18:13 2003
@@ -39,10 +39,13 @@
   QHttp *http;
   QApplication *app;
   int requestNr;
+  int isMimeTypeRequest;
   int isFinished;
+private:
+  void request(const KURL& url, int isMimeTypeRequest);
 private slots:
+  void slotResponseHeaderReceived(const QHttpResponseHeader & resp);
   void slotReadyRead();
-  void slotStateChanged(int id);
   void slotRequestFinished(int id);
 };