Mercurial > pidgin
changeset 16860:86ba72a2b31e
merge of '27e1df003532e1209f1f56770923ca4c7674d7ca'
and 'ace1e60dda39081ec5404dfa76fa55f79b3e30c6'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Fri, 04 May 2007 04:02:14 +0000 |
| parents | ec79e3ad09a9 (current diff) f51f1937d97f (diff) |
| children | 38b3ca4b353d |
| files | |
| diffstat | 3 files changed, 21 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Fri May 04 04:01:23 2007 +0000 +++ b/NEWS Fri May 04 04:02:14 2007 +0000 @@ -26,6 +26,17 @@ creep. As Luke said, a ton of thought and effort has gone into Pidgin 2.0.0; I'm proud to have played a part. + Stu: We did it! finally, we have 2.0.0. It's been a long time coming, + but there's a great deal of goodness here. When I say a long time, I'm + not kidding - it's been 972 days since we branched off "oldstatus" + (aka 1.x). The early Greeks were uncertain as to whether 2 was a + number at all (or if we'd ever make this release) - it has a beginning + and an end but no middle (much like our unfortunately quiet development + period). 2 is the first prime number and the only even prime. 2 is also + the first deficient number (oh well). There are only 10 types of people + in the world - those who like our new names and those who do not. + Enjoy! + 2.0.0beta7 (4/29/2007): Sean: Beta 7. The final beta. A few major changes from beta6. For starters, we have some new names. That's pretty cool. We have a new
--- a/libpurple/protocols/msn/msn.c Fri May 04 04:01:23 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Fri May 04 04:02:14 2007 +0000 @@ -368,6 +368,14 @@ data); } +static gboolean +msn_offline_message(const PurpleBuddy *buddy) { + if (buddy == NULL) + return FALSE; + MsnUser *user = buddy->proto_data; + return user && user->mobile; +} + static void initiate_chat_cb(PurpleBlistNode *node, gpointer data) { @@ -2065,7 +2073,7 @@ msn_can_receive_file, /* can_receive_file */ msn_send_file, /* send_file */ msn_new_xfer, /* new_xfer */ - NULL, /* offline_message */ + msn_offline_message, /* offline_message */ NULL, /* whiteboard_prpl_ops */ NULL, /* send_raw */ NULL, /* roomlist_room_serialize */
--- a/libpurple/protocols/msn/user.c Fri May 04 04:01:23 2007 +0000 +++ b/libpurple/protocols/msn/user.c Fri May 04 04:02:14 2007 +0000 @@ -83,7 +83,7 @@ if (user->status != NULL) { if (!strcmp(user->status, "offline") && user->mobile) { - purple_prpl_got_user_status(account, user->passport, "available", NULL); + purple_prpl_got_user_status(account, user->passport, "offline", NULL); purple_prpl_got_user_status(account, user->passport, "mobile", NULL); } else { purple_prpl_got_user_status(account, user->passport, user->status, NULL);