pidgin/old.pidgin.im

Revert most of cc4e6b664d0d now that the online installer is working again.

2013-02-14, Daniel Atallah
cff3e584aec5
Parents cc4e6b664d0d
Children eabc3df3567e
Revert most of cc4e6b664d0d now that the online installer is working again.
2 files changed, 4 insertions(+), 5 deletions(-)
  • +1 -1
    inc/blurb.downloaddetect.inc
  • +3 -4
    inc/downloads.inc
    • --- a/inc/blurb.downloaddetect.inc Wed Feb 13 10:15:13 2013 -0800
    +++ b/inc/blurb.downloaddetect.inc Thu Feb 14 00:38:39 2013 -0500
    @@ -10,7 +10,7 @@
    if (strstr($useragent, 'Win')) {
    $download_type = "windows";
    $download_os = "for Windows";
    - $download_link = "http://sourceforge.net/projects/pidgin/files/Pidgin/$pidgin_win32_version/pidgin-$pidgin_win32_version-offline.exe/download";
    + $download_link = "http://sourceforge.net/projects/pidgin/files/Pidgin/$pidgin_win32_version/pidgin-$pidgin_win32_version.exe/download";
    $download_have_direct_link = true;
    $download_version = $pidgin_win32_version;
    } else if (strstr($useragent, "Ubuntu")) {
    --- a/inc/downloads.inc Wed Feb 13 10:15:13 2013 -0800
    +++ b/inc/downloads.inc Thu Feb 14 00:38:39 2013 -0500
    @@ -14,7 +14,7 @@
    'subsect' => 'Windows',
    'description' => 'Download the free Pidgin universal chat client for Windows',
    'body' => '<p class="download_button">
    -<a class="sourceforge_accelerator_link" href="http://sourceforge.net/projects/pidgin/files/Pidgin/' . $pidgin_win32_version . '/pidgin-' . $pidgin_win32_version . '-offline.exe/download">Download Now</a>
    +<a class="sourceforge_accelerator_link" href="http://sourceforge.net/projects/pidgin/files/Pidgin/' . $pidgin_win32_version . '/pidgin-' . $pidgin_win32_version . '.exe/download">Download Now</a>
    <script type="text/javascript">
    (function() {
    var script = document.createElement("script");
    @@ -26,9 +26,8 @@
    </script>
    </p>
    -<p>This version of Pidgin includes an appropriate version of GTK+. GTK+ is now installed locally for Pidgin, and not system-wide, thus Pidgin will not interfere with other GTK+ apps on your system.</p>
    -<p><i>Note: We are currently only offering the "offline" installer for 2.10.7. This is a larger initial download that includes GTK+. We will likely offer the non-offline installer (which downloads GTK+ on the fly) in the next few days.</i></p>
    -<!-- <p>If you would like to have GTK+ included in the installer, we have an <a href="http://sourceforge.net/projects/pidgin/files/Pidgin/' . $pidgin_win32_version . '/pidgin-' . $pidgin_win32_version . '-offline.exe/download">offline installer</a> that bundles everything except spell-checking dictionaries. </p> -->',
    +<p>This version of Pidgin downloads an appropriate version of GTK+. GTK+ is now installed locally for Pidgin, and not system-wide, thus Pidgin will not interfere with other GTK+ apps on your system.</p>
    +<p>If you would like to have GTK+ included in the installer, we have an <a href="http://sourceforge.net/projects/pidgin/files/Pidgin/' . $pidgin_win32_version . '/pidgin-' . $pidgin_win32_version . '-offline.exe/download">offline installer</a> that bundles everything except spell-checking dictionaries. </p>',
    ),
    'ubuntu' => array(