gobjectification: 8ac51fd0: Fix up the propagate.
darkrain42 at pidgin.im
darkrain42 at pidgin.im
Sun Jul 26 23:35:45 EDT 2009
-----------------------------------------------------------------
Revision: 8ac51fd0903eb90bdcd1053d4c6e6f4c3cd51b49
Ancestor: 94b20e7b00c8a2f9a09c8bb5395ee84e171fdaa1
Author: darkrain42 at pidgin.im
Date: 2009-07-26T22:15:42
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/8ac51fd0903eb90bdcd1053d4c6e6f4c3cd51b49
Modified files:
libpurple/chat.c libpurple/protocols/yahoo/libymsg.c
ChangeLog:
Fix up the propagate.
-------------- next part --------------
============================================================
--- libpurple/chat.c abc184e30ae5a2b321af37c0213e5836fb7571cd
+++ libpurple/chat.c 1e3c511b26a60330d7650fed24ca0095cdd50abd
@@ -246,8 +246,8 @@ PurpleChat *purple_chat_new(PurpleAccoun
{
PurpleChat *chat;
- g_return_val_if_fail(account != NULL, FALSE);
- g_return_val_if_fail(components != NULL, FALSE);
+ g_return_val_if_fail(account != NULL, NULL);
+ g_return_val_if_fail(components != NULL, NULL);
chat = g_object_new(PURPLE_CHAT_TYPE,
PROP_ACCOUNT_S, account,
============================================================
--- libpurple/protocols/yahoo/libymsg.c da08a2877a37b9c64c59371a35beb379c1039257
+++ libpurple/protocols/yahoo/libymsg.c deeda0808c1dee3f4ba1e07b16f33c0aa77d3830
@@ -3412,7 +3412,7 @@ void yahoo_login(PurpleAccount *account)
const char *server = NULL;
int pager_port = 0;
- purple_object_set_protocol_data(PURPLE_OBJECT(gc), yd = g_new0(struct yahoo_data, 1));
+ purple_object_set_protocol_data(PURPLE_OBJECT(gc), yd = g_new0(YahooData, 1));
purple_connection_set_flags(gc,
purple_connection_get_flags(gc) | PURPLE_CONNECTION_FLAGS_HTML |
PURPLE_CONNECTION_FLAGS_NO_BGCOLOR | PURPLE_CONNECTION_FLAGS_NO_URLDESC);
@@ -4001,7 +4001,7 @@ yahoo_get_inbox_token_cb(PurpleUtilFetch
}
if (!set_cookie) {
- struct yahoo_data *yd = purple_object_get_protocol_data(PURPLE_OBJECT(gc));
+ YahooData *yd = purple_object_get_protocol_data(PURPLE_OBJECT(gc));
purple_debug_error("yahoo", "No mail login token; forwarding to login screen.\n");
url = g_strdup(yd->jp ? YAHOOJP_MAIL_URL : YAHOO_MAIL_URL);
}
More information about the Commits
mailing list