aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2006-01-04 13:09:35 +0100
committerWilmer van der Gaast <wilmer@gaast.net>2006-01-04 13:09:35 +0100
commit08995b0801a00ef5cbcc12d7eb070ef349dde64e (patch)
treec52f7de557078b1a3f779fe25d49ed51fdd080b4
parent7e563ed9a130cce070753f011158ef0714c58d46 (diff)
Cleaned up some warnings in MSN module that appeared because of the const change.
-rw-r--r--protocols/msn/msn.c8
-rw-r--r--protocols/msn/msn.h2
-rw-r--r--protocols/msn/ns.c6
-rw-r--r--protocols/msn/sb.c2
-rw-r--r--protocols/ssl_bogus.c5
5 files changed, 14 insertions, 9 deletions
diff --git a/protocols/msn/msn.c b/protocols/msn/msn.c
index b828d31c..b03c898e 100644
--- a/protocols/msn/msn.c
+++ b/protocols/msn/msn.c
@@ -169,17 +169,17 @@ static GList *msn_away_states( struct gaim_connection *gc )
int i;
for( i = 0; msn_away_state_list[i].number > -1; i ++ )
- l = g_list_append( l, msn_away_state_list[i].name );
+ l = g_list_append( l, (void*) msn_away_state_list[i].name );
return( l );
}
static char *msn_get_status_string( struct gaim_connection *gc, int number )
{
- struct msn_away_state *st = msn_away_state_by_number( number );
+ const struct msn_away_state *st = msn_away_state_by_number( number );
if( st )
- return( st->name );
+ return( (char*) st->name );
else
return( "" );
}
@@ -188,7 +188,7 @@ static void msn_set_away( struct gaim_connection *gc, char *state, char *message
{
char buf[1024];
struct msn_data *md = gc->proto_data;
- struct msn_away_state *st;
+ const struct msn_away_state *st;
if( strcmp( state, GAIM_AWAY_CUSTOM ) == 0 )
st = msn_away_state_by_name( "Away" );
diff --git a/protocols/msn/msn.h b/protocols/msn/msn.h
index 1cb96a93..9727c537 100644
--- a/protocols/msn/msn.h
+++ b/protocols/msn/msn.h
@@ -66,7 +66,7 @@ struct msn_data
GSList *msgq;
GSList *switchboards;
int buddycount;
- struct msn_away_state *away_state;
+ const struct msn_away_state *away_state;
};
struct msn_switchboard
diff --git a/protocols/msn/ns.c b/protocols/msn/ns.c
index 2d90b2f3..4ced58a0 100644
--- a/protocols/msn/ns.c
+++ b/protocols/msn/ns.c
@@ -364,7 +364,7 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
}
else if( strcmp( cmd[0], "ILN" ) == 0 )
{
- struct msn_away_state *st;
+ const struct msn_away_state *st;
if( num_parts != 6 )
{
@@ -392,7 +392,7 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
}
else if( strcmp( cmd[0], "NLN" ) == 0 )
{
- struct msn_away_state *st;
+ const struct msn_away_state *st;
if( num_parts != 5 )
{
@@ -538,7 +538,7 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
else if( isdigit( cmd[0][0] ) )
{
int num = atoi( cmd[0] );
- struct msn_status_code *err = msn_status_by_number( num );
+ const struct msn_status_code *err = msn_status_by_number( num );
g_snprintf( buf, sizeof( buf ), "Error reported by MSN server: %s", err->text );
do_error_dialog( gc, buf, "MSN" );
diff --git a/protocols/msn/sb.c b/protocols/msn/sb.c
index 11728f03..9e7ef841 100644
--- a/protocols/msn/sb.c
+++ b/protocols/msn/sb.c
@@ -511,7 +511,7 @@ static int msn_sb_command( gpointer data, char **cmd, int num_parts )
else if( isdigit( cmd[0][0] ) )
{
int num = atoi( cmd[0] );
- struct msn_status_code *err = msn_status_by_number( num );
+ const struct msn_status_code *err = msn_status_by_number( num );
g_snprintf( buf, sizeof( buf ), "Error reported by switchboard server: %s", err->text );
do_error_dialog( gc, buf, "MSN" );
diff --git a/protocols/ssl_bogus.c b/protocols/ssl_bogus.c
index 3766baaa..52406b75 100644
--- a/protocols/ssl_bogus.c
+++ b/protocols/ssl_bogus.c
@@ -50,3 +50,8 @@ int ssl_getfd( void *conn )
{
return( -1 );
}
+
+GaimInputCondition ssl_getdirection( void *conn )
+{
+ return GAIM_INPUT_READ;
+}