Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/roster.c @ 1691:b2e0083891cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace JEP with XEP
author Mikael Berthe <mikael@lilotux.net>
date Sat, 06 Feb 2010 18:16:06 +0100
parents 41c26b7d2890
children 15e6b21df606
comparison
equal deleted inserted replaced
1690:46f1cf3b6373 1691:b2e0083891cc
66 enum imrole role; 66 enum imrole role;
67 enum imaffiliation affil; 67 enum imaffiliation affil;
68 gchar *realjid; /* for chatrooms, if buddy's real jid is known */ 68 gchar *realjid; /* for chatrooms, if buddy's real jid is known */
69 guint events; 69 guint events;
70 char *caps; 70 char *caps;
71 #ifdef JEP0022 71 #ifdef XEP0022
72 struct jep0022 jep22; 72 struct jep0022 jep22;
73 #endif 73 #endif
74 #ifdef JEP0085 74 #ifdef XEP0085
75 struct jep0085 jep85; 75 struct jep0085 jep85;
76 #endif 76 #endif
77 #ifdef HAVE_GPGME 77 #ifdef HAVE_GPGME
78 struct pgp_data pgpdata; 78 struct pgp_data pgpdata;
79 #endif 79 #endif
142 if (!p_res) 142 if (!p_res)
143 return; 143 return;
144 g_free((gchar*)p_res->status_msg); 144 g_free((gchar*)p_res->status_msg);
145 g_free((gchar*)p_res->name); 145 g_free((gchar*)p_res->name);
146 g_free((gchar*)p_res->realjid); 146 g_free((gchar*)p_res->realjid);
147 #ifdef JEP0022 147 #ifdef XEP0022
148 g_free(p_res->jep22.last_msgid_sent); 148 g_free(p_res->jep22.last_msgid_sent);
149 g_free(p_res->jep22.last_msgid_rcvd); 149 g_free(p_res->jep22.last_msgid_rcvd);
150 #endif 150 #endif
151 #ifdef HAVE_GPGME 151 #ifdef HAVE_GPGME
152 g_free(p_res->pgpdata.sign_keyid); 152 g_free(p_res->pgpdata.sign_keyid);
1218 } 1218 }
1219 } 1219 }
1220 1220
1221 struct jep0022 *buddy_resource_jep22(gpointer rosterdata, const char *resname) 1221 struct jep0022 *buddy_resource_jep22(gpointer rosterdata, const char *resname)
1222 { 1222 {
1223 #ifdef JEP0022 1223 #ifdef XEP0022
1224 roster *roster_usr = rosterdata; 1224 roster *roster_usr = rosterdata;
1225 res *p_res = get_resource(roster_usr, resname); 1225 res *p_res = get_resource(roster_usr, resname);
1226 if (p_res) 1226 if (p_res)
1227 return &p_res->jep22; 1227 return &p_res->jep22;
1228 #endif 1228 #endif
1229 return NULL; 1229 return NULL;
1230 } 1230 }
1231 1231
1232 struct jep0085 *buddy_resource_jep85(gpointer rosterdata, const char *resname) 1232 struct jep0085 *buddy_resource_jep85(gpointer rosterdata, const char *resname)
1233 { 1233 {
1234 #ifdef JEP0085 1234 #ifdef XEP0085
1235 roster *roster_usr = rosterdata; 1235 roster *roster_usr = rosterdata;
1236 res *p_res = get_resource(roster_usr, resname); 1236 res *p_res = get_resource(roster_usr, resname);
1237 if (p_res) 1237 if (p_res)
1238 return &p_res->jep85; 1238 return &p_res->jep85;
1239 #endif 1239 #endif