Mercurial > pidgin.yaz

comparison libpurple/protocols/bonjour/bonjour.c @ 32440:e895aebcb504

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Convert bonjour prpl to use accessor functions purple_connection_get_protocol_data() and purple_connection_set_protocol_data().
author andrew.victor@mxit.com
date Mon, 29 Aug 2011 21:32:30 +0000
parents 99ca503ea087
children cd1d9e04c587
comparison
equal deleted inserted replaced
32436:50cdd401274a 32440:e895aebcb504
49 49
50 const char * 50 const char *
51 bonjour_get_jid(PurpleAccount *account) 51 bonjour_get_jid(PurpleAccount *account)
52 { 52 {
53 PurpleConnection *conn = purple_account_get_connection(account); 53 PurpleConnection *conn = purple_account_get_connection(account);
54 BonjourData *bd = conn->proto_data; 54 BonjourData *bd = purple_connection_get_protocol_data(conn);
55 return bd->jid; 55 return bd->jid;
56 } 56 }
57 57
58 static void 58 static void
59 bonjour_removeallfromlocal(PurpleConnection *conn, PurpleGroup *bonjour_group) 59 bonjour_removeallfromlocal(PurpleConnection *conn, PurpleGroup *bonjour_group)
101 return; 101 return;
102 } 102 }
103 #endif /* _WIN32 */ 103 #endif /* _WIN32 */
104 104
105 gc->flags |= PURPLE_CONNECTION_HTML; 105 gc->flags |= PURPLE_CONNECTION_HTML;
106 gc->proto_data = bd = g_new0(BonjourData, 1); 106 bd = g_new0(BonjourData, 1);
107 purple_connection_set_protocol_data(gc, bd);
107 108
108 /* Start waiting for jabber connections (iChat style) */ 109 /* Start waiting for jabber connections (iChat style) */
109 bd->jabber_data = g_new0(BonjourJabber, 1); 110 bd->jabber_data = g_new0(BonjourJabber, 1);
110 bd->jabber_data->socket = -1; 111 bd->jabber_data->socket = -1;
111 bd->jabber_data->socket6 = -1; 112 bd->jabber_data->socket6 = -1;
155 156
156 static void 157 static void
157 bonjour_close(PurpleConnection *connection) 158 bonjour_close(PurpleConnection *connection)
158 { 159 {
159 PurpleGroup *bonjour_group; 160 PurpleGroup *bonjour_group;
160 BonjourData *bd = connection->proto_data; 161 BonjourData *bd = purple_connection_get_protocol_data(connection);
161 162
162 bonjour_group = purple_find_group(BONJOUR_GROUP_NAME); 163 bonjour_group = purple_find_group(BONJOUR_GROUP_NAME);
163 164
164 /* Remove all the bonjour buddies */ 165 /* Remove all the bonjour buddies */
165 bonjour_removeallfromlocal(connection, bonjour_group); 166 bonjour_removeallfromlocal(connection, bonjour_group);
190 } 191 }
191 192
192 if (bd != NULL) 193 if (bd != NULL)
193 g_free(bd->jid); 194 g_free(bd->jid);
194 g_free(bd); 195 g_free(bd);
195 connection->proto_data = NULL; 196 purple_connection_set_protocol_data(connection, NULL);
196 } 197 }
197 198
198 static const char * 199 static const char *
199 bonjour_list_icon(PurpleAccount *account, PurpleBuddy *buddy) 200 bonjour_list_icon(PurpleAccount *account, PurpleBuddy *buddy)
200 { 201 {
202 } 203 }
203 204
204 static int 205 static int
205 bonjour_send_im(PurpleConnection *connection, const char *to, const char *msg, PurpleMessageFlags flags) 206 bonjour_send_im(PurpleConnection *connection, const char *to, const char *msg, PurpleMessageFlags flags)
206 { 207 {
208 BonjourData *bd = purple_connection_get_protocol_data(connection);
209
207 if(!to || !msg) 210 if(!to || !msg)
208 return 0; 211 return 0;
209 212
210 return bonjour_jabber_send_message(((BonjourData*)(connection->proto_data))->jabber_data, to, msg); 213 return bonjour_jabber_send_message(bd->jabber_data, to, msg);
211 } 214 }
212 215
213 static void 216 static void
214 bonjour_set_status(PurpleAccount *account, PurpleStatus *status) 217 bonjour_set_status(PurpleAccount *account, PurpleStatus *status)
215 { 218 {
218 PurplePresence *presence; 221 PurplePresence *presence;
219 const char *message, *bonjour_status; 222 const char *message, *bonjour_status;
220 gchar *stripped; 223 gchar *stripped;
221 224
222 gc = purple_account_get_connection(account); 225 gc = purple_account_get_connection(account);
223 bd = gc->proto_data; 226 bd = purple_connection_get_protocol_data(gc);
224 presence = purple_account_get_presence(account); 227 presence = purple_account_get_presence(account);
225 228
226 message = purple_status_get_attr_string(status, "message"); 229 message = purple_status_get_attr_string(status, "message");
227 if (message == NULL) 230 if (message == NULL)
228 message = ""; 231 message = "";
323 } 326 }
324 327
325 static 328 static
326 void bonjour_set_buddy_icon(PurpleConnection *conn, PurpleStoredImage *img) 329 void bonjour_set_buddy_icon(PurpleConnection *conn, PurpleStoredImage *img)
327 { 330 {
328 BonjourData *bd = conn->proto_data; 331 BonjourData *bd = purple_connection_get_protocol_data(conn);
329 bonjour_dns_sd_update_buddy_icon(bd->dns_sd_data); 332 bonjour_dns_sd_update_buddy_icon(bd->dns_sd_data);
330 } 333 }
331 334
332 335
333 static char * 336 static char *