im.pidgin.pidgin: 59ab2b78429c94d5d0fc77b1b7892accb524e2a4

Sadrul Habib Chowdhury imadil at gmail.com
Mon Oct 15 20:18:52 EDT 2007


* evands at pidgin.im had this to say on [15 Oct 2007, 20:00:36 -0400]:
> -----------------------------------------------------------------
> Revision: 59ab2b78429c94d5d0fc77b1b7892accb524e2a4
> Ancestor: cf4d95df46ab2c4bea54a9fee1015441f2770bf6
> Author: evands at pidgin.im
> Date: 2007-10-15T23:46:02
> Branch: im.pidgin.pidgin
> 
> Modified files:
>         libpurple/protocols/msn/msn.c libpurple/protocols/msn/user.c
>         libpurple/status.h
> 
> ChangeLog: 
> 
> Use a #define for the msn 'currentmedia' status attribute in line with the PURPLE_TUNE_ attributes used in the xmpp prpl
> 

This has been done (differently) in the .next.minor branch (added in
revision c18d5cd286ee71c937b596b39c52f826f6ba5dc1) (and there's going
to be some conflicts when the merge happens).

[snip]

>  #define PURPLE_TUNE_YEAR	"tune_year"
> -#define PURPLE_TUNE_URL	"tune_url"
> +#define PURPLE_TUNE_URL		"tune_url"
> +#define PURPLE_TUNE_FULL	"tune_full"
>  

I believe this bumps the minor? If that's the case, we can just merge
.next.minor right now.

Sadrul




More information about the Devel mailing list