/pidgin/main: 1648d789c7d2: Fix a typo causing the nss-prefs plu...
Daniel Atallah <[email protected]>
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: 1648d789c7d2254e255c901f1125b0d6e8427ea1 Author: Daniel Atallah <[email protected]> Date: 2014-11-23 22:10 -0500 Branch: release-2.x.y URL: https://hg.pidgin.im/pidgin/main/rev/1648d789c7d2 Description: Fix a typo causing the nss-prefs plugin to be named ".dll" on Windows * This has the unfortunate effect of making it not loaded on startup diffstat: libpurple/plugins/ssl/Makefile.mingw | 2 +- pidgin/win32/nsis/pidgin-installer.nsi | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diffs (24 lines): diff --git a/libpurple/plugins/ssl/Makefile.mingw b/libpurple/plugins/ssl/Makefile.mingw --- a/libpurple/plugins/ssl/Makefile.mingw +++ b/libpurple/plugins/ssl/Makefile.mingw @@ -12,7 +12,7 @@ include $(PIDGIN_TREE_TOP)/libpurple/win ## TARGET = ssl TARGET_NSS = ssl-nss -TARGET_NSSPREEFS = nss-prefs +TARGET_NSSPREFS = nss-prefs NEEDED_DLLS = \ $(NSS_TOP)/lib/freebl3.dll \ diff --git a/pidgin/win32/nsis/pidgin-installer.nsi b/pidgin/win32/nsis/pidgin-installer.nsi --- a/pidgin/win32/nsis/pidgin-installer.nsi +++ b/pidgin/win32/nsis/pidgin-installer.nsi @@ -338,6 +338,8 @@ Section $(PIDGINSECTIONTITLE) SecPidgin ;Delete old liboscar and libjabber since they tend to be problematic Delete "$INSTDIR\plugins\liboscar.dll" Delete "$INSTDIR\plugins\libjabber.dll" + ;Delete misnamed nss-prefs plugin from 2.10.11 + Delete "$INSTDIR\plugins\.dll" File /r /x locale /x Gtk ..\..\..\${PIDGIN_INSTALL_DIR}\*.*