Revision 5aef962e1676160893b6b53452b98959b521e6af

[thekingant at pidgin.im]

o   -----------------------------------------------------------------
|   Revision: 5aef962e1676160893b6b53452b98959b521e6af
|   Ancestor: 63ed12f00af79949ffe9e7277590b6139ef5026d
|   Author: thekingant
|   Date: 2004-12-09T03:17:21
|   Branch: im.pidgin.gaim.oldstatus
|   
|   Modified files:
|           ChangeLog ChangeLog.win32 VERSION configure.ac
|           plugins/ChangeLog.API po/ChangeLog src/protocols/silc/ops.c
|   
|   ChangeLog: 
|   
|   [gaim-migrate @ 11544]
|   Backport the SILC fix.
|   ============================================================
|   --- ChangeLog	ca0c61832afe02a544ec7cacb85d3938b793c1b5
|   +++ ChangeLog	260404c39ba081969c42a8dc689f0824514de4ca
|   @@ -1,5 +1,9 @@ Gaim: The Pimpin' Penguin IM Client that
|    Gaim: The Pimpin' Penguin IM Client that's good for the soul!
|    
|   +version 1.1.1:
|   +	* Allow SILC authentication via public key if your key is password
|   +	  protected (Michele Baldessari)
|   +
|    version 1.1.0 (12/02/2004):
|    	New Features:
|    	* Binary relocable. Gaim will find its files even if it's installed
|   ============================================================
|   --- ChangeLog.win32	8406df6fce54a634a0d2d6805733656a5111f720
|   +++ ChangeLog.win32	142aee04a77a99659673ea09cdc9a8963fc5b237
|   @@ -1,5 +1,8 @@
|   +version 1.1.1:
|   +	* No changes
|   +
|    version 1.1.0: (12/02/2004)
|   -	* Silc protocol plugin added.
|   +	* SILC protocol plugin added.
|    	* Now checking GAIMLANG and GAIMHOME instead of LANG and HOME env
|    	  variables, to avoid conflicts with other apps that use them and
|    	  to avoid HOME env variables intended for cygwin (using unix style
|   ============================================================
|   --- VERSION	05e17b646a817240c206186f94f8f4c70974d5dc
|   +++ VERSION	5ccee51b8acd81577e03a40e877eb32bdc5f5758
|   @@ -1 +1 @@
|   -1.1.0
|   +1.1.1cvs
|   ============================================================
|   --- configure.ac	e8a0661d00791ce17c5ed87f22085fe8a1d055c0
|   +++ configure.ac	ab035b0c7c3f70ac14a5c93164014bba92c66dd9
|   @@ -1,5 +1,5 @@ dnl Process this file with autoconf to p
|    dnl Process this file with autoconf to produce a configure script.
|   -AC_INIT([gaim], [1.1.0], [gaim-devel at lists.sourceforge.net])
|   +AC_INIT([gaim], [1.1.1cvs], [gaim-devel at lists.sourceforge.net])
|    AC_CANONICAL_SYSTEM
|    AM_CONFIG_HEADER(config.h)
|    AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
|   ============================================================
|   --- plugins/ChangeLog.API	8667e4cefde32148d3b7d3a64c4494e3a6b2f576
|   +++ plugins/ChangeLog.API	fa5e2cb5c98569aa9d1929d587631f1a076724cc
|   @@ -1,5 +1,8 @@ Gaim: The Pimpin' Penguin IM Client that
|    Gaim: The Pimpin' Penguin IM Client that's good for the soul!
|    
|   +version 1.1.1:
|   +	* No changes
|   +
|    version 1.1.0 (12/02/2004):
|    	* Added: gaim_utf8_salvage
|    	* Added: binary relocation support in prefix.h
|   ============================================================
|   --- po/ChangeLog	cfa55596479255afab37013a07aab5b6821317d0
|   +++ po/ChangeLog	e31cee1c994f66b5f26383b9949fb879df2dff48
|   @@ -1,5 +1,8 @@ Gaim: The Pimpin' Penguin IM Clone that'
|    Gaim: The Pimpin' Penguin IM Clone that's good for the soul!
|    
|   +version 1.1.1:
|   +	* No changes
|   +
|    version 1.1.0 (12/02/2004):
|    	* Catalan translation updated (Josep Puigdemont)
|    	* Chinese (Simplified) translation updated (Funda Wang)
|   ============================================================
|   --- src/protocols/silc/ops.c	19580bec31747a1c81a17956465d09ad50745953
|   +++ src/protocols/silc/ops.c	22536f7dea790e1021b0e8f916a3632f67a43df4
|   @@ -1603,15 +1603,15 @@ silc_get_auth_method(SilcClient client, 
|    
|    	/* Check configuration if we have this connection configured.  If we
|    	   have then return that data immediately, as it's faster way. */
|   +	if (gaim_account_get_bool(sg->account, "pubkey-auth", FALSE)) {
|   +		completion(TRUE, SILC_AUTH_PUBLIC_KEY, NULL, 0, context);
|   +		return;
|   +	}
|    	if (gc->account->password && *gc->account->password) {
|    		completion(TRUE, SILC_AUTH_PASSWORD, gc->account->password,
|    			   strlen(gc->account->password), context);
|    		return;
|    	}
|   -	if (gaim_account_get_bool(sg->account, "pubkey-auth", FALSE)) {
|   -		completion(TRUE, SILC_AUTH_PUBLIC_KEY, NULL, 0, context);
|   -		return;
|   -	}
|    
|    	/* Resolve the authentication method from server, as we may not know it. */
|    	internal = silc_calloc(1, sizeof(*internal));

To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 5aef962e1676160893b6b53452b98959b521e6af