Changeset 8e9e2b7 for protocols/purple/purple.c

Timestamp:

2010-10-03T02:45:26Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

04f0c10

Parents:

88de0c9 (diff), 2af3e23 (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:

Merging mainline, which includes a huge msnp13 merge.

Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.

File:

• protocols/purple/purple.c (modified) (8 diffs)

protocols/purple/purple.c

@@ -80 +80 @@
         char help_title[64];
         GString *help;
+        static gboolean dir_fixed = FALSE;
+        
+        /* Layer violation coming up: Making an exception for libpurple here.
+           Dig in the IRC state a bit to get a username. Ideally we should
+           check if s/he identified but this info doesn't seem *that* important.
+           It's just that fecking libpurple can't *not* store this shit.
+           
+           Remember that libpurple is not really meant to be used on public
+           servers anyway! */
+        if( !dir_fixed )
+        {
+                irc_t *irc = acc->bee->ui_data;
+                char *dir;
+                
+                dir = g_strdup_printf( "%s/purple/%s", global.conf->configdir, irc->user->nick );
+                purple_util_set_user_dir( dir );
+                g_free( dir );
+                
+                purple_blist_load();
+                purple_prefs_load();
+                dir_fixed = TRUE;
+        }
         
         help = g_string_new( "" );
@@ -254 +276 @@
         PurpleAccount *pa;
         
-        if( local_bee != NULL && local_bee != acc->bee )
+        if( ( local_bee != NULL && local_bee != acc->bee ) ||
+            ( global.conf->runmode == RUNMODE_DAEMON && !getenv( "BITLBEE_DEBUG" ) ) )
         {
                 imcb_error( ic,  "Daemon mode detected. Do *not* try to use libpurple in daemon mode! "
@@ -351 +374 @@
         account_t *acc = set->data;
         struct im_connection *ic = acc->ic;
+        
+        if( ic )
+                imcb_log( ic, "Changing display_name not currently supported with libpurple!" );
         
         return NULL;
@@ -517 +543 @@
 }
 
-struct groupchat *purple_chat_join( struct im_connection *ic, const char *room, const char *nick, const char *password )
+struct groupchat *purple_chat_join( struct im_connection *ic, const char *room, const char *nick, const char *password, set_t **sets )
 {
         PurpleAccount *pa = ic->proto_data;
@@ -1132 +1158 @@
         GList *prots;
         GString *help;
+        char *dir;
         
         if( B_EV_IO_READ != PURPLE_INPUT_READ ||
@@ -1140 +1167 @@
         }
         
-        purple_util_set_user_dir( "/tmp" );
+        dir = g_strdup_printf( "%s/purple", global.conf->configdir );
+        purple_util_set_user_dir( dir );
+        g_free( dir );
+        
         purple_debug_set_enabled( FALSE );
         purple_core_set_ui_ops( &bee_core_uiops );
@@ -1151 +1181 @@
         }
         
-        /* This seems like stateful shit we don't want... */
         purple_set_blist( purple_blist_new() );
-        purple_blist_load();
-        
-        /* Meh? */
-        purple_prefs_load();
         
         /* No, really. So far there were ui_ops for everything, but now suddenly
@@ -1221 +1246 @@
         
         g_string_append( help, "\n\nFor used protocols, more information about available "
-                         "settings can be found using \x02help purple <protocol name>\x02" );
+                         "settings can be found using \x02help purple <protocol name>\x02 "
+                         "(create an account using that protocol first!)" );
         
         /* Add a simple dynamically-generated help item listing all