Mercurial > pidgin
changeset 19524:639e275a1f5d
merge of '80cc49cd64db4d457f67ee6f7a936e162748f026'
and 'd273fe25a67a473ee0a68fa86977c0cc0df24328'
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Wed, 29 Aug 2007 04:55:44 +0000 |
| parents | 9683da821d15 (diff) dbed19b9773b (current diff) |
| children | c13f0639917d 4574cd30f3ed |
| files | |
| diffstat | 8 files changed, 12 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.win32 Wed Aug 29 04:03:01 2007 +0000 +++ b/ChangeLog.win32 Wed Aug 29 04:55:44 2007 +0000 @@ -1,5 +1,8 @@ +version 2.2.0 (??/??/2007): + * Upgrade SILC to use the 1.1.2 toolkit + version 2.1.1 (08/20/2007): - * No changes + * No changes version 2.1.0 (7/28/2007): * Updated launcher application (pidgin.exe) to support portable mode
--- a/libpurple/protocols/Makefile.mingw Wed Aug 29 04:03:01 2007 +0000 +++ b/libpurple/protocols/Makefile.mingw Wed Aug 29 04:55:44 2007 +0000 @@ -8,7 +8,7 @@ PIDGIN_TREE_TOP := ../.. include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak -SUBDIRS = gg irc jabber msn novell null oscar qq sametime silc10 simple yahoo bonjour myspace +SUBDIRS = gg irc jabber msn novell null oscar qq sametime silc simple yahoo bonjour myspace .PHONY: all install clean
--- a/libpurple/protocols/silc/Makefile.mingw Wed Aug 29 04:03:01 2007 +0000 +++ b/libpurple/protocols/silc/Makefile.mingw Wed Aug 29 04:55:44 2007 +0000 @@ -8,8 +8,8 @@ include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak TARGET = libsilc -NEEDED_DLLS = $(SILC_TOOLKIT)/lib/silc.dll \ - $(SILC_TOOLKIT)/lib/silcclient.dll +NEEDED_DLLS = $(SILC_TOOLKIT)/bin/libsilc-1-1-2.dll \ + $(SILC_TOOLKIT)/bin/libsilcclient-1-1-2.dll TYPE = PLUGIN # Static or Plugin...
--- a/libpurple/protocols/silc/silc.c Wed Aug 29 04:03:01 2007 +0000 +++ b/libpurple/protocols/silc/silc.c Wed Aug 29 04:55:44 2007 +0000 @@ -1975,9 +1975,6 @@ silc_log_set_debug_string("*client*"); #endif -#ifdef _WIN32 - silc_net_win32_init(); -#endif } PURPLE_INIT_PLUGIN(silc, init_plugin, info);
--- a/libpurple/win32/global.mak Wed Aug 29 04:03:01 2007 +0000 +++ b/libpurple/win32/global.mak Wed Aug 29 04:55:44 2007 +0000 @@ -20,7 +20,7 @@ NSPR_TOP ?= $(WIN32_DEV_TOP)/nspr-4.6.4 NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.11.4 PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl58 -SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.0.2 +SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.2 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5 # Where we installing this stuff to?
--- a/pidgin/gtkaccount.c Wed Aug 29 04:03:01 2007 +0000 +++ b/pidgin/gtkaccount.c Wed Aug 29 04:55:44 2007 +0000 @@ -2405,13 +2405,6 @@ g_free(accounts_window); accounts_window = NULL; - - /* See if we're the main window here. */ - if (PIDGIN_BLIST(purple_get_blist())->window == NULL && - purple_connections_get_all() == NULL) { - - purple_core_quit(); - } } static void
--- a/pidgin/gtkcertmgr.c Wed Aug 29 04:03:01 2007 +0000 +++ b/pidgin/gtkcertmgr.c Wed Aug 29 04:55:44 2007 +0000 @@ -676,11 +676,4 @@ gtk_widget_destroy(certmgr_dialog->window); g_free(certmgr_dialog); certmgr_dialog = NULL; - - /* If this was the only window left, quit */ - if (PIDGIN_BLIST(purple_get_blist())->window == NULL && - purple_connections_get_all() == NULL) { - - purple_core_quit(); - } }
--- a/pidgin/win32/nsis/pidgin-installer.nsi Wed Aug 29 04:03:01 2007 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Wed Aug 29 04:55:44 2007 +0000 @@ -503,8 +503,8 @@ ${If} ${IsNT} ${AndIf} ${IsWinNT4} Delete "$INSTDIR\plugins\libsilc.dll" - Delete "$INSTDIR\silcclient.dll" - Delete "$INSTDIR\silc.dll" + Delete "$INSTDIR\libsilcclient-1-1-2.dll" + Delete "$INSTDIR\libsilc-1-1-2.dll" ${EndIf} SetOutPath "$INSTDIR" @@ -764,8 +764,8 @@ Delete "$INSTDIR\pidgin.dll" Delete "$INSTDIR\plc4.dll" Delete "$INSTDIR\plds4.dll" - Delete "$INSTDIR\silc.dll" - Delete "$INSTDIR\silcclient.dll" + Delete "$INSTDIR\libsilc-1-1-2.dll" + Delete "$INSTDIR\libsilcclient-1-1-2.dll" Delete "$INSTDIR\smime3.dll" Delete "$INSTDIR\softokn3.dll" Delete "$INSTDIR\ssl3.dll"