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

List:       kde-commits
Subject:    kdemultimedia/libkcddb
From:       Richard Lärkäng <richard () goteborg ! utfors ! se>
Date:       2004-10-19 16:06:28
Message-ID: 20041019160628.57CF916C3F () office ! kde ! org
[Download RAW message or body]

CVS commit by larkang: 

Use users email instead of mine


  M +2 -2      asynchttpsubmit.cpp   1.4
  M +1 -1      asynchttpsubmit.h   1.4
  M +4 -3      client.cpp   1.50
  M +3 -3      httpsubmit.cpp   1.5
  M +3 -1      httpsubmit.h   1.4
  M +2 -2      synchttpsubmit.cpp   1.4
  M +1 -1      synchttpsubmit.h   1.4


--- kdemultimedia/libkcddb/asynchttpsubmit.cpp  #1.3:1.4
@@ -24,6 +24,6 @@
 namespace KCDDB
 {
-  AsyncHTTPSubmit::AsyncHTTPSubmit()
-    : QObject(), HTTPSubmit()
+  AsyncHTTPSubmit::AsyncHTTPSubmit(QString from)
+    : QObject(), HTTPSubmit(from)
   {
 

--- kdemultimedia/libkcddb/asynchttpsubmit.h  #1.3:1.4
@@ -28,5 +28,5 @@ namespace KCDDB
     Q_OBJECT
     public:
-      AsyncHTTPSubmit();
+      AsyncHTTPSubmit(QString from);
       virtual ~AsyncHTTPSubmit();
 

--- kdemultimedia/libkcddb/client.cpp  #1.49:1.50
@@ -251,12 +251,14 @@ namespace KCDDB
     delete cdInfoSubmit;
 
+    QString from = d->config.emailAddress();
+
     switch (d->config.submitTransport())
     {
       case Submit::HTTP:
         if ( blockingMode() )
-          cdInfoSubmit = new SyncHTTPSubmit( );
+          cdInfoSubmit = new SyncHTTPSubmit(from);
         else
         {
-          cdInfoSubmit = new AsyncHTTPSubmit( );
+          cdInfoSubmit = new AsyncHTTPSubmit(from);
           connect( static_cast<AsyncHTTPSubmit *>( cdInfoSubmit ),
                   SIGNAL(finished( CDDB::Result ) ),
@@ -271,5 +273,4 @@ namespace KCDDB
         uint port = d->config.smtpPort();
         QString username = d->config.smtpUsername();
-        QString from = d->config.emailAddress();
 
         if ( blockingMode() )

--- kdemultimedia/libkcddb/httpsubmit.cpp  #1.4:1.5
@@ -25,6 +25,6 @@
 namespace KCDDB
 {
-  HTTPSubmit::HTTPSubmit()
-    : Submit()
+  HTTPSubmit::HTTPSubmit(QString from)
+    : Submit(), from_(from)
   {
 
@@ -49,5 +49,5 @@ namespace KCDDB
     header += "Category: " + cdInfo.category + "\n";
     header += "Discid: " + cdInfo.id + "\n";
-    header += "User-Email: nouseforaname@home.se\n";
+    header += "User-Email: " + from_ + "\n";
     header += "Submit-Mode: test\n"; // s/test/submit/
     header += "Charset: UTF-8";

--- kdemultimedia/libkcddb/httpsubmit.h  #1.3:1.4
@@ -27,9 +27,11 @@ namespace KCDDB
   {
     public:
-      HTTPSubmit();
+      HTTPSubmit(QString from);
       virtual ~HTTPSubmit();
 
     protected:
       virtual KIO::Job* createJob(const CDInfo& cdInfo);
+
+      QString from_;
   } ;
 }

--- kdemultimedia/libkcddb/synchttpsubmit.cpp  #1.3:1.4
@@ -24,6 +24,6 @@
 namespace KCDDB
 {
-  SyncHTTPSubmit::SyncHTTPSubmit()
-    : HTTPSubmit()
+  SyncHTTPSubmit::SyncHTTPSubmit(QString from)
+    : HTTPSubmit(from)
   {
 

--- kdemultimedia/libkcddb/synchttpsubmit.h  #1.3:1.4
@@ -27,5 +27,5 @@ namespace KCDDB
   {
     public:
-      SyncHTTPSubmit();
+      SyncHTTPSubmit(QString from);
       virtual ~SyncHTTPSubmit();
 


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