Changes in protocols/purple/purple.c [56699f0:f85e9d6]

File:

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

protocols/purple/purple.c

@@ -35 +35 @@
    any context so this is the only way to get that. Don't want to support
    libpurple in daemon mode anyway. */
-static bee_t *local_bee;
+static irc_t *local_irc;
 
 static char *set_eval_display_name( set_t *set, char *value );
@@ -157 +157 @@
                         
                 default:
-                        /** No way to talk to the user right now, invent one when
-                        this becomes important.
                         irc_usermsg( acc->irc, "Setting with unknown type: %s (%d) Expect stuff to break..\n",
                                      name, purple_account_option_get_type( o ) );
-                        */
                         name = NULL;
                 }
@@ -254 +251 @@
         PurpleAccount *pa;
         
-        if( local_bee != NULL && local_bee != acc->bee )
-        {
-                imcb_error( ic,  "Daemon mode detected. Do *not* try to use libpurple in daemon mode! "
-                                 "Please use inetd or ForkDaemon mode instead." );
-                imc_logout( ic, FALSE );
+        if( local_irc != NULL && local_irc != acc->irc )
+        {
+                irc_usermsg( acc->irc, "Daemon mode detected. Do *not* try to use libpurple in daemon mode! "
+                                       "Please use inetd or ForkDaemon mode instead." );
                 return;
         }
-        local_bee = acc->bee;
+        local_irc = acc->irc;
         
         /* For now this is needed in the _connected() handlers if using
@@ -687 +683 @@
                 imcb_buddy_status( ic, bud->name, flags, purple_status_get_name( as ),
                                    purple_status_get_attr_string( as, "message" ) );
-                
-                imcb_buddy_times( ic, bud->name,
-                                  purple_presence_get_login_time( bud->presence ),
-                                  purple_presence_get_idle_time( bud->presence ) );
         }
 }
@@ -874 +866 @@
         pqad->user_data = user_data;
         
-        /* TODO: IRC stuff here :-( */
         q = g_strdup_printf( "Request: %s\n\n%s\n\n%s", title, primary, secondary );
-        pqad->bee_data = query_add( local_bee->ui_data, purple_ic_by_pa( account ), q,
+        pqad->bee_data = query_add( local_irc, purple_ic_by_pa( account ), q,
                 prplcb_request_action_yes, prplcb_request_action_no, pqad );