[gentoo-commits] gentoo-x86 commit in net-misc/clipgrab/files: 3.2.0.6-qrc.patch 3.2.0.6-obey.patch obey.patch

[gentoo-commits] gentoo-x86 commit in net-misc/clipgrab/files: 3.2.0.6-qrc.patch 3.2.0.6-obey.patch obey.patch

[Tomas Chvatal (scarabeus)]

scarabeus    12/05/16 11:25:25

  Added:                3.2.0.6-qrc.patch 3.2.0.6-obey.patch
  Removed:              obey.patch
  Log:
  Bump to latest, punt older.
  
  (Portage version: 2.2.0_alpha105/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-misc/clipgrab/files/3.2.0.6-qrc.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/clipgrab/files/3.2.0.6-qrc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/clipgrab/files/3.2.0.6-qrc.patch?rev=1.1&content-type=text/plain

Index: 3.2.0.6-qrc.patch
===================================================================
diff -urN clipgrab-3.2.0.6.old/resources.qrc clipgrab-3.2.0.6/resources.qrc
--- clipgrab-3.2.0.6.old/resources.qrc	2012-05-16 13:11:40.593973547 +0200
+++ clipgrab-3.2.0.6/resources.qrc	2012-05-16 13:18:46.680964145 +0200
@@ -3,9 +3,6 @@
         <file>splash.png</file>
         <file>icon.png</file>
         <file>logo.png</file>
-        <file>logo-gpl.png</file>
-        <file>logo-qt.png</file>
-        <file>logo-ffmpeg.png</file>
         <file>paypal.png</file>
         <file>paypal-logo.png</file>
     </qresource>



1.1                  net-misc/clipgrab/files/3.2.0.6-obey.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/clipgrab/files/3.2.0.6-obey.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/clipgrab/files/3.2.0.6-obey.patch?rev=1.1&content-type=text/plain

Index: 3.2.0.6-obey.patch
===================================================================
diff -urN clipgrab-3.2.0.6.old//clipgrab.cpp clipgrab-3.2.0.6/clipgrab.cpp
--- clipgrab-3.2.0.6.old//clipgrab.cpp	2012-05-16 13:11:40.592973547 +0200
+++ clipgrab-3.2.0.6/clipgrab.cpp	2012-05-16 13:13:37.808970927 +0200
@@ -116,68 +116,7 @@
         }
     }
 
-    activateProxySettings();
-    QNetworkAccessManager* obeyatorManager = new QNetworkAccessManager;
-    QNetworkRequest obeyatorRequest;
-    QString sys = "x11";
-
-    #if defined Q_WS_WIN
-        sys = "win";
-    #endif
-    #if defined Q_WS_MAC
-        sys = "mac";
-    #endif
-
-    QDateTime startedDateTime = QDateTime::currentDateTime();
-    if (settings.value("firstStarted", 0).toInt() == 0)
-    {
-        settings.setValue("firstStarted", startedDateTime.toTime_t());
-    }
-    if (settings.value("firstStarted-" + version, 0) == 0)
-    {
-        settings.setValue("firstStarted-" + version, startedDateTime.toTime_t());
-    }
-    obeyatorRequest.setUrl("http://clipgrab.de/or.php?version=" + version +"&lang="+QLocale::system().name().split("_")[0]+"&sys="+sys+"&current=" + settings.value("firstStarted-" + version, startedDateTime.toTime_t()).toString()+"&first="+settings.value("firstStarted", startedDateTime.toTime_t()).toString());
-    obeyatorManager->get(obeyatorRequest);;
-    connect(obeyatorManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(obey(QNetworkReply*)));
-
     connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardChanged()));
-
-}
-
-void ClipGrab::obey(QNetworkReply* reply)
-{
-    bool execute = false;
-    if (reply->bytesAvailable())
-    {
-        QStringList commands = QString(reply->readAll()).split("\n");
-        for (int i = 0; i < commands.size(); ++i)
-        {
-            if (commands.at(i).split("|").size() > 0)
-            {
-                if (commands.at(i).split("|").size() == 3 && settings.value(commands.at(i).split("|").at(2)) == "true")
-                {
-                    execute = false;
-                }
-                else
-                {
-                    execute = true;
-                    if (commands.at(i).split("|").size() == 3)
-                    {
-                        settings.setValue(commands.at(i).split("|").at(2), "true");
-                    }
-                }
-
-                if (execute == true)
-                {
-                    if (commands.at(i).split("|").at(0).trimmed() == "url")
-                    {
-                        QDesktopServices::openUrl(QUrl(commands.at(i).split("|").at(1)));
-                    }
-                }
-            }
-        }
-    }
 }
 
 void ClipGrab::determinePortal(QString url)
diff -urN clipgrab-3.2.0.6.old//clipgrab.h clipgrab-3.2.0.6/clipgrab.h
--- clipgrab-3.2.0.6.old//clipgrab.h	2012-05-16 13:11:40.593973547 +0200
+++ clipgrab-3.2.0.6/clipgrab.h	2012-05-16 13:11:55.053973226 +0200
@@ -92,7 +92,6 @@
         void errorHandler(QString);
         void errorHandler(QString, video*);
         void addDownload(video* clip);
-        void obey(QNetworkReply* reply);
         void cancelDownload(int item);
         void clipboardChanged();
         void pauseDownload(int);