Changeset 764c7d1 for protocols/nogaim.c

Timestamp:

2008-02-03T21:30:03Z (17 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

3c80a9d

Parents:

b5c8a34

Message:

OTR support, first checkin

File:

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

protocols/nogaim.c

@@ -630 +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 )
         {
@@ -642 +648 @@
                                 imcb_log( ic, "Ignoring message from unknown handle %s", handle );
                         
+                        g_free(msg);
                         return;
                 }
@@ -674 +681 @@
         irc_msgfrom( irc, u->nick, wrapped );
         g_free( wrapped );
+        g_free( msg );
 }
 
@@ -991 +999 @@
                 msg = buf;
         }
-        
-        st = ic->acc->prpl->buddy_msg( ic, handle, msg, flags );
-        g_free( buf );
-        
+
+        /* if compiled without otr support, this just calls the prpl buddy_msg */
+        st = otr_send_message(ic, handle, msg, flags);
+        
+        g_free(buf);
         return st;
 }