- Timestamp:
- 2010-08-24T12:19:52Z (14 years ago)
- Branches:
- master
- Children:
- b78c4b9
- Parents:
- 9b1d2d6 (diff), bd599b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - Location:
- protocols
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/bee.h
r9b1d2d6 rea728e6 123 123 gboolean (*chat_topic)( bee_t *bee, struct groupchat *c, const char *new, bee_user_t *bu ); 124 124 gboolean (*chat_name_hint)( bee_t *bee, struct groupchat *c, const char *name ); 125 gboolean (*chat_invite)( bee_t *bee, bee_user_t *bu, const char *name, const char *msg ); 125 126 126 127 struct file_transfer* (*ft_in_start)( bee_t *bee, bee_user_t *bu, const char *file_name, size_t file_size ); … … 176 177 G_MODULE_EXPORT int bee_chat_msg( bee_t *bee, struct groupchat *c, const char *msg, int flags ); 177 178 G_MODULE_EXPORT struct groupchat *bee_chat_by_title( bee_t *bee, struct im_connection *ic, const char *title ); 179 G_MODULE_EXPORT void imcb_chat_invite( struct im_connection *ic, const char *name, const char *who, const char *msg ); 178 180 179 181 #endif /* __BEE_H__ */ -
protocols/bee_chat.c
r9b1d2d6 rea728e6 233 233 return NULL; 234 234 } 235 236 void imcb_chat_invite( struct im_connection *ic, const char *name, const char *who, const char *msg ) 237 { 238 bee_user_t *bu = bee_user_by_handle( ic->bee, ic, who ); 239 240 if( bu && ic->bee->ui->chat_invite ) 241 ic->bee->ui->chat_invite( ic->bee, bu, name, msg ); 242 } -
protocols/jabber/message.c
r9b1d2d6 rea728e6 31 31 struct xt_node *body = xt_find_node( node->children, "body" ), *c; 32 32 struct jabber_buddy *bud = NULL; 33 char *s ;33 char *s, *room = NULL, *reason = NULL; 34 34 35 35 if( !from ) … … 52 52 for( c = node->children; ( c = xt_find_node( c, "x" ) ); c = c->next ) 53 53 { 54 char *ns = xt_find_attr( c, "xmlns" ) , *room;55 struct xt_node *inv , *reason;54 char *ns = xt_find_attr( c, "xmlns" ); 55 struct xt_node *inv; 56 56 57 57 if( ns && strcmp( ns, XMLNS_MUC_USER ) == 0 && 58 58 ( inv = xt_find_node( c->children, "invite" ) ) ) 59 59 { 60 /* This is an invitation. Set some vars which 61 will be passed to imcb_chat_invite() below. */ 60 62 room = from; 61 63 if( ( from = xt_find_attr( inv, "from" ) ) == NULL ) 62 64 from = room; 63 64 g_string_append_printf( fullmsg, "<< \002BitlBee\002 - Invitation to chatroom %s >>\n", room ); 65 if( ( reason = xt_find_node( inv->children, "reason" ) ) && reason->text_len > 0 ) 66 g_string_append( fullmsg, reason->text ); 65 if( ( inv = xt_find_node( inv->children, "reason" ) ) && inv->text_len > 0 ) 66 reason = inv->text; 67 67 } 68 68 } … … 104 104 imcb_buddy_msg( ic, from, fullmsg->str, 105 105 0, jabber_get_timestamp( node ) ); 106 if( room ) 107 imcb_chat_invite( ic, room, from, reason ); 106 108 107 109 g_string_free( fullmsg, TRUE ); -
protocols/jabber/si.c
r9b1d2d6 rea728e6 262 262 break; 263 263 } 264 else 265 { 266 c = c->next; 267 } 264 268 265 269 if ( !requestok ) … … 373 377 { 374 378 struct xt_node *c, *d; 375 char *ini_jid , *tgt_jid, *iq_id, *cmp;379 char *ini_jid = NULL, *tgt_jid, *iq_id, *cmp; 376 380 GSList *tflist; 377 381 struct jabber_transfer *tf=NULL; -
protocols/twitter/twitter_lib.c
r9b1d2d6 rea728e6 373 373 static xt_status twitter_xt_get_status( struct xt_node *node, struct twitter_xml_status *txs ) 374 374 { 375 struct xt_node *child, *rt ;375 struct xt_node *child, *rt = NULL; 376 376 gboolean truncated = FALSE; 377 377 -
protocols/yahoo/libyahoo2.c
r9b1d2d6 rea728e6 2169 2169 yd->buddies = y_list_append(yd->buddies, bud); 2170 2170 2171 #if 0 2172 /* BitlBee: This seems to be wrong in my experience. I think: 2173 status = 0: Success 2174 status = 2: Already on list 2175 status = 3: Doesn't exist 2176 status = 42: Invalid handle (possibly banned/reserved, I get it for 2177 handles like joe or jjjjjj) 2178 Haven't seen others yet. But whenever the add is successful, there 2179 will be a separate "went online" packet when the auth. request is 2180 accepted. Couldn't find any test account that doesn't require auth. 2181 unfortunately (if there is even such a thing?) */ 2182 2171 2183 /* A non-zero status (i've seen 2) seems to mean the buddy is already 2172 2184 * added and is online */ … … 2176 2188 YAHOO_CALLBACK(ext_yahoo_status_changed) (yd->client_id, who, 2177 2189 YAHOO_STATUS_AVAILABLE, NULL, 0, 0, 0); 2190 } 2191 #endif 2192 /* BitlBee: Need ACK of added buddy, if it was successful. */ 2193 if (status == 0) { 2194 YList *tmp = y_list_append(NULL, bud); 2195 YAHOO_CALLBACK(ext_yahoo_got_buddies) (yd->client_id, tmp); 2196 y_list_free(tmp); 2178 2197 } 2179 2198 }
Note: See TracChangeset
for help on using the changeset viewer.