/www/pidgin: cff3e584aec5: Revert most of cc4e6b664d0d now that ...

[Daniel Atallah]

Changeset: cff3e584aec554971962bc905061ac803a3bc631
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2013-02-14 00:38 -0500
Branch:	 default
URL: http://hg.pidgin.im/www/pidgin/rev/cff3e584aec5

Description:

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

diffstat:

 inc/blurb.downloaddetect.inc |  2 +-
 inc/downloads.inc            |  7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (36 lines):

diff --git a/inc/blurb.downloaddetect.inc b/inc/blurb.downloaddetect.inc
--- a/inc/blurb.downloaddetect.inc
+++ b/inc/blurb.downloaddetect.inc
@@ -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")) {
diff --git a/inc/downloads.inc b/inc/downloads.inc
--- a/inc/downloads.inc
+++ b/inc/downloads.inc
@@ -14,7 +14,7 @@ include($_SERVER['DOCUMENT_ROOT'] . "/..
 		'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 @@ include($_SERVER['DOCUMENT_ROOT'] . "/..
 </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(