Changeset 2288705 for protocols/nogaim.c

Timestamp:

2009-12-07T21:54:19Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1c3008a

Parents:

aac4017 (diff), 36cf9fd (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.

Message:

Merging head.

File:

• protocols/nogaim.c (modified) (10 diffs)

protocols/nogaim.c

@@ -33 +33 @@
 
 #define BITLBEE_CORE
+#include <ctype.h>
+
 #include "nogaim.h"
-#include <ctype.h>
+#include "chat.h"
 
 static int remove_chat_buddy_silent( struct groupchat *b, const char *handle );
@@ -249 +251 @@
 void imcb_connected( struct im_connection *ic )
 {
+        irc_t *irc = ic->irc;
+        struct chat *c;
         user_t *u;
         
@@ -271 +275 @@
            exponential backoff timer. */
         ic->acc->auto_reconnect_delay = 0;
+        
+        for( c = irc->chatrooms; c; c = c->next )
+        {
+                if( c->acc != ic->acc )
+                        continue;
+                
+                if( set_getbool( &c->set, "auto_join" ) )
+                        chat_join( irc, c, NULL );
+        }
 }
 
@@ -309 +322 @@
         ic->acc->prpl->logout( ic );
         b_event_remove( ic->inpa );
+        
+        g_free( ic->away );
+        ic->away = NULL;
         
         u = irc->users;
@@ -492 +508 @@
 }
 
-/* prpl.c */
-
-struct show_got_added_data
+
+struct imcb_ask_cb_data
 {
         struct im_connection *ic;
@@ -500 +515 @@
 };
 
-void show_got_added_no( void *data )
-{
-        g_free( ((struct show_got_added_data*)data)->handle );
+static void imcb_ask_auth_cb_no( void *data )
+{
+        struct imcb_ask_cb_data *cbd = data;
+        
+        cbd->ic->acc->prpl->auth_deny( cbd->ic, cbd->handle );
+        
+        g_free( cbd->handle );
+        g_free( cbd );
+}
+
+static void imcb_ask_auth_cb_yes( void *data )
+{
+        struct imcb_ask_cb_data *cbd = data;
+        
+        cbd->ic->acc->prpl->auth_allow( cbd->ic, cbd->handle );
+        
+        g_free( cbd->handle );
+        g_free( cbd );
+}
+
+void imcb_ask_auth( struct im_connection *ic, const char *handle, const char *realname )
+{
+        struct imcb_ask_cb_data *data = g_new0( struct imcb_ask_cb_data, 1 );
+        char *s, *realname_ = NULL;
+        
+        if( realname != NULL )
+                realname_ = g_strdup_printf( " (%s)", realname );
+        
+        s = g_strdup_printf( "The user %s%s wants to add you to his/her buddy list.",
+                             handle, realname_ ?: "" );
+        
+        g_free( realname_ );
+        
+        data->ic = ic;
+        data->handle = g_strdup( handle );
+        query_add( ic->irc, ic, s, imcb_ask_auth_cb_yes, imcb_ask_auth_cb_no, data );
+}
+
+
+static void imcb_ask_add_cb_no( void *data )
+{
+        g_free( ((struct imcb_ask_cb_data*)data)->handle );
         g_free( data );
 }
 
-void show_got_added_yes( void *data )
-{
-        struct show_got_added_data *sga = data;
-        
-        sga->ic->acc->prpl->add_buddy( sga->ic, sga->handle, NULL );
-        /* imcb_add_buddy( sga->ic, NULL, sga->handle, sga->handle ); */
-        
-        return show_got_added_no( data );
-}
-
-void imcb_ask_add( struct im_connection *ic, char *handle, const char *realname )
-{
-        struct show_got_added_data *data = g_new0( struct show_got_added_data, 1 );
+static void imcb_ask_add_cb_yes( void *data )
+{
+        struct imcb_ask_cb_data *cbd = data;
+        
+        cbd->ic->acc->prpl->add_buddy( cbd->ic, cbd->handle, NULL );
+        
+        return imcb_ask_add_cb_no( data );
+}
+
+void imcb_ask_add( struct im_connection *ic, const char *handle, const char *realname )
+{
+        struct imcb_ask_cb_data *data = g_new0( struct imcb_ask_cb_data, 1 );
         char *s;
         
@@ -529 +582 @@
         data->ic = ic;
         data->handle = g_strdup( handle );
-        query_add( ic->irc, ic, s, show_got_added_yes, show_got_added_no, data );
+        query_add( ic->irc, ic, s, imcb_ask_add_cb_yes, imcb_ask_add_cb_no, data );
 }
 
@@ -699 +752 @@
 }
 
-struct groupchat *imcb_chat_new( struct im_connection *ic, char *handle )
+struct groupchat *imcb_chat_new( struct im_connection *ic, const char *handle )
 {
         struct groupchat *c;
@@ -928 +981 @@
         int st;
         
-        if( ( g_strcasecmp( value, "true" ) == 0 ) || ( g_strcasecmp( value, "yes" ) == 0 ) || ( g_strcasecmp( value, "on" ) == 0 ) )
-                st = 1;
-        else if( ( g_strcasecmp( value, "false" ) == 0 ) || ( g_strcasecmp( value, "no" ) == 0 ) || ( g_strcasecmp( value, "off" ) == 0 ) )
-                st = 0;
-        else if( sscanf( value, "%d", &st ) != 1 )
-                return( NULL );
-        
-        st = st != 0;
+        if( !is_bool( value ) )
+                return SET_INVALID;
+        
+        st = bool2int( value );
         
         /* Horror.... */
@@ -979 +1028 @@
         }
         
-        return( set_eval_bool( set, value ) );
+        return value;
 }