Changeset e4816ea

Timestamp:

2010-05-08T00:48:48Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a87754b

Parents:

b17ce85

Message:

Reshuffled irc_im.c into a saner order.

File:

• irc_im.c (modified) (4 diffs)

irc_im.c

@@ -27 +27 @@
 #include "dcc.h"
 
-/* IM->IRC callbacks */
+/* IM->IRC callbacks: Simple IM/buddy-related stuff. */
 
 static const struct irc_user_funcs irc_user_im_funcs;
@@ -203 +203 @@
 }
 
-
-/* Groupchats */
+/* IRC->IM calls */
+
+static gboolean bee_irc_user_privmsg( irc_user_t *iu, const char *msg )
+{
+        if( iu->bu )
+                return bee_user_msg( iu->irc->b, iu->bu, msg, 0 );
+        else
+                return FALSE;
+}
+
+static gboolean bee_irc_user_ctcp( irc_user_t *iu, char *const *ctcp )
+{
+        if( ctcp[1] && g_strcasecmp( ctcp[0], "DCC" ) == 0
+                    && g_strcasecmp( ctcp[1], "SEND" ) == 0 )
+        {
+                if( iu->bu && iu->bu->ic && iu->bu->ic->acc->prpl->transfer_request )
+                {
+                        file_transfer_t *ft = dcc_request( iu->bu->ic, ctcp );
+                        if ( ft )
+                                iu->bu->ic->acc->prpl->transfer_request( iu->bu->ic, ft, iu->bu->handle );
+                        
+                        return TRUE;
+                }
+        }
+        else if( g_strcasecmp( ctcp[0], "TYPING" ) == 0 )
+        {
+                if( iu->bu && iu->bu->ic && iu->bu->ic->acc->prpl->send_typing && ctcp[1] )
+                {
+                        int st = ctcp[1][0];
+                        if( st >= '0' && st <= '2' )
+                        {
+                                st <<= 8;
+                                iu->bu->ic->acc->prpl->send_typing( iu->bu->ic, iu->bu->handle, st );
+                        }
+                        
+                        return TRUE;
+                }
+        }
+        
+        return FALSE;
+}
+
+static const struct irc_user_funcs irc_user_im_funcs = {
+        bee_irc_user_privmsg,
+        bee_irc_user_ctcp,
+};
+
+
+/* IM->IRC: Groupchats */
 gboolean bee_irc_chat_new( bee_t *bee, struct groupchat *c )
 {
@@ -289 +336 @@
 
 
-/* File transfers */
+/* IM->IRC: File transfers */
 static file_transfer_t *bee_irc_ft_in_start( bee_t *bee, bee_user_t *bu, const char *file_name, size_t file_size )
 {
@@ -335 +382 @@
         bee_irc_ft_finished,
 };
-
-
-/* IRC->IM calls */
-
-static gboolean bee_irc_user_privmsg( irc_user_t *iu, const char *msg )
-{
-        if( iu->bu )
-                return bee_user_msg( iu->irc->b, iu->bu, msg, 0 );
-        else
-                return FALSE;
-}
-
-static gboolean bee_irc_user_ctcp( irc_user_t *iu, char *const *ctcp )
-{
-        if( ctcp[1] && g_strcasecmp( ctcp[0], "DCC" ) == 0
-                    && g_strcasecmp( ctcp[1], "SEND" ) == 0 )
-        {
-                if( iu->bu && iu->bu->ic && iu->bu->ic->acc->prpl->transfer_request )
-                {
-                        file_transfer_t *ft = dcc_request( iu->bu->ic, ctcp );
-                        if ( ft )
-                                iu->bu->ic->acc->prpl->transfer_request( iu->bu->ic, ft, iu->bu->handle );
-                        
-                        return TRUE;
-                }
-        }
-        else if( g_strcasecmp( ctcp[0], "TYPING" ) == 0 )
-        {
-                if( iu->bu && iu->bu->ic && iu->bu->ic->acc->prpl->send_typing && ctcp[1] )
-                {
-                        int st = ctcp[1][0];
-                        if( st >= '0' && st <= '2' )
-                        {
-                                st <<= 8;
-                                iu->bu->ic->acc->prpl->send_typing( iu->bu->ic, iu->bu->handle, st );
-                        }
-                        
-                        return TRUE;
-                }
-        }
-        
-        return FALSE;
-}
-
-static const struct irc_user_funcs irc_user_im_funcs = {
-        bee_irc_user_privmsg,
-        bee_irc_user_ctcp,
-};