comparison: src/protocols/sametime/sametime.c
src/protocols/sametime/sametime.c
- changeset 13713
- 1ae8790174a4
- parent 13641
- 1173f8ca3fbf
- child 13779
- 410869639392
equal
deleted
inserted
replaced
| 13712:fa55fb41ed0d | 13713:1ae8790174a4 |
|---|---|
| 1174 guint32 result, struct mwStorageUnit *item, | 1174 guint32 result, struct mwStorageUnit *item, |
| 1175 gpointer data) { | 1175 gpointer data) { |
| 1176 | 1176 |
| 1177 struct mwGaimPluginData *pd = data; | 1177 struct mwGaimPluginData *pd = data; |
| 1178 struct mwSametimeList *stlist; | 1178 struct mwSametimeList *stlist; |
| 1179 struct mwSession *s; | |
| 1180 | 1179 |
| 1181 struct mwGetBuffer *b; | 1180 struct mwGetBuffer *b; |
| 1182 | 1181 |
| 1183 g_return_if_fail(result == ERR_SUCCESS); | 1182 g_return_if_fail(result == ERR_SUCCESS); |
| 1184 | 1183 |
| 1190 | 1189 |
| 1191 b = mwGetBuffer_wrap(mwStorageUnit_asOpaque(item)); | 1190 b = mwGetBuffer_wrap(mwStorageUnit_asOpaque(item)); |
| 1192 | 1191 |
| 1193 stlist = mwSametimeList_new(); | 1192 stlist = mwSametimeList_new(); |
| 1194 mwSametimeList_get(b, stlist); | 1193 mwSametimeList_get(b, stlist); |
| 1195 | |
| 1196 s = mwService_getSession(MW_SERVICE(srvc)); | |
| 1197 | 1194 |
| 1198 /* merge or synch depending on preferences */ | 1195 /* merge or synch depending on preferences */ |
| 1199 if(BLIST_PREF_IS_MERGE() || BLIST_PREF_IS_STORE()) { | 1196 if(BLIST_PREF_IS_MERGE() || BLIST_PREF_IS_STORE()) { |
| 1200 blist_merge(pd->gc, stlist); | 1197 blist_merge(pd->gc, stlist); |
| 1201 | 1198 |
| 2613 | 2610 |
| 2614 static void im_recv_mime(struct mwConversation *conv, | 2611 static void im_recv_mime(struct mwConversation *conv, |
| 2615 struct mwGaimPluginData *pd, | 2612 struct mwGaimPluginData *pd, |
| 2616 const char *data) { | 2613 const char *data) { |
| 2617 | 2614 |
| 2618 struct mwIdBlock *idb; | |
| 2619 | |
| 2620 GHashTable *img_by_cid; | 2615 GHashTable *img_by_cid; |
| 2621 GList *images; | 2616 GList *images; |
| 2622 | 2617 |
| 2623 GString *str; | 2618 GString *str; |
| 2624 | 2619 |
| 2625 GaimMimeDocument *doc; | 2620 GaimMimeDocument *doc; |
| 2626 const GList *parts; | 2621 const GList *parts; |
| 2627 | |
| 2628 idb = mwConversation_getTarget(conv); | |
| 2629 | 2622 |
| 2630 img_by_cid = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); | 2623 img_by_cid = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); |
| 2631 images = NULL; | 2624 images = NULL; |
| 2632 | 2625 |
| 2633 /* don't want the contained string to ever be NULL */ | 2626 /* don't want the contained string to ever be NULL */ |
