Mercurial > pidgin.yaz
changeset 11054:bc700cc98b82
[gaim-migrate @ 12992]
Patch #1218079 from Stanislav Brabec
"Attached patch adds basic support for Novell Groupwise to Gaim Evolution integration."
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 03 Jul 2005 06:42:16 +0000 |
| parents | da05145441ca |
| children | df0241eb602c |
| files | ChangeLog plugins/gevolution/add_buddy_dialog.c plugins/gevolution/gevo-util.c plugins/gevolution/gevolution.c plugins/gevolution/new_person_dialog.c |
| diffstat | 5 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jul 03 06:12:50 2005 +0000 +++ b/ChangeLog Sun Jul 03 06:42:16 2005 +0000 @@ -41,6 +41,7 @@ transfer window * Newly installed plugins can now be activated without restarting Gaim (Sadrul Habib Chowdhury) + * The Evolution Integration plugin now supports Groupwise contacts Bug fixes: * People using input methods can now use Enter again.
--- a/plugins/gevolution/add_buddy_dialog.c Sun Jul 03 06:12:50 2005 +0000 +++ b/plugins/gevolution/add_buddy_dialog.c Sun Jul 03 06:42:16 2005 +0000 @@ -291,7 +291,7 @@ { EContact *contact = E_CONTACT(c->data); const char *name; - GList *aims, *jabbers, *yahoos, *msns, *icqs; + GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells; name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); @@ -300,9 +300,10 @@ yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO); msns = e_contact_get(contact, E_CONTACT_IM_MSN); icqs = e_contact_get(contact, E_CONTACT_IM_ICQ); + novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE); if (aims == NULL && jabbers == NULL && yahoos == NULL && - msns == NULL && icqs == NULL) + msns == NULL && icqs == NULL && novells == NULL) { GtkTreeIter iter; @@ -320,6 +321,7 @@ add_ims(dialog, contact, name, yahoos, "prpl-yahoo"); add_ims(dialog, contact, name, msns, "prpl-msn"); add_ims(dialog, contact, name, icqs, "prpl-oscar"); + add_ims(dialog, contact, name, novells, "prpl-novell"); } } @@ -361,7 +363,7 @@ { EContact *contact = E_CONTACT(l->data); const char *name; - GList *aims, *jabbers, *yahoos, *msns, *icqs; + GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells; name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); @@ -376,9 +378,10 @@ yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO); msns = e_contact_get(contact, E_CONTACT_IM_MSN); icqs = e_contact_get(contact, E_CONTACT_IM_ICQ); + novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE); if (aims == NULL && jabbers == NULL && yahoos == NULL && - msns == NULL && icqs == NULL) + msns == NULL && icqs == NULL && novells == NULL) { GtkTreeIter iter; @@ -396,6 +399,7 @@ add_ims(dialog, contact, name, yahoos, "prpl-yahoo"); add_ims(dialog, contact, name, msns, "prpl-msn"); add_ims(dialog, contact, name, icqs, "prpl-oscar"); + add_ims(dialog, contact, name, novells, "prpl-novell"); } } }
--- a/plugins/gevolution/gevo-util.c Sun Jul 03 06:12:50 2005 +0000 +++ b/plugins/gevolution/gevo-util.c Sun Jul 03 06:42:16 2005 +0000 @@ -112,6 +112,8 @@ protocol_field = E_CONTACT_IM_YAHOO; else if (!strcmp(protocol_id, "prpl-jabber")) protocol_field = E_CONTACT_IM_JABBER; + else if (!strcmp(protocol_id, "prpl-novell")) + protocol_field = E_CONTACT_IM_GROUPWISE; return protocol_field; }
--- a/plugins/gevolution/gevolution.c Sun Jul 03 06:12:50 2005 +0000 +++ b/plugins/gevolution/gevolution.c Sun Jul 03 06:42:16 2005 +0000 @@ -111,6 +111,7 @@ update_ims_from_contact(contact, name, "prpl-yahoo", E_CONTACT_IM_YAHOO); update_ims_from_contact(contact, name, "prpl-msn", E_CONTACT_IM_MSN); update_ims_from_contact(contact, name, "prpl-oscar", E_CONTACT_IM_ICQ); + update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE); } static void
--- a/plugins/gevolution/new_person_dialog.c Sun Jul 03 06:12:50 2005 +0000 +++ b/plugins/gevolution/new_person_dialog.c Sun Jul 03 06:42:16 2005 +0000 @@ -154,6 +154,8 @@ field = E_CONTACT_IM_JABBER; else if (!strcmp(im_service, "prpl-msn")) field = E_CONTACT_IM_MSN; + else if (!strcmp(im_service, "prpl-novell")) + field = E_CONTACT_IM_GROUPWISE; if (field > 0) {