Changeset 3edaed9

Timestamp:

2006-04-25T17:57:23Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1be54a9

Parents:

85616c3 (diff), 79c6f9f (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:

Misc. things (mainly code cleanup, better quoting for root commands)

Files:

• account.c (modified) (1 diff)
• irc.c (modified) (1 diff)
• protocols/nogaim.c (modified) (3 diffs)
• protocols/nogaim.h (modified) (3 diffs)
• protocols/oscar/oscar.c (modified) (3 diffs)
• protocols/ssl_nss.c (modified) (2 diffs)
• root_commands.c (modified) (1 diff)

account.c

@@ -167 +167 @@
 void account_off( irc_t *irc, account_t *a )
 {
-        account_offline( a->gc );
+        a->gc->wants_to_die = TRUE;
+        signoff( a->gc );
         a->gc = NULL;
         if( a->reconnect )

irc.c

@@ -233 +233 @@
         
         for (account = irc->accounts; account; account = account->next) {
-                if (account->gc)
-                        account_offline(account->gc);
-                else if (account->reconnect)
+                if (account->gc) {
+                        account->gc->wants_to_die = TRUE;
+                        signoff(account->gc);
+                } else if (account->reconnect) {
                         cancel_auto_reconnect(account);
+                }
         }
         

protocols/nogaim.c

@@ -360 +360 @@
            protocols. */
         proto_away( gc, u->away );
-        
-        if( strcmp( gc->prpl->name, "ICQ" ) == 0 )
-        {
-                for( u = gc->irc->users; u; u = u->next )
-                        if( u->gc == gc )
-                                break;
-                
-                if( u == NULL )
-                        serv_got_crap( gc, "\x02""***\x02"" BitlBee now supports ICQ server-side contact lists. "
-                                              "See \x02""help import_buddies\x02"" for more information." );
-        }
 }
 
@@ -387 +376 @@
         while( g_source_remove_by_user_data( (gpointer) a ) );
         a->reconnect = 0;
-}
-
-void account_offline( struct gaim_connection *gc )
-{
-        gc->wants_to_die = TRUE;
-        signoff( gc );
 }
 
@@ -959 +942 @@
         
         return( 0 );
-}
-
-
-/* prefs.c */
-
-/* Necessary? */
-void build_block_list()
-{
-        return;
-}
-
-void build_allow_list()
-{
-        return;
 }
 

protocols/nogaim.h

@@ -212 +212 @@
 G_MODULE_EXPORT void serv_got_crap( struct gaim_connection *gc, char *format, ... );
 G_MODULE_EXPORT void account_online( struct gaim_connection *gc );
-G_MODULE_EXPORT void account_offline( struct gaim_connection *gc );
 G_MODULE_EXPORT void signoff( struct gaim_connection *gc );
 
@@ -220 +219 @@
 
 /* list.c */
-G_MODULE_EXPORT int bud_list_cache_exists( struct gaim_connection *gc );
-G_MODULE_EXPORT void do_import( struct gaim_connection *gc, void *null );
 G_MODULE_EXPORT void add_buddy( struct gaim_connection *gc, char *group, char *handle, char *realname );
 G_MODULE_EXPORT struct buddy *find_buddy( struct gaim_connection *gc, char *handle );
-G_MODULE_EXPORT void do_export( struct gaim_connection *gc );
 G_MODULE_EXPORT void signoff_blocked( struct gaim_connection *gc );
 
@@ -245 +241 @@
 G_MODULE_EXPORT void serv_got_chat_left( struct gaim_connection *gc, int id );
 
-/* prefs.c */
-G_MODULE_EXPORT void build_block_list();
-G_MODULE_EXPORT void build_allow_list();
-
 struct conversation *conv_findchannel( char *channel );
 

protocols/oscar/oscar.c

@@ -2058 +2058 @@
                                                 name = g_strdup(normalize(curitem->name));
                                                 gc->permit = g_slist_append(gc->permit, name);
-                                                build_allow_list();
                                                 tmp++;
                                         }
@@ -2072 +2071 @@
                                                 name = g_strdup(normalize(curitem->name));
                                                 gc->deny = g_slist_append(gc->deny, name);
-                                                build_block_list();
                                                 tmp++;
                                         }
@@ -2278 +2276 @@
                 tm.tm_mday = (int)info->birthday;
                 tm.tm_mon = (int)info->birthmonth-1;
-                tm.tm_year = (int)info->birthyear-1900;
+                tm.tm_year = (int)info->birthyear%100;
                 strftime(date, sizeof(date), "%Y-%m-%d", &tm);
                 info_string_append(str, "\n", _("Birthday"), date);

protocols/ssl_nss.c

@@ -122 +122 @@
         if( source == -1 )
                 goto ssl_connected_failure;
-
         
-
-
+        /* Until we find out how to handle non-blocking I/O with NSS... */
+        sock_make_blocking( conn->fd );
+        
         conn->prfd = SSL_ImportFD(NULL, PR_ImportTCPSocket(source));
         SSL_OptionSet(conn->prfd, SSL_SECURITY, PR_TRUE);
@@ -181 +181 @@
         return( ((struct scd*)conn)->fd );
 }
+
+GaimInputCondition ssl_getdirection( void *conn )
+{
+        /* Just in case someone calls us, let's return the most likely case: */
+        return GAIM_INPUT_READ;
+}

root_commands.c

@@ -57 +57 @@
                                 s --;
                         }
+                }
+                else if( *s == '\\' && ( ( !q && s[1] ) || ( q && q == s[1] ) ) )
+                {
+                        char *cpy;
+                        
+                        for( cpy = s; *cpy; cpy ++ )
+                                cpy[0] = cpy[1];
                 }
                 else if( *s == q )