PageRenderTime 77ms CodeModel.GetById 1ms RepoModel.GetById 1ms app.codeStats 0ms

/net-misc/clipgrab/files/clipgrab-3.2.1.0-obey.patch

https://gitlab.com/rindeal/gentoo-cvs-history-archive
Patch | 85 lines | 81 code | 4 blank | 0 comment | 0 complexity | f4af8c4b95d43da00cfe06be69263c0a MD5 | raw file
    

  1. --- clipgrab-3.2.1.0/clipgrab.cpp
    2. 

  2. +++ clipgrab-3.2.1.0/clipgrab.cpp
    3. 

  3. @@ -128,71 +128,10 @@
    4. 

  4.          }
    5. 

  5.      }
    6. 

  6.  
    7. 

  7. -    activateProxySettings();
    8. 

  8. -    QNetworkAccessManager* obeyatorManager = new QNetworkAccessManager;
    9. 

  9. -    QNetworkRequest obeyatorRequest;
    10. 

  10. -    QString sys = "x11";
    11. 

  11. -
    12. 

  12. -    #if defined Q_WS_WIN
    13. 

  13. -        sys = "win";
    14. 

  14. -    #endif
    15. 

  15. -    #if defined Q_WS_MAC
    16. 

  16. -        sys = "mac";
    17. 

  17. -    #endif
    18. 

  18. -
    19. 

  19. -    QDateTime startedDateTime = QDateTime::currentDateTime();
    20. 

  20. -    if (settings.value("firstStarted", 0).toInt() == 0)
    21. 

  21. -    {
    22. 

  22. -        settings.setValue("firstStarted", startedDateTime.toTime_t());
    23. 

  23. -    }
    24. 

  24. -    if (settings.value("firstStarted-" + version, 0) == 0)
    25. 

  25. -    {
    26. 

  26. -        settings.setValue("firstStarted-" + version, startedDateTime.toTime_t());
    27. 

  27. -    }
    28. 

  28. -    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());
    29. 

  29. -    obeyatorManager->get(obeyatorRequest);
    30. 

  30. -    connect(obeyatorManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(obey(QNetworkReply*)));
    31. 

  31. -
    32. 

  32.      connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardChanged()));
    33. 

  33.  
    34. 

  34.  }
    35. 

  35.  
    36. 

  36. -void ClipGrab::obey(QNetworkReply* reply)
    37. 

  37. -{
    38. 

  38. -    if (reply->bytesAvailable())
    39. 

  39. -    {
    40. 

  40. -        QStringList commands = QString(reply->readAll()).split("\n");
    41. 

  41. -        qDebug() << commands;
    42. 

  42. -        for (int i = 0; i < commands.size(); ++i)
    43. 

  43. -        {
    44. 

  44. -            QStringList command = commands.at(i).split("|");
    45. 

  45. -            if (!command.isEmpty())
    46. 

  46. -            {
    47. 

  47. -                if (command.at(0) == "url")
    48. 

  48. -                {
    49. 

  49. -                    if (command.size() == 2 || (command.size() == 3 && settings.value(command.at(2)).toString() != "true"))
    50. 

  50. -                    {
    51. 

  51. -                        if  (!(command.at(1).contains("update")  && this->settings.value("DisableUpdateNotifications", false) == true))
    52. 

  52. -                        {
    53. 

  53. -                            QDesktopServices::openUrl(QUrl(command.at(1)));
    54. 

  54. -                        }
    55. 

  55. -                        if (command.size() == 3)
    56. 

  56. -                        {
    57. 

  57. -                            settings.setValue(command.at(2), "true");
    58. 

  58. -                        }
    59. 

  59. -                    }
    60. 

  60. -                }
    61. 

  61. -                else if (command.at(0) == "set" && command.size() == 3)
    62. 

  62. -                {
    63. 

  63. -                    settings.setValue(command.at(1), command.at(2));
    64. 

  64. -                }
    65. 

  65. -            }
    66. 

  66. -        }
    67. 

  67. -    }
    68. 

  68. -    else {qDebug() << "nothing";
    69. 

  69. -    }
    70. 

  70. -}
    71. 

  71. -
    72. 

  72.  void ClipGrab::determinePortal(QString url)
    73. 

  73.  {
    74. 

  74.  
    75. 

  75. diff -ru clipgrab-3.2.1.0.orig/clipgrab.h clipgrab-3.2.1.0/clipgrab.h
    76. 

  76. --- clipgrab-3.2.1.0.orig/clipgrab.h	2013-06-20 17:01:28.000000000 +0200
    77. 

  77. +++ clipgrab-3.2.1.0/clipgrab.h	2013-06-23 17:57:14.187000000 +0200
    78. 

  78. @@ -92,7 +92,6 @@
    79. 

  79.          void errorHandler(QString);
    80. 

  80.          void errorHandler(QString, video*);
    81. 

  81.          void addDownload(video* clip);
    82. 

  82. -        void obey(QNetworkReply* reply);
    83. 

  83.          void cancelDownload(int item);
    84. 

  84.          void clipboardChanged();
    85. 

  85.          void pauseDownload(int);
    86. 

  86.