packages: kde4-kdeplasma-addons/kde4-kdeplasma-addons-pastebinpld.patch - m...

[shadzik]

Author: shadzik                      Date: Thu Feb 18 15:45:28 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/kde4-kdeplasma-addons:
   kde4-kdeplasma-addons-pastebinpld.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons-pastebinpld.patch
diff -u packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons-pastebinpld.patch:1.4 packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons-pastebinpld.patch:1.5
--- packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons-pastebinpld.patch:1.4	Thu Jul 30 00:40:25 2009
+++ packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons-pastebinpld.patch	Thu Feb 18 16:45:23 2010
@@ -1,13 +1,57 @@
-diff -ur kdeplasma-addons-4.2.87svn969966/applets/pastebin/backends/pastebincom.cpp kdeplasma-addons-4.2.87svn969966.new/applets/pastebin/backends/pastebincom.cpp
---- kdeplasma-addons-4.2.87svn969966/applets/pastebin/backends/pastebincom.cpp	2009-02-26 10:13:10.000000000 +0100
-+++ kdeplasma-addons-4.2.87svn969966.new/applets/pastebin/backends/pastebincom.cpp	2009-05-26 23:35:14.059626384 +0200
-@@ -25,7 +25,7 @@
- PastebinCOMServer::PastebinCOMServer(KConfigGroup config)
-     : PastebinServer()
+diff -ur kdeplasma-addons-4.3.90/applets/pastebin/pastebin.cpp kdeplasma-addons-4.3.90.new/applets/pastebin/pastebin.cpp
+--- kdeplasma-addons-4.3.90/applets/pastebin/pastebin.cpp	2009-12-17 17:38:19.000000000 +0100
++++ kdeplasma-addons-4.3.90.new/applets/pastebin/pastebin.cpp	2010-01-13 13:09:05.205990344 +0100
+@@ -466,7 +466,7 @@
+             break;
+ 
+         case Pastebin::PASTEBINCOM:
+-           serverAddress = cg.readEntry("pastebincom", "http://pastebin.com");
++           serverAddress = cg.readEntry("pastebincom", "http://pld.pastebin.com");
+            break;
+     }
+ 
+@@ -818,7 +818,7 @@
+                 break;
+ 
+             case Pastebin::PASTEBINCOM:
+-                ops.writeEntry("server", cg.readEntry("pastebincom", "http://pastebin.com"));
++                ops.writeEntry("server", cg.readEntry("pastebincom", "http://pld.pastebin.com"));
+                 break;
+         }
+ 
+diff -ur kdeplasma-addons-4.3.90/applets/pastebin/pastebin.h kdeplasma-addons-4.3.90.new/applets/pastebin/pastebin.h
+--- kdeplasma-addons-4.3.90/applets/pastebin/pastebin.h	2009-12-05 00:09:42.000000000 +0100
++++ kdeplasma-addons-4.3.90.new/applets/pastebin/pastebin.h	2010-01-13 13:28:15.798996766 +0100
+@@ -70,7 +70,7 @@
+         Sending = 8      /* Sending data to the server, waiting for reply */
+     };
+ 
+-    enum textServers { PASTEBINCA, PASTEBINCOM };
++    enum textServers { PASTEBINCOM, PASTEBINCA };
+     enum imageServers { IMAGEBINCA, IMAGESHACK, SIMPLESTIMAGEHOSTING };
+ 
+ public slots:
+diff -ur kdeplasma-addons-4.3.90/dataengines/pastebin/backends/pastebincom.h kdeplasma-addons-4.3.90.new/dataengines/pastebin/backends/pastebincom.h
+--- kdeplasma-addons-4.3.90/dataengines/pastebin/backends/pastebincom.h	2009-09-04 13:31:16.000000000 +0200
++++ kdeplasma-addons-4.3.90.new/dataengines/pastebin/backends/pastebincom.h	2010-01-13 13:10:03.552445605 +0100
+@@ -27,7 +27,7 @@
+ #include <kio/global.h>
+ #include <kio/job.h>
+ 
+-#define PASTEBINCOM_SERVER "http://pastebin.com"
++#define PASTEBINCOM_SERVER "http://pld.pastebin.com"
+ 
+ class PastebinCOMServer : public PastebinServer
  {
--    m_server = config.readEntry("pastebincom", "http://pastebin.com");
-+    m_server = config.readEntry("pld.pastebincom", "http://pld.pastebin.com");
- }
+diff -ur kdeplasma-addons-4.3.90/dataengines/pastebin/pastebinservice.h kdeplasma-addons-4.3.90.new/dataengines/pastebin/pastebinservice.h
+--- kdeplasma-addons-4.3.90/dataengines/pastebin/pastebinservice.h	2009-10-15 18:34:11.000000000 +0200
++++ kdeplasma-addons-4.3.90.new/dataengines/pastebin/pastebinservice.h	2010-01-13 13:28:35.522328387 +0100
+@@ -38,7 +38,7 @@
+     Q_OBJECT
+ 
+ public:
+-    enum textServers { PASTEBINCA, PASTEBINCOM };
++    enum textServers { PASTEBINCOM, PASTEBINCA };
+     enum imageServers { IMAGEBINCA, IMAGESHACK, SIMPLESTIMAGEHOSTING };
  
- PastebinCOMServer::~PastebinCOMServer()
-Tylko w kdeplasma-addons-4.2.87svn969966.new/applets/pastebin/backends: pastebincom.cpp~
+     PastebinService(PastebinEngine *engine);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons-pastebinpld.patch?r1=1.4&r2=1.5&f=u