/soc/2013/ankitkv/gobjectification: c9f5588d027b: Updated filena...

[Ankit Vani]

Changeset: c9f5588d027b8f8ef4f8649705091bb685c5b4aa
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-22 22:51 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/c9f5588d027b

Description:

Updated filenames in pidgin-installer.nsi

diffstat:

 libpurple/protocols/yahoo/ymsg.h       |   2 +-
 pidgin/win32/nsis/pidgin-installer.nsi |  15 ++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diffs (79 lines):

diff --git a/libpurple/protocols/yahoo/ymsg.h b/libpurple/protocols/yahoo/ymsg.h
--- a/libpurple/protocols/yahoo/ymsg.h
+++ b/libpurple/protocols/yahoo/ymsg.h
@@ -356,7 +356,7 @@ YahooFederation yahoo_get_federation_fro
 /* yahoo_profile.c */
 void yahoo_get_info(PurpleConnection *gc, const char *name);
 
-/* libymsg.h  - these functions were formerly static but need not to be for the
+/* ymsg.h  - these functions were formerly static but need not to be for the
  * new two-protocol model. */
 const char *yahoo_list_icon(PurpleAccount *a, PurpleBuddy *b);
 const char *yahoo_list_emblem(PurpleBuddy *b);
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
@@ -335,10 +335,6 @@ Section $(PIDGINSECTIONTITLE) SecPidgin
     ; Pidgin files
     SetOverwrite on
 
-    ;Delete old liboscar and libjabber since they tend to be problematic
-    Delete "$INSTDIR\plugins\liboscar.dll"
-    Delete "$INSTDIR\plugins\libjabber.dll"
-
     File /r /x locale /x Gtk ..\..\..\${PIDGIN_INSTALL_DIR}\*.*
 
     ; Check if Perl is installed, if so add it to the AppPaths
@@ -570,31 +566,27 @@ Section Uninstall
     Delete "$INSTDIR\plugins\gtkbuddynote.dll"
     Delete "$INSTDIR\plugins\history.dll"
 	Delete "$INSTDIR\plugins\internalkeyring.dll"
-	Delete "$INSTDIR\plugins\libfacebook.dll"
-	Delete "$INSTDIR\plugins\libgtalk.dll"
 	Delete "$INSTDIR\plugins\ssl-gnutls.dll"
 	Delete "$INSTDIR\plugins\webkit.dll"
 	Delete "$INSTDIR\plugins\wincred.dll"
     Delete "$INSTDIR\plugins\iconaway.dll"
     Delete "$INSTDIR\plugins\idle.dll"
     Delete "$INSTDIR\plugins\joinpart.dll"
-    Delete "$INSTDIR\plugins\libaim.dll"
     Delete "$INSTDIR\plugins\libbonjour.dll"
     Delete "$INSTDIR\plugins\libgg.dll"
-    Delete "$INSTDIR\plugins\libicq.dll"
     Delete "$INSTDIR\plugins\libirc.dll"
+    Delete "$INSTDIR\plugins\libjabber.dll"
     Delete "$INSTDIR\plugins\libmsn.dll"
     Delete "$INSTDIR\plugins\libmxit.dll"
     Delete "$INSTDIR\plugins\libmyspace.dll"
     Delete "$INSTDIR\plugins\libnapster.dll"
     Delete "$INSTDIR\plugins\libnovell.dll"
+    Delete "$INSTDIR\plugins\liboscar.dll"
     Delete "$INSTDIR\plugins\libsametime.dll"
     Delete "$INSTDIR\plugins\libsilc.dll"
     Delete "$INSTDIR\plugins\libsimple.dll"
     Delete "$INSTDIR\plugins\libtoc.dll"
     Delete "$INSTDIR\plugins\libyahoo.dll"
-    Delete "$INSTDIR\plugins\libyahoojp.dll"
-    Delete "$INSTDIR\plugins\libxmpp.dll"
     Delete "$INSTDIR\plugins\log_reader.dll"
     Delete "$INSTDIR\plugins\markerline.dll"
     Delete "$INSTDIR\plugins\newline.dll"
@@ -637,10 +629,8 @@ Section Uninstall
     RMDir "$INSTDIR\spellcheck\lib"
     RMDir "$INSTDIR\spellcheck"
     Delete "$INSTDIR\freebl3.dll"
-    Delete "$INSTDIR\libjabber.dll"
     Delete "$INSTDIR\libnspr4.dll"
     Delete "$INSTDIR\libmeanwhile-1.dll"
-    Delete "$INSTDIR\liboscar.dll"
     Delete "$INSTDIR\libplc4.dll"
     Delete "$INSTDIR\libplds4.dll"
     Delete "$INSTDIR\libpurple.dll"
@@ -649,7 +639,6 @@ Section Uninstall
     Delete "$INSTDIR\libsilcclient-1-1-3.dll"
     Delete "$INSTDIR\libssp-0.dll"
     Delete "$INSTDIR\libxml2-2.dll"
-    Delete "$INSTDIR\libymsg.dll"
     Delete "$INSTDIR\nss3.dll"
     Delete "$INSTDIR\nssutil3.dll"
     Delete "$INSTDIR\pidgin.dll"