Mercurial > pidgin.yaz
changeset 16875:8c19752df0e6
merge of '2882b6ab8f7547ad0d1682e61648c6fe29a36f8a'
and '5cfdf53a0df94294f9feecae6d7dd22133bcb9ad'
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Fri, 04 May 2007 04:14:46 +0000 |
parents | 38b3ca4b353d (diff) 1a1e5a68990c (current diff) |
children | 38c134e2556b |
files | |
diffstat | 5 files changed, 30 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Fri May 04 04:14:19 2007 +0000 +++ b/NEWS Fri May 04 04:14:46 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:14:19 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Fri May 04 04:14:46 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:14:19 2007 +0000 +++ b/libpurple/protocols/msn/user.c Fri May 04 04:14:46 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);
--- a/libpurple/util.c Fri May 04 04:14:19 2007 +0000 +++ b/libpurple/util.c Fri May 04 04:14:46 2007 +0000 @@ -2522,9 +2522,7 @@ purple_mkstemp(char **fpath, gboolean binary) { const gchar *tmpdir; -#ifndef _WIN32 int fd; -#endif FILE *fp = NULL; g_return_val_if_fail(fpath != NULL, NULL); @@ -2532,19 +2530,11 @@ if((tmpdir = (gchar*)g_get_tmp_dir()) != NULL) { if((*fpath = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", tmpdir, purple_mkstemp_templ)) != NULL) { #ifdef _WIN32 - char* result = _mktemp( *fpath ); - if( result == NULL ) - purple_debug(PURPLE_DEBUG_ERROR, "purple_mkstemp", - "Problem creating the template\n"); - else - { - if( (fp = g_fopen( result, binary?"wb+":"w+")) == NULL ) { - purple_debug(PURPLE_DEBUG_ERROR, "purple_mkstemp", - "Couldn't fopen() %s\n", result); - } - } + fd = g_mkstemp(*fpath); #else - if((fd = mkstemp(*fpath)) == -1) { + fd = mkstemp(*fpath)); +#endif + if(fd == -1) { purple_debug(PURPLE_DEBUG_ERROR, "purple_mkstemp", "Couldn't make \"%s\", error: %d\n", *fpath, errno); @@ -2555,7 +2545,7 @@ "Couldn't fdopen(), error: %d\n", errno); } } -#endif + if(!fp) { g_free(*fpath); *fpath = NULL;
--- a/pidgin/gtkdocklet.c Fri May 04 04:14:19 2007 +0000 +++ b/pidgin/gtkdocklet.c Fri May 04 04:14:46 2007 +0000 @@ -648,6 +648,7 @@ void *conn_handle = purple_connections_get_handle(); void *conv_handle = purple_conversations_get_handle(); void *accounts_handle = purple_accounts_get_handle(); + void *status_handle = purple_savedstatuses_get_handle(); void *docklet_handle = pidgin_docklet_get_handle(); purple_prefs_add_none(PIDGIN_PREFS_ROOT "/docklet"); @@ -664,7 +665,7 @@ docklet_handle, PURPLE_CALLBACK(docklet_signed_on_cb), NULL); purple_signal_connect(conn_handle, "signed-off", docklet_handle, PURPLE_CALLBACK(docklet_signed_off_cb), NULL); - purple_signal_connect(accounts_handle, "account-status-changed", + purple_signal_connect(accounts_handle, "account-connecting", docklet_handle, PURPLE_CALLBACK(docklet_update_status_cb), NULL); purple_signal_connect(conv_handle, "received-im-msg", docklet_handle, PURPLE_CALLBACK(docklet_update_status_cb), NULL); @@ -674,6 +675,8 @@ docklet_handle, PURPLE_CALLBACK(docklet_update_status_cb), NULL); purple_signal_connect(conv_handle, "conversation-updated", docklet_handle, PURPLE_CALLBACK(docklet_conv_updated_cb), NULL); + purple_signal_connect(status_handle, "savedstatus-changed", + docklet_handle, PURPLE_CALLBACK(docklet_update_status_cb), NULL); #if 0 purple_signal_connect(purple_get_core(), "quitting", docklet_handle, PURPLE_CALLBACK(purple_quit_cb), NULL);