equal
deleted
inserted
replaced
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 XEP0022 |
71 #ifdef XEP0022 |
72 struct jep0022 jep22; |
72 struct xep0022 xep22; |
73 #endif |
73 #endif |
74 #ifdef XEP0085 |
74 #ifdef XEP0085 |
75 struct jep0085 jep85; |
75 struct xep0085 xep85; |
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 |
80 } res; |
80 } res; |
144 return; |
144 return; |
145 g_free((gchar*)p_res->status_msg); |
145 g_free((gchar*)p_res->status_msg); |
146 g_free((gchar*)p_res->name); |
146 g_free((gchar*)p_res->name); |
147 g_free((gchar*)p_res->realjid); |
147 g_free((gchar*)p_res->realjid); |
148 #ifdef XEP0022 |
148 #ifdef XEP0022 |
149 g_free(p_res->jep22.last_msgid_sent); |
149 g_free(p_res->xep22.last_msgid_sent); |
150 g_free(p_res->jep22.last_msgid_rcvd); |
150 g_free(p_res->xep22.last_msgid_rcvd); |
151 #endif |
151 #endif |
152 #ifdef HAVE_GPGME |
152 #ifdef HAVE_GPGME |
153 g_free(p_res->pgpdata.sign_keyid); |
153 g_free(p_res->pgpdata.sign_keyid); |
154 #endif |
154 #endif |
155 g_free(p_res->caps); |
155 g_free(p_res->caps); |
1323 g_free(p_res->caps); |
1323 g_free(p_res->caps); |
1324 p_res->caps = g_strdup(caps); |
1324 p_res->caps = g_strdup(caps); |
1325 } |
1325 } |
1326 } |
1326 } |
1327 |
1327 |
1328 struct jep0022 *buddy_resource_jep22(gpointer rosterdata, const char *resname) |
1328 struct xep0022 *buddy_resource_xep22(gpointer rosterdata, const char *resname) |
1329 { |
1329 { |
1330 #ifdef XEP0022 |
1330 #ifdef XEP0022 |
1331 roster *roster_usr = rosterdata; |
1331 roster *roster_usr = rosterdata; |
1332 res *p_res = get_resource(roster_usr, resname); |
1332 res *p_res = get_resource(roster_usr, resname); |
1333 if (p_res) |
1333 if (p_res) |
1334 return &p_res->jep22; |
1334 return &p_res->xep22; |
1335 #endif |
1335 #endif |
1336 return NULL; |
1336 return NULL; |
1337 } |
1337 } |
1338 |
1338 |
1339 struct jep0085 *buddy_resource_jep85(gpointer rosterdata, const char *resname) |
1339 struct xep0085 *buddy_resource_xep85(gpointer rosterdata, const char *resname) |
1340 { |
1340 { |
1341 #ifdef XEP0085 |
1341 #ifdef XEP0085 |
1342 roster *roster_usr = rosterdata; |
1342 roster *roster_usr = rosterdata; |
1343 res *p_res = get_resource(roster_usr, resname); |
1343 res *p_res = get_resource(roster_usr, resname); |
1344 if (p_res) |
1344 if (p_res) |
1345 return &p_res->jep85; |
1345 return &p_res->xep85; |
1346 #endif |
1346 #endif |
1347 return NULL; |
1347 return NULL; |
1348 } |
1348 } |
1349 |
1349 |
1350 struct pgp_data *buddy_resource_pgp(gpointer rosterdata, const char *resname) |
1350 struct pgp_data *buddy_resource_pgp(gpointer rosterdata, const char *resname) |