Mercurial > pidgin
comparison libpurple/protocols/jabber/jabber.c @ 25221:7b93616f7982
Patch from Darkrain42 to avoid a double-free on status values
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sun, 30 Nov 2008 19:34:11 +0000 |
parents | 0a5540936908 |
children | b4a2ce33b3d5 |
comparison
equal
deleted
inserted
replaced
25220:d0af449f13dc | 25221:7b93616f7982 |
---|---|
1663 NULL); | 1663 NULL); |
1664 types = g_list_append(types, type); | 1664 types = g_list_append(types, type); |
1665 | 1665 |
1666 priority_value = purple_value_new(PURPLE_TYPE_INT); | 1666 priority_value = purple_value_new(PURPLE_TYPE_INT); |
1667 purple_value_set_int(priority_value, 1); | 1667 purple_value_set_int(priority_value, 1); |
1668 buzz_enabled = purple_value_new(PURPLE_TYPE_BOOLEAN); | |
1669 purple_value_set_boolean(buzz_enabled, TRUE); | |
1668 type = purple_status_type_new_with_attrs(PURPLE_STATUS_AVAILABLE, | 1670 type = purple_status_type_new_with_attrs(PURPLE_STATUS_AVAILABLE, |
1669 jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_CHAT), | 1671 jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_CHAT), |
1670 _("Chatty"), TRUE, TRUE, FALSE, | 1672 _("Chatty"), TRUE, TRUE, FALSE, |
1671 "priority", _("Priority"), priority_value, | 1673 "priority", _("Priority"), priority_value, |
1672 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), | 1674 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
1677 NULL); | 1679 NULL); |
1678 types = g_list_append(types, type); | 1680 types = g_list_append(types, type); |
1679 | 1681 |
1680 priority_value = purple_value_new(PURPLE_TYPE_INT); | 1682 priority_value = purple_value_new(PURPLE_TYPE_INT); |
1681 purple_value_set_int(priority_value, 0); | 1683 purple_value_set_int(priority_value, 0); |
1684 buzz_enabled = purple_value_new(PURPLE_TYPE_BOOLEAN); | |
1685 purple_value_set_boolean(buzz_enabled, TRUE); | |
1682 type = purple_status_type_new_with_attrs(PURPLE_STATUS_AWAY, | 1686 type = purple_status_type_new_with_attrs(PURPLE_STATUS_AWAY, |
1683 jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_AWAY), | 1687 jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_AWAY), |
1684 NULL, TRUE, TRUE, FALSE, | 1688 NULL, TRUE, TRUE, FALSE, |
1685 "priority", _("Priority"), priority_value, | 1689 "priority", _("Priority"), priority_value, |
1686 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), | 1690 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
1691 NULL); | 1695 NULL); |
1692 types = g_list_append(types, type); | 1696 types = g_list_append(types, type); |
1693 | 1697 |
1694 priority_value = purple_value_new(PURPLE_TYPE_INT); | 1698 priority_value = purple_value_new(PURPLE_TYPE_INT); |
1695 purple_value_set_int(priority_value, 0); | 1699 purple_value_set_int(priority_value, 0); |
1700 buzz_enabled = purple_value_new(PURPLE_TYPE_BOOLEAN); | |
1701 purple_value_set_boolean(buzz_enabled, TRUE); | |
1696 type = purple_status_type_new_with_attrs(PURPLE_STATUS_EXTENDED_AWAY, | 1702 type = purple_status_type_new_with_attrs(PURPLE_STATUS_EXTENDED_AWAY, |
1697 jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_XA), | 1703 jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_XA), |
1698 NULL, TRUE, TRUE, FALSE, | 1704 NULL, TRUE, TRUE, FALSE, |
1699 "priority", _("Priority"), priority_value, | 1705 "priority", _("Priority"), priority_value, |
1700 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), | 1706 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |