diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-21 12:28:34 +0200 | 
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-21 12:28:34 +0200 | 
| commit | 783e9b76de9a8ec16e8229d7c476b16ba8011554 (patch) | |
| tree | ee27ef686f8aefa4dc36a3d0999e123f52ed0fb2 /protocols/jabber/jabber_util.c | |
| parent | 51bbec0b0e280be629f7b1086160b7730ebfdb74 (diff) | |
| parent | 92998915be47eab17e548af5c3dd43fa4eab9683 (diff) | |
Merge trunk.
Diffstat (limited to 'protocols/jabber/jabber_util.c')
| -rw-r--r-- | protocols/jabber/jabber_util.c | 8 | 
1 files changed, 6 insertions, 2 deletions
| diff --git a/protocols/jabber/jabber_util.c b/protocols/jabber/jabber_util.c index 6e872040..518624f6 100644 --- a/protocols/jabber/jabber_util.c +++ b/protocols/jabber/jabber_util.c @@ -245,8 +245,10 @@ struct jabber_buddy_ask_data  	char *realname;  }; -static void jabber_buddy_ask_yes( gpointer w, struct jabber_buddy_ask_data *bla ) +static void jabber_buddy_ask_yes( void *data )  { +	struct jabber_buddy_ask_data *bla = data; +	  	presence_send_request( bla->ic, bla->handle, "subscribed" );  	if( imcb_find_buddy( bla->ic, bla->handle ) == NULL ) @@ -256,8 +258,10 @@ static void jabber_buddy_ask_yes( gpointer w, struct jabber_buddy_ask_data *bla  	g_free( bla );  } -static void jabber_buddy_ask_no( gpointer w, struct jabber_buddy_ask_data *bla ) +static void jabber_buddy_ask_no( void *data )  { +	struct jabber_buddy_ask_data *bla = data; +	  	presence_send_request( bla->ic, bla->handle, "subscribed" );  	g_free( bla->handle ); | 
