Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00
Code Releases Activity

[Win] Updated installer + fixed previous commit.

Browse Source
This commit is contained in:
nowrep 2013-05-18 23:37:50 +02:00
parent 8172e19a3b
commit 6d36afff3e
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/other/useragentmanager.cpp
View File

@ -53,13 +53,6 @@ QString UserAgentManager::userAgentForUrl(const QUrl &url) const
{ {
const QString &host = url.host(); const QString &host = url.host();
#ifdef Q_OS_WIN
// Facebook chat is not working with default user-agent
if (host == QLatin1String("facebook.com")) {
return "Mozilla/5.0 (Windows XP) AppleWebKit/535.7 (KHTML, like Gecko) Chrome/16.0.912.77 Safari/535.7";
}
#endif
if (m_usePerDomainUserAgent) { if (m_usePerDomainUserAgent) {
QHashIterator<QString, QString> i(m_userAgentsList); QHashIterator<QString, QString> i(m_userAgentsList);
while (i.hasNext()) { while (i.hasNext()) {
@ -76,6 +69,14 @@ QString UserAgentManager::userAgentForUrl(const QUrl &url) const
} }
#endif #endif
#ifdef Q_OS_WIN
// Facebook chat is not working with default user-agent
if (host.endsWith(QLatin1String("facebook.com"))) {
return "Mozilla/5.0 (Windows XP) AppleWebKit/535.7 (KHTML, like Gecko) Chrome/16.0.912.77 Safari/535.7";
}
#endif
return m_globalUserAgent; return m_globalUserAgent;
} }

16
windows/installer.nsi
View File

@ -24,7 +24,7 @@ RequestExecutionLevel admin
SetCompressor /SOLID /FINAL lzma SetCompressor /SOLID /FINAL lzma
!define PRODUCT_NAME "QupZilla" !define PRODUCT_NAME "QupZilla"
!define /date PRODUCT_VERSION "1.4.2" !define /date PRODUCT_VERSION "1.4.3"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\qupzilla.exe" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\qupzilla.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM" !define PRODUCT_UNINST_ROOT_KEY "HKLM"
@ -71,7 +71,9 @@ SetCompressor /SOLID /FINAL lzma
!insertmacro MUI_LANGUAGE "Ukrainian" !insertmacro MUI_LANGUAGE "Ukrainian"
!insertmacro MUI_LANGUAGE "Catalan" !insertmacro MUI_LANGUAGE "Catalan"
!insertmacro MUI_LANGUAGE "Serbian" !insertmacro MUI_LANGUAGE "Serbian"
!insertmacro MUI_LANGUAGE "farsi" !insertmacro MUI_LANGUAGE "SerbianLatin"
!insertmacro MUI_LANGUAGE "Farsi"
!insertmacro MUI_LANGUAGE "Hebrew"
!insertmacro MUI_RESERVEFILE_LANGDLL !insertmacro MUI_RESERVEFILE_LANGDLL
@ -299,8 +301,8 @@ SectionGroup $(TITLE_SecTranslations) SecTranslations
SetOutPath "$INSTDIR\hunspell" SetOutPath "$INSTDIR\hunspell"
File "wininstall\hunspell\sr.aff" File "wininstall\hunspell\sr.aff"
File "wininstall\hunspell\sr.dic" File "wininstall\hunspell\sr.dic"
File "wininstall\hunspell\sr-Latn.aff" File "wininstall\hunspell\sh.aff"
File "wininstall\hunspell\sr-Latn.dic" File "wininstall\hunspell\sh.dic"
SectionEnd SectionEnd
Section "Japanese" Section "Japanese"
@ -532,8 +534,12 @@ Function .onInit
Push Catalan Push Catalan
Push ${LANG_SERBIAN} Push ${LANG_SERBIAN}
Push Serbian Push Serbian
Push ${LANG_Farsi} Push ${LANG_SERBIANLATIN}
Push Serbian Latin
Push ${LANG_FARSI}
Push Persian Push Persian
Push ${LANG_HEBREW}
Push Hebrew
Push A ; A means auto count languages Push A ; A means auto count languages
; for the auto count to work the first empty push (Push "") must remain ; for the auto count to work the first empty push (Push "") must remain
LangDLL::LangDialog "Installer Language" "Please select the language of the installer" LangDLL::LangDialog "Installer Language" "Please select the language of the installer"