Mercurial > pidgin.yaz
comparison libpurple/conversation.c @ 32767:2ec94166be43
On the way to hiding the PurpleConnection struct.
* Added purple_connection_get_flags() and purple_connection_set_flags()
* Use purple_connection_ accessor functions.
author | andrew.victor@mxit.com |
---|---|
date | Tue, 18 Oct 2011 18:47:48 +0000 |
parents | 3555d352ee4a |
children | 75104780b1a3 |
comparison
equal
deleted
inserted
replaced
32766:ea2b621fd3ba | 32767:2ec94166be43 |
---|---|
491 conv->name = g_strdup(name); | 491 conv->name = g_strdup(name); |
492 conv->title = g_strdup(name); | 492 conv->title = g_strdup(name); |
493 conv->data = g_hash_table_new_full(g_str_hash, g_str_equal, | 493 conv->data = g_hash_table_new_full(g_str_hash, g_str_equal, |
494 g_free, NULL); | 494 g_free, NULL); |
495 /* copy features from the connection. */ | 495 /* copy features from the connection. */ |
496 conv->features = gc->flags; | 496 conv->features = purple_connection_get_flags(gc); |
497 | 497 |
498 if (type == PURPLE_CONV_TYPE_IM) | 498 if (type == PURPLE_CONV_TYPE_IM) |
499 { | 499 { |
500 PurpleBuddyIcon *icon; | 500 PurpleBuddyIcon *icon; |
501 conv->u.im = g_new0(PurpleConvIm, 1); | 501 conv->u.im = g_new0(PurpleConvIm, 1); |
1787 if (display_name != NULL) | 1787 if (display_name != NULL) |
1788 alias = display_name; | 1788 alias = display_name; |
1789 } | 1789 } |
1790 } else { | 1790 } else { |
1791 PurpleBuddy *buddy; | 1791 PurpleBuddy *buddy; |
1792 if ((buddy = purple_find_buddy(gc->account, user)) != NULL) | 1792 if ((buddy = purple_find_buddy(purple_connection_get_account(gc), user)) != NULL) |
1793 alias = purple_buddy_get_contact_alias(buddy); | 1793 alias = purple_buddy_get_contact_alias(buddy); |
1794 } | 1794 } |
1795 } | 1795 } |
1796 | 1796 |
1797 quiet = GPOINTER_TO_INT(purple_signal_emit_return_1(purple_conversations_get_handle(), | 1797 quiet = GPOINTER_TO_INT(purple_signal_emit_return_1(purple_conversations_get_handle(), |
1885 alias = display_name; | 1885 alias = display_name; |
1886 } | 1886 } |
1887 } | 1887 } |
1888 } else if (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { | 1888 } else if (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { |
1889 PurpleBuddy *buddy; | 1889 PurpleBuddy *buddy; |
1890 if ((buddy = purple_find_buddy(gc->account, new_user)) != NULL) | 1890 if ((buddy = purple_find_buddy(purple_connection_get_account(gc), new_user)) != NULL) |
1891 new_alias = purple_buddy_get_contact_alias(buddy); | 1891 new_alias = purple_buddy_get_contact_alias(buddy); |
1892 } | 1892 } |
1893 | 1893 |
1894 flags = purple_conv_chat_user_get_flags(chat, old_user); | 1894 flags = purple_conv_chat_user_get_flags(chat, old_user); |
1895 cb = purple_conv_chat_cb_new(new_user, new_alias, flags); | 1895 cb = purple_conv_chat_cb_new(new_user, new_alias, flags); |
1934 char *escaped2; | 1934 char *escaped2; |
1935 | 1935 |
1936 if (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { | 1936 if (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { |
1937 PurpleBuddy *buddy; | 1937 PurpleBuddy *buddy; |
1938 | 1938 |
1939 if ((buddy = purple_find_buddy(gc->account, old_user)) != NULL) | 1939 if ((buddy = purple_find_buddy(purple_connection_get_account(gc), old_user)) != NULL) |
1940 old_alias = purple_buddy_get_contact_alias(buddy); | 1940 old_alias = purple_buddy_get_contact_alias(buddy); |
1941 if ((buddy = purple_find_buddy(gc->account, new_user)) != NULL) | 1941 if ((buddy = purple_find_buddy(purple_connection_get_account(gc), new_user)) != NULL) |
1942 new_alias = purple_buddy_get_contact_alias(buddy); | 1942 new_alias = purple_buddy_get_contact_alias(buddy); |
1943 } | 1943 } |
1944 | 1944 |
1945 escaped = g_markup_escape_text(old_alias, -1); | 1945 escaped = g_markup_escape_text(old_alias, -1); |
1946 escaped2 = g_markup_escape_text(new_alias, -1); | 1946 escaped2 = g_markup_escape_text(new_alias, -1); |
2011 char *tmp; | 2011 char *tmp; |
2012 | 2012 |
2013 if (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { | 2013 if (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { |
2014 PurpleBuddy *buddy; | 2014 PurpleBuddy *buddy; |
2015 | 2015 |
2016 if ((buddy = purple_find_buddy(gc->account, user)) != NULL) | 2016 if ((buddy = purple_find_buddy(purple_connection_get_account(gc), user)) != NULL) |
2017 alias = purple_buddy_get_contact_alias(buddy); | 2017 alias = purple_buddy_get_contact_alias(buddy); |
2018 } | 2018 } |
2019 | 2019 |
2020 alias_esc = g_markup_escape_text(alias, -1); | 2020 alias_esc = g_markup_escape_text(alias, -1); |
2021 | 2021 |