Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/roster.c @ 2165:db6ca1e1e082

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove support for obsolete XEP 22
author franky
date Fri, 17 Oct 2014 22:33:19 +0200
parents e04b6dfbb054
children f5402d705f67
comparison
equal deleted inserted replaced
2164:038c4d601011 2165:db6ca1e1e082
73 enum imrole role; 73 enum imrole role;
74 enum imaffiliation affil; 74 enum imaffiliation affil;
75 gchar *realjid; /* for chatrooms, if buddy's real jid is known */ 75 gchar *realjid; /* for chatrooms, if buddy's real jid is known */
76 guint events; 76 guint events;
77 char *caps; 77 char *caps;
78 #ifdef XEP0022
79 struct xep0022 xep22;
80 #endif
81 #ifdef XEP0085 78 #ifdef XEP0085
82 struct xep0085 xep85; 79 struct xep0085 xep85;
83 #endif 80 #endif
84 #ifdef HAVE_GPGME 81 #ifdef HAVE_GPGME
85 struct pgp_data pgpdata; 82 struct pgp_data pgpdata;
153 if (!p_res) 150 if (!p_res)
154 return; 151 return;
155 g_free((gchar*)p_res->status_msg); 152 g_free((gchar*)p_res->status_msg);
156 g_free((gchar*)p_res->name); 153 g_free((gchar*)p_res->name);
157 g_free((gchar*)p_res->realjid); 154 g_free((gchar*)p_res->realjid);
158 #ifdef XEP0022
159 g_free(p_res->xep22.last_msgid_sent);
160 g_free(p_res->xep22.last_msgid_rcvd);
161 #endif
162 #ifdef HAVE_GPGME 155 #ifdef HAVE_GPGME
163 g_free(p_res->pgpdata.sign_keyid); 156 g_free(p_res->pgpdata.sign_keyid);
164 #endif 157 #endif
165 g_free(p_res->caps); 158 g_free(p_res->caps);
166 g_free(p_res); 159 g_free(p_res);
1355 g_free(p_res->caps); 1348 g_free(p_res->caps);
1356 p_res->caps = g_strdup(caps); 1349 p_res->caps = g_strdup(caps);
1357 } 1350 }
1358 } 1351 }
1359 1352
1360 struct xep0022 *buddy_resource_xep22(gpointer rosterdata, const char *resname)
1361 {
1362 #ifdef XEP0022
1363 roster *roster_usr = rosterdata;
1364 res *p_res = get_resource(roster_usr, resname);
1365 if (p_res)
1366 return &p_res->xep22;
1367 #endif
1368 return NULL;
1369 }
1370
1371 struct xep0085 *buddy_resource_xep85(gpointer rosterdata, const char *resname) 1353 struct xep0085 *buddy_resource_xep85(gpointer rosterdata, const char *resname)
1372 { 1354 {
1373 #ifdef XEP0085 1355 #ifdef XEP0085
1374 roster *roster_usr = rosterdata; 1356 roster *roster_usr = rosterdata;
1375 res *p_res = get_resource(roster_usr, resname); 1357 res *p_res = get_resource(roster_usr, resname);