aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-06-28 02:09:25 +0200
committerMiklos Vajna <vmiklos@frugalware.org>2008-06-28 02:09:25 +0200
commit039116a68fd1e92ee0869f88d4ee52183349062b (patch)
tree39a1622e83ba838d6b1ccbeb2e07a02fa1769a23
parentf7c6049180a6e3ee702f7af4254981a60d84069d (diff)
add support for bitlbee-1.2.1
-rw-r--r--skype/README3
-rw-r--r--skype/skype.c12
2 files changed, 10 insertions, 5 deletions
diff --git a/skype/README b/skype/README
index c87f5329..8e9bb372 100644
--- a/skype/README
+++ b/skype/README
@@ -29,7 +29,8 @@ not..)
== Requirements
* Skype >= 1.4.0.99. The latest version I've tested is 2.0.0.68.
-* BitlBee >= 1.1.1dev. The latest version I've tested is 1.2.
+* BitlBee >= 1.2.1. Use old versions (<=0.5.1) if you have 1.2 or
+ 1.1.1dev installed.
* Skype4Py >= 0.9.28.7. Previous versions won't work due to API changes.
NOTE: I had not had time to add support for 1.x yet.
diff --git a/skype/skype.c b/skype/skype.c
index 0d5df057..7c46db33 100644
--- a/skype/skype.c
+++ b/skype/skype.c
@@ -167,8 +167,9 @@ int skype_write( struct im_connection *ic, char *buf, int len )
return TRUE;
}
-static void skype_buddy_ask_yes( gpointer w, struct skype_buddy_ask_data *bla )
+static void skype_buddy_ask_yes( void *data )
{
+ struct skype_buddy_ask_data *bla = data;
char *buf = g_strdup_printf("SET USER %s ISAUTHORIZED TRUE", bla->handle);
skype_write( bla->ic, buf, strlen( buf ) );
g_free(buf);
@@ -176,8 +177,9 @@ static void skype_buddy_ask_yes( gpointer w, struct skype_buddy_ask_data *bla )
g_free(bla);
}
-static void skype_buddy_ask_no( gpointer w, struct skype_buddy_ask_data *bla )
+static void skype_buddy_ask_no( void *data )
{
+ struct skype_buddy_ask_data *bla = data;
char *buf = g_strdup_printf("SET USER %s ISAUTHORIZED FALSE", bla->handle);
skype_write( bla->ic, buf, strlen( buf ) );
g_free(buf);
@@ -198,8 +200,9 @@ void skype_buddy_ask( struct im_connection *ic, char *handle, char *message)
g_free( buf );
}
-static void skype_call_ask_yes( gpointer w, struct skype_buddy_ask_data *bla )
+static void skype_call_ask_yes( void *data )
{
+ struct skype_buddy_ask_data *bla = data;
char *buf = g_strdup_printf("SET CALL %s STATUS INPROGRESS", bla->handle);
skype_write( bla->ic, buf, strlen( buf ) );
g_free(buf);
@@ -207,8 +210,9 @@ static void skype_call_ask_yes( gpointer w, struct skype_buddy_ask_data *bla )
g_free(bla);
}
-static void skype_call_ask_no( gpointer w, struct skype_buddy_ask_data *bla )
+static void skype_call_ask_no( void *data )
{
+ struct skype_buddy_ask_data *bla = data;
char *buf = g_strdup_printf("SET CALL %s STATUS FINISHED", bla->handle);
skype_write( bla->ic, buf, strlen( buf ) );
g_free(buf);