Mercurial > pidgin
comparison libpurple/protocols/jabber/jabber.c @ 20278:92d14ab89e6e
applied changes from 99f8d517ae6588b2dba3527cb0951f32e640ff57
through c96ba4911be2d71dc65eafb95c21c387e3d05210
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Sat, 29 Sep 2007 04:33:19 +0000 |
parents | c1d3d25e8c49 |
children | 53afc5cce143 39737dfe1cca 15f61e6b15cd |
comparison
equal
deleted
inserted
replaced
20277:c37128d87d5a | 20278:92d14ab89e6e |
---|---|
1530 NULL, TRUE, TRUE, FALSE, | 1530 NULL, TRUE, TRUE, FALSE, |
1531 "priority", _("Priority"), priority_value, | 1531 "priority", _("Priority"), priority_value, |
1532 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), | 1532 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
1533 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), | 1533 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), |
1534 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), | 1534 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), |
1535 "tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), | 1535 PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), |
1536 "tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), | 1536 PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), |
1537 "tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), | 1537 PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), |
1538 "tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), | 1538 PURPLE_TUNE_GENRE, _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), |
1539 "tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), | 1539 PURPLE_TUNE_COMMENT, _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), |
1540 "tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), | 1540 PURPLE_TUNE_TRACK, _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), |
1541 "tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), | 1541 PURPLE_TUNE_TIME, _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), |
1542 "tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), | 1542 PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), |
1543 "tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), | 1543 PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), |
1544 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), | 1544 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), |
1545 "buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN), | 1545 "buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN), |
1546 NULL); | 1546 NULL); |
1547 types = g_list_append(types, type); | 1547 types = g_list_append(types, type); |
1548 | 1548 |
1553 _("Chatty"), TRUE, TRUE, FALSE, | 1553 _("Chatty"), TRUE, TRUE, FALSE, |
1554 "priority", _("Priority"), priority_value, | 1554 "priority", _("Priority"), priority_value, |
1555 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), | 1555 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
1556 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), | 1556 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), |
1557 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), | 1557 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), |
1558 "tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), | 1558 PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), |
1559 "tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), | 1559 PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), |
1560 "tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), | 1560 PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), |
1561 "tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), | 1561 PURPLE_TUNE_GENRE, _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), |
1562 "tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), | 1562 PURPLE_TUNE_COMMENT, _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), |
1563 "tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), | 1563 PURPLE_TUNE_TRACK, _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), |
1564 "tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), | 1564 PURPLE_TUNE_TIME, _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), |
1565 "tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), | 1565 PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), |
1566 "tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), | 1566 PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), |
1567 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), | 1567 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), |
1568 "buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN), | 1568 "buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN), |
1569 NULL); | 1569 NULL); |
1570 types = g_list_append(types, type); | 1570 types = g_list_append(types, type); |
1571 | 1571 |
1576 NULL, TRUE, TRUE, FALSE, | 1576 NULL, TRUE, TRUE, FALSE, |
1577 "priority", _("Priority"), priority_value, | 1577 "priority", _("Priority"), priority_value, |
1578 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), | 1578 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
1579 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), | 1579 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), |
1580 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), | 1580 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), |
1581 "tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), | 1581 PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), |
1582 "tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), | 1582 PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), |
1583 "tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), | 1583 PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), |
1584 "tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), | 1584 PURPLE_TUNE_GENRE, _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), |
1585 "tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), | 1585 PURPLE_TUNE_COMMENT, _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), |
1586 "tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), | 1586 PURPLE_TUNE_TRACK, _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), |
1587 "tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), | 1587 PURPLE_TUNE_TIME, _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), |
1588 "tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), | 1588 PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), |
1589 "tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), | 1589 PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), |
1590 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), | 1590 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), |
1591 "buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN), | 1591 "buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN), |
1592 NULL); | 1592 NULL); |
1593 types = g_list_append(types, type); | 1593 types = g_list_append(types, type); |
1594 | 1594 |
1599 NULL, TRUE, TRUE, FALSE, | 1599 NULL, TRUE, TRUE, FALSE, |
1600 "priority", _("Priority"), priority_value, | 1600 "priority", _("Priority"), priority_value, |
1601 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), | 1601 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
1602 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), | 1602 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), |
1603 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), | 1603 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), |
1604 "tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), | 1604 PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), |
1605 "tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), | 1605 PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), |
1606 "tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), | 1606 PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), |
1607 "tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), | 1607 PURPLE_TUNE_GENRE, _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), |
1608 "tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), | 1608 PURPLE_TUNE_COMMENT, _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), |
1609 "tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), | 1609 PURPLE_TUNE_TRACK, _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), |
1610 "tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), | 1610 PURPLE_TUNE_TIME, _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), |
1611 "tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), | 1611 PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), |
1612 "tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), | 1612 PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), |
1613 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), | 1613 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), |
1614 "buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN), | 1614 "buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN), |
1615 NULL); | 1615 NULL); |
1616 types = g_list_append(types, type); | 1616 types = g_list_append(types, type); |
1617 | 1617 |
1622 _("Do Not Disturb"), TRUE, TRUE, FALSE, | 1622 _("Do Not Disturb"), TRUE, TRUE, FALSE, |
1623 "priority", _("Priority"), priority_value, | 1623 "priority", _("Priority"), priority_value, |
1624 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), | 1624 "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
1625 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), | 1625 "mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING), |
1626 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), | 1626 "moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING), |
1627 "tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), | 1627 PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING), |
1628 "tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), | 1628 PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING), |
1629 "tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), | 1629 PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING), |
1630 "tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), | 1630 PURPLE_TUNE_GENRE, _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING), |
1631 "tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), | 1631 PURPLE_TUNE_COMMENT, _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING), |
1632 "tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), | 1632 PURPLE_TUNE_TRACK, _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING), |
1633 "tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), | 1633 PURPLE_TUNE_TIME, _("Tune Time"), purple_value_new(PURPLE_TYPE_INT), |
1634 "tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), | 1634 PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT), |
1635 "tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), | 1635 PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING), |
1636 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), | 1636 "nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING), |
1637 "buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN), | 1637 "buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN), |
1638 NULL); | 1638 NULL); |
1639 types = g_list_append(types, type); | 1639 types = g_list_append(types, type); |
1640 | 1640 |