Changeset 5f8ab6a9 for root_commands.c

Timestamp:

2010-06-03T10:41:03Z (14 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

814aa52

Parents:

3f81999 (diff), f9928cb (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:

merge in bitlbee 1.2.5

File:

• root_commands.c (modified) (5 diffs)

root_commands.c

@@ -30 +30 @@
 #include "help.h"
 #include "otr.h"
+#include "chat.h"
 
 #include <string.h>
@@ -143 +144 @@
         storage_status_t status = storage_load( irc, cmd[1] );
         char *account_on[] = { "account", "on", NULL };
+        
+        if( strchr( irc->umode, 'R' ) != NULL )
+        {
+                irc_usermsg( irc, "You're already logged in." );
+                return;
+        }
         
         switch (status) {
@@ -912 +919 @@
                 online = 1;
         else
-                online =  away = 1;
+                online = away = 1;
         
         if( strchr( irc->umode, 'b' ) != NULL )
@@ -925 +932 @@
                 if( online == 1 )
                 {
+                        char st[256] = "Online";
+                        
+                        if( u->status_msg )
+                                g_snprintf( st, sizeof( st ) - 1, "Online (%s)", u->status_msg );
+                        
                         g_snprintf( s, sizeof( s ) - 1, "%s@%s %s(%s)", u->user, u->host, u->ic->acc->prpl->name, u->ic->acc->user );
-                        irc_usermsg( irc, format, u->nick, s, "Online" );
+                        irc_usermsg( irc, format, u->nick, s, st );
                 }
                 
@@ -1119 +1131 @@
                 irc_usermsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "chat", cmd[1] );
         }
-
-
-
-#if 0
-        account_t *a;
-        struct im_connection *ic;
-        char *chat, *channel, *nick = NULL, *password = NULL;
-        struct groupchat *c;
-        
-        if( !( a = account_get( irc, cmd[1] ) ) )
-        {
-                irc_usermsg( irc, "Invalid account" );
-                return;
-        }
-        else if( !( a->ic && ( a->ic->flags & OPT_LOGGED_IN ) ) )
-        {
-                irc_usermsg( irc, "That account is not on-line" );
-                return;
-        }
-        else if( a->prpl->chat_join == NULL )
-        {
-                irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
-                return;
-        }
-        ic = a->ic;
-        
-        chat = cmd[2];
-        if( cmd[3] )
-        {
-                if( strchr( CTYPES, cmd[3][0] ) == NULL )
-                        channel = g_strdup_printf( "&%s", cmd[3] );
-                else
-                        channel = g_strdup( cmd[3] );
-        }
-        else
-        {
-                char *s;
-                
-                channel = g_strdup_printf( "&%s", chat );
-                if( ( s = strchr( channel, '@' ) ) )
-                        *s = 0;
-        }
-        if( cmd[3] && cmd[4] )
-                nick = cmd[4];
-        else
-                nick = irc->nick;
-        if( cmd[3] && cmd[4] && cmd[5] )
-                password = cmd[5];
-        
-        if( !nick_ok( channel + 1 ) )
-        {
-                irc_usermsg( irc, "Invalid channel name: %s", channel );
-                g_free( channel );
-                return;
-        }
-        else if( g_strcasecmp( channel, irc->channel ) == 0 || irc_chat_by_channel( irc, channel ) )
-        {
-                irc_usermsg( irc, "Channel already exists: %s", channel );
-                g_free( channel );
-                return;
-        }
-        
-        if( ( c = a->prpl->chat_join( ic, chat, nick, password ) ) )
-        {
-                g_free( c->channel );
-                c->channel = channel;
-        }
-        else
-        {
-                irc_usermsg( irc, "Tried to join chat, not sure if this was successful" );
-                g_free( channel );
-        }
-#endif
 }