Changes in protocols/nogaim.c [52e6e17:31e5846]

File:

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

protocols/nogaim.c

@@ -603 +603 @@
         
         /* LISPy... */
-        if( ( u->online ) &&                                            /* Don't touch offline people */
-            ( ( ( u->online != oo ) && !u->away ) ||                    /* Do joining people */
-              ( ( u->online == oo ) && ( oa == !u->away ) ) ) )         /* Do people changing state */
+        if( ( set_getbool( &ic->irc->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 */
+              ( ( u->online == oo ) && ( oa == !u->away ) ) ) )         /* (De)voice people changing state */
         {
                 char *from;
@@ -618 +619 @@
                                                             ic->irc->myhost );
                 }
-                if(!strcmp(set_getstr(&ic->irc->set, "voice_buddies"), "notaway")) {
-                        irc_write( ic->irc, ":%s MODE %s %cv %s", from, ic->irc->channel,
-                                                                 u->away?'-':'+', u->nick );
-                }
-                if(!strcmp(set_getstr(&ic->irc->set, "halfop_buddies"), "notaway")) {
-                        irc_write( ic->irc, ":%s MODE %s %ch %s", from, ic->irc->channel,
-                                                                 u->away?'-':'+', u->nick );
-                }
-                if(!strcmp(set_getstr(&ic->irc->set, "op_buddies"), "notaway")) {
-                        irc_write( ic->irc, ":%s MODE %s %co %s", from, ic->irc->channel,
-                                                                 u->away?'-':'+', u->nick );
-                }
+                irc_write( ic->irc, ":%s MODE %s %cv %s", from, ic->irc->channel,
+                                                          u->away?'-':'+', u->nick );
                 g_free( from );
         }
@@ -639 +630 @@
         char *wrapped;
         user_t *u;
-
-        /* pass the message through OTR */
-        msg = otr_handle_message(ic, handle, msg);
-        if(!msg) {
-                /* this was an internal OTR protocol message */
-                return;
-        }
-
+        
         u = user_findhandle( ic, handle );
+        
         if( !u )
         {
@@ -657 +642 @@
                                 imcb_log( ic, "Ignoring message from unknown handle %s", handle );
                         
-                        g_free(msg);
                         return;
                 }
@@ -690 +674 @@
         irc_msgfrom( irc, u->nick, wrapped );
         g_free( wrapped );
-        g_free( msg );
 }
 
@@ -931 +914 @@
 
 
+/* Misc. BitlBee stuff which shouldn't really be here */
+
+char *set_eval_away_devoice( set_t *set, char *value )
+{
+        irc_t *irc = set->data;
+        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;
+        
+        /* Horror.... */
+        
+        if( st != set_getbool( &irc->set, "away_devoice" ) )
+        {
+                char list[80] = "";
+                user_t *u = irc->users;
+                int i = 0, count = 0;
+                char pm;
+                char v[80];
+                
+                if( st )
+                        pm = '+';
+                else
+                        pm = '-';
+                
+                while( u )
+                {
+                        if( u->ic && u->online && !u->away )
+                        {
+                                if( ( strlen( list ) + strlen( u->nick ) ) >= 79 )
+                                {
+                                        for( i = 0; i < count; v[i++] = 'v' ); v[i] = 0;
+                                        irc_write( irc, ":%s MODE %s %c%s%s",
+                                                   irc->myhost,
+                                                   irc->channel, pm, v, list );
+                                        
+                                        *list = 0;
+                                        count = 0;
+                                }
+                                
+                                sprintf( list + strlen( list ), " %s", u->nick );
+                                count ++;
+                        }
+                        u = u->next;
+                }
+                
+                /* $v = 'v' x $i */
+                for( i = 0; i < count; v[i++] = 'v' ); v[i] = 0;
+                irc_write( irc, ":%s MODE %s %c%s%s", irc->myhost,
+                                                            irc->channel, pm, v, list );
+        }
+        
+        return( set_eval_bool( set, value ) );
+}
+
+
+
+
 /* The plan is to not allow straight calls to prpl functions anymore, but do
    them all from some wrappers. We'll start to define some down here: */
@@ -944 +991 @@
                 msg = buf;
         }
-
-        /* if compiled without otr support, this just calls the prpl buddy_msg */
-        st = otr_send_message(ic, handle, msg, flags);
-        
-        g_free(buf);
+        
+        st = ic->acc->prpl->buddy_msg( ic, handle, msg, flags );
+        g_free( buf );
+        
         return st;
 }