Mercurial > pidgin
changeset 31974:cdf49237cd35
Convert to using the accessor functions.
| author | andrew.victor@mxit.com |
|---|---|
| date | Fri, 26 Aug 2011 21:21:45 +0000 |
| parents | 49a33bd1baf1 |
| children | e5e81ce9c564 |
| files | pidgin/gtkconv.c pidgin/gtkconv.h |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Fri Aug 26 21:09:27 2011 +0000 +++ b/pidgin/gtkconv.c Fri Aug 26 21:21:45 2011 +0000 @@ -5277,8 +5277,8 @@ PurpleBuddy *b = PURPLE_BUDDY(bn); PurpleConversation *conv; if ((conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, b->name, b->account))) { - if (conv->ui_data) - return conv->ui_data; + if (PIDGIN_CONVERSATION(conv)) + return PIDGIN_CONVERSATION(conv); } } @@ -5366,7 +5366,7 @@ PurpleValue *value; if (conv_type == PURPLE_CONV_TYPE_IM && (gtkconv = pidgin_conv_find_gtkconv(conv))) { - conv->ui_data = gtkconv; + purple_conversation_set_ui_data(conv, gtkconv); if (!g_list_find(gtkconv->convs, conv)) gtkconv->convs = g_list_prepend(gtkconv->convs, conv); pidgin_conv_switch_active_conversation(conv); @@ -5374,7 +5374,7 @@ } gtkconv = g_new0(PidginConversation, 1); - conv->ui_data = gtkconv; + purple_conversation_set_ui_data(conv, gtkconv); gtkconv->active_conv = conv; gtkconv->convs = g_list_prepend(gtkconv->convs, conv); gtkconv->send_history = g_list_append(NULL, NULL); @@ -5401,7 +5401,7 @@ g_free(gtkconv->u.im); g_free(gtkconv); - conv->ui_data = NULL; + purple_conversation_set_ui_data(conv, NULL); return; }
--- a/pidgin/gtkconv.h Fri Aug 26 21:09:27 2011 +0000 +++ b/pidgin/gtkconv.h Fri Aug 26 21:21:45 2011 +0000 @@ -56,7 +56,7 @@ }; #define PIDGIN_CONVERSATION(conv) \ - ((PidginConversation *)(conv)->ui_data) + ((PidginConversation *)purple_conversation_get_ui_data(conv)) #define PIDGIN_IS_PIDGIN_CONVERSATION(conv) \ (purple_conversation_get_ui_ops(conv) == \