Changes in protocols/nogaim.c [58adb7e:90cd6c4]

File:

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

protocols/nogaim.c

@@ -98 +98 @@
 void register_protocol (struct prpl *p)
 {
-        protocols = g_list_append(protocols, p);
+        int i;
+        gboolean refused = global.conf->protocols != NULL;
+ 
+        for (i = 0; global.conf->protocols && global.conf->protocols[i]; i++)
+        {
+                if (g_strcasecmp(p->name, global.conf->protocols[i]) == 0)
+                        refused = FALSE;
+        }
+
+        if (refused)
+                log_message(LOGLVL_WARNING, "Protocol %s disabled\n", p->name);
+        else
+                protocols = g_list_append(protocols, p);
 }
 
@@ -371 +383 @@
 /* list.c */
 
-void imcb_add_buddy( struct im_connection *ic, char *handle, char *group )
+void imcb_add_buddy( struct im_connection *ic, const char *handle, const char *group )
 {
         user_t *u;
@@ -445 +457 @@
 }
 
-void imcb_rename_buddy( struct im_connection *ic, char *handle, char *realname )
+void imcb_rename_buddy( struct im_connection *ic, const char *handle, const char *realname )
 {
         user_t *u = user_findhandle( ic, handle );
+        char *set;
         
         if( !u || !realname ) return;
@@ -460 +473 @@
                         imcb_log( ic, "User `%s' changed name to `%s'", u->nick, u->realname );
         }
-}
-
-void imcb_remove_buddy( struct im_connection *ic, char *handle, char *group )
+        
+        set = set_getstr( &ic->acc->set, "nick_source" );
+        if( strcmp( set, "handle" ) != 0 )
+        {
+                char *name = g_strdup( realname );
+                
+                if( strcmp( set, "first_name" ) == 0 )
+                {
+                        int i;
+                        for( i = 0; name[i] && !isspace( name[i] ); i ++ ) {}
+                        name[i] = '\0';
+                }
+                
+                imcb_buddy_nick_hint( ic, handle, name );
+                
+                g_free( name );
+        }
+}
+
+void imcb_remove_buddy( struct im_connection *ic, const char *handle, char *group )
 {
         user_t *u;
@@ -472 +502 @@
 /* Mainly meant for ICQ (and now also for Jabber conferences) to allow IM
    modules to suggest a nickname for a handle. */
-void imcb_buddy_nick_hint( struct im_connection *ic, char *handle, char *nick )
+void imcb_buddy_nick_hint( struct im_connection *ic, const char *handle, const char *nick )
 {
         user_t *u = user_findhandle( ic, handle );
@@ -684 +714 @@
 }
 
-void imcb_buddy_msg( struct im_connection *ic, char *handle, char *msg, uint32_t flags, time_t sent_at )
+void imcb_buddy_msg( struct im_connection *ic, const char *handle, char *msg, uint32_t flags, time_t sent_at )
 {
         irc_t *irc = ic->irc;
@@ -817 +847 @@
 }
 
-void imcb_chat_msg( struct groupchat *c, char *who, char *msg, uint32_t flags, time_t sent_at )
+void imcb_chat_msg( struct groupchat *c, const char *who, char *msg, uint32_t flags, time_t sent_at )
 {
         struct im_connection *ic = c->ic;
@@ -889 +919 @@
 /* buddy_chat.c */
 
-void imcb_chat_add_buddy( struct groupchat *b, char *handle )
+void imcb_chat_add_buddy( struct groupchat *b, const char *handle )
 {
         user_t *u = user_findhandle( b->ic, handle );
@@ -924 +954 @@
 
 /* This function is one BIG hack... :-( EREWRITE */
-void imcb_chat_remove_buddy( struct groupchat *b, char *handle, char *reason )
+void imcb_chat_remove_buddy( struct groupchat *b, const char *handle, const char *reason )
 {
         user_t *u;
@@ -1073 +1103 @@
 int imc_away_send_update( struct im_connection *ic )
 {
-        char *away, *msg;
+        char *away, *msg = NULL;
         
         away = set_getstr( &ic->acc->set, "away" ) ?