Changeset 10a96f4

Timestamp:

2010-03-29T12:25:01Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

81e04e1

Parents:

38ee021

Message:

Start restoring IM-related bits, added bee_user.c with basic functions
and UI callbacks.

Location:

protocols

Files:

• Makefile (modified) (1 diff)
• bee.h (modified) (3 diffs)
• bee_user.c (added)
• nogaim.c (modified) (26 diffs)
• user.c (deleted)
• user.h (deleted)

protocols/Makefile

@@ -11 +11 @@
 # [SH] Program variables
 #objects = account.o nogaim.o user.o
-objects = bee.o
+objects = bee.o bee_user.o nogaim.o
 
 

protocols/bee.h

@@ -1 @@
-typedef struct bee_ui
-{
-        void *data;
-} bee_ui_t;
+  /********************************************************************\
+  * BitlBee -- An IRC to other IM-networks gateway                     *
+  *                                                                    *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
+  \********************************************************************/
+
+/* Stuff to handle, save and search buddies                             */
+
+/*
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef __BEE_H__
+#define __BEE_H__
+
+struct bee_ui_funcs;
 
 typedef struct bee
@@ -11 +36 @@
         GSList *accounts;
         
-        //const bee_ui_funcs_t *ui;
+        const struct bee_ui_funcs *ui;
         void *ui_data;
 } bee_t;
@@ -17 +42 @@
 bee_t *bee_new();
 void bee_free( bee_t *b );
+
+typedef enum
+{
+        BEE_USER_ONLINE = 1,
+        BEE_USER_AWAY = 2,
+} bee_user_flags_t;
+
+typedef struct bee_user
+{
+        struct im_connection *ic;
+        char *handle;
+        char *fullname;
+        char *group;
+
+        char *away;
+        char *status_msg;
+        
+        bee_t *bee;
+        void *ui_data;
+} bee_user_t;
+
+typedef struct bee_ui_funcs
+{
+        gboolean (*user_new)( bee_t *bee, struct bee_user *bu );
+        gboolean (*user_free)( bee_t *bee, struct bee_user *bu );
+} bee_ui_funcs_t;
+
+
+/* bee.c */
+bee_t *bee_new();
+void bee_free( bee_t *b );
+
+/* bee_user.c */
+bee_user_t *bee_user_new( bee_t *bee, struct im_connection *ic, const char *handle );
+int bee_user_free( bee_t *bee, struct im_connection *ic, const char *handle );
+bee_user_t *bee_user_by_handle( bee_t *bee, struct im_connection *ic, const char *handle );
+
+#endif /* __BEE_H__ */

protocols/nogaim.c

@@ -199 +199 @@
         va_end( params );
 
-        if( ( g_strcasecmp( set_getstr( &ic->irc->set, "strip_html" ), "always" ) == 0 ) ||
-            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->set, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &ic->irc->b->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->b->set, "strip_html" ) ) )
                 strip_html( text );
         
@@ -265 +265 @@
         irc_t *irc = ic->irc;
         struct chat *c;
-        user_t *u;
         
         /* MSN servers sometimes redirect you to a different server and do
@@ -273 +272 @@
                 return;
         
-        u = user_find( ic->irc, ic->irc->nick );
-        
         imcb_log( ic, "Logged in" );
         
@@ -287 +284 @@
         ic->acc->auto_reconnect_delay = 0;
         
+        /*
         for( c = irc->chatrooms; c; c = c->next )
         {
@@ -295 +293 @@
                         chat_join( irc, c, NULL );
         }
+        */
 }
 
@@ -360 +359 @@
                 /* Uhm... This is very sick. */
         }
-        else if( allow_reconnect && set_getbool( &irc->set, "auto_reconnect" ) &&
+        else if( allow_reconnect && set_getbool( &irc->b->set, "auto_reconnect" ) &&
                  set_getbool( &a->set, "auto_reconnect" ) &&
                  ( delay = account_reconnect_delay( a ) ) > 0 )
@@ -391 +390 @@
         if( user_findhandle( ic, handle ) )
         {
-                if( set_getbool( &irc->set, "debug" ) )
+                if( set_getbool( &irc->b->set, "debug" ) )
                         imcb_log( ic, "User already exists, ignoring add request: %s", handle );
                 
@@ -470 +469 @@
                 u->realname = g_strdup( realname );
                 
-                if( ( ic->flags & OPT_LOGGED_IN ) && set_getbool( &ic->irc->set, "display_namechanges" ) )
+                if( ( ic->flags & OPT_LOGGED_IN ) && set_getbool( &ic->irc->b->set, "display_namechanges" ) )
                         imcb_log( ic, "User `%s' changed name to `%s'", u->nick, u->realname );
         }
@@ -518 +517 @@
                 /* Some processing to make sure this string is a valid IRC nickname. */
                 nick_strip( newnick );
-                if( set_getbool( &ic->irc->set, "lcnicks" ) )
+                if( set_getbool( &ic->irc->b->set, "lcnicks" ) )
                         nick_lc( newnick );
                 
@@ -626 +625 @@
         if( !u )
         {
-                if( g_strcasecmp( set_getstr( &ic->irc->set, "handle_unknown" ), "add" ) == 0 )
+                if( g_strcasecmp( set_getstr( &ic->irc->b->set, "handle_unknown" ), "add" ) == 0 )
                 {
                         imcb_add_buddy( ic, (char*) handle, NULL );
@@ -633 +632 @@
                 else
                 {
-                        if( set_getbool( &ic->irc->set, "debug" ) || g_strcasecmp( set_getstr( &ic->irc->set, "handle_unknown" ), "ignore" ) != 0 )
+                        if( set_getbool( &ic->irc->b->set, "debug" ) || g_strcasecmp( set_getstr( &ic->irc->b->set, "handle_unknown" ), "ignore" ) != 0 )
                         {
                                 imcb_log( ic, "imcb_buddy_status() for unknown handle %s:", handle );
@@ -693 +692 @@
         
         /* LISPy... */
-        if( ( set_getbool( &ic->irc->set, "away_devoice" ) ) &&         /* Don't do a thing when user doesn't want it */
+        if( ( set_getbool( &ic->irc->b->set, "away_devoice" ) ) &&              /* Don't do a thing when user doesn't want it */
             ( u->online ) &&                                            /* Don't touch offline people */
             ( ( ( u->online != oo ) && !u->away ) ||                    /* Voice joining people */
@@ -700 +699 @@
                 char *from;
                 
-                if( set_getbool( &ic->irc->set, "simulate_netsplit" ) )
+                if( set_getbool( &ic->irc->b->set, "simulate_netsplit" ) )
                 {
                         from = g_strdup( ic->irc->myhost );
@@ -725 +724 @@
         if( !u )
         {
-                char *h = set_getstr( &irc->set, "handle_unknown" );
+                char *h = set_getstr( &irc->b->set, "handle_unknown" );
                 
                 if( g_strcasecmp( h, "ignore" ) == 0 )
                 {
-                        if( set_getbool( &irc->set, "debug" ) )
+                        if( set_getbool( &irc->b->set, "debug" ) )
                                 imcb_log( ic, "Ignoring message from unknown handle %s", handle );
                         
@@ -736 +735 @@
                 else if( g_strncasecmp( h, "add", 3 ) == 0 )
                 {
-                        int private = set_getbool( &irc->set, "private" );
+                        int private = set_getbool( &irc->b->set, "private" );
                         
                         if( h[3] )
@@ -757 +756 @@
         }
         
-        if( ( g_strcasecmp( set_getstr( &ic->irc->set, "strip_html" ), "always" ) == 0 ) ||
-            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->set, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &ic->irc->b->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->b->set, "strip_html" ) ) )
                 strip_html( msg );
 
@@ -770 +769 @@
         user_t *u;
         
-        if( !set_getbool( &ic->irc->set, "typing_notice" ) )
+        if( !set_getbool( &ic->irc->b->set, "typing_notice" ) )
                 return;
         
@@ -801 +800 @@
         c->topic = g_strdup_printf( "BitlBee groupchat: \"%s\". Please keep in mind that root-commands won't work here. Have fun!", c->title );
         
-        if( set_getbool( &ic->irc->set, "debug" ) )
+        if( set_getbool( &ic->irc->b->set, "debug" ) )
                 imcb_log( ic, "Creating new conversation: (id=%p,handle=%s)", c, handle );
         
@@ -813 +812 @@
         GList *ir;
         
-        if( set_getbool( &ic->irc->set, "debug" ) )
+        if( set_getbool( &ic->irc->b->set, "debug" ) )
                 imcb_log( ic, "You were removed from conversation %p", c );
         
@@ -860 +859 @@
         u = user_findhandle( ic, who );
         
-        if( ( g_strcasecmp( set_getstr( &ic->irc->set, "strip_html" ), "always" ) == 0 ) ||
-            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->set, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &ic->irc->b->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->b->set, "strip_html" ) ) )
                 strip_html( msg );
         
@@ -906 +905 @@
                 u = user_findhandle( ic, who );
         
-        if( ( g_strcasecmp( set_getstr( &ic->irc->set, "strip_html" ), "always" ) == 0 ) ||
-            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->set, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &ic->irc->b->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->b->set, "strip_html" ) ) )
                 strip_html( topic );
         
@@ -925 +924 @@
         int me = 0;
         
-        if( set_getbool( &b->ic->irc->set, "debug" ) )
+        if( set_getbool( &b->ic->irc->b->set, "debug" ) )
                 imcb_log( b->ic, "User %s added to conversation %p", handle, b );
         
@@ -960 +959 @@
         int me = 0;
         
-        if( set_getbool( &b->ic->irc->set, "debug" ) )
+        if( set_getbool( &b->ic->irc->b->set, "debug" ) )
                 imcb_log( b->ic, "User %s removed from conversation %p (%s)", handle, b, reason ? reason : "" );
         
@@ -1018 +1017 @@
         /* Horror.... */
         
-        if( st != set_getbool( &irc->set, "away_devoice" ) )
+        if( st != set_getbool( &irc->b->set, "away_devoice" ) )
         {
                 char list[80] = "";
@@ -1107 +1106 @@
         
         away = set_getstr( &ic->acc->set, "away" ) ?
-             : set_getstr( &ic->irc->set, "away" );
+             : set_getstr( &ic->irc->b->set, "away" );
         if( away && *away )
         {
@@ -1118 +1117 @@
                 away = NULL;
                 msg = set_getstr( &ic->acc->set, "status" ) ?
-                    : set_getstr( &ic->irc->set, "status" );
+                    : set_getstr( &ic->irc->b->set, "status" );
         }