Changeset e00da63

Timestamp:

2010-04-11T19:10:12Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

dbb0ce3

Parents:

a87e6ba

Message:

Restored query/ask stuff.

Files:

• Makefile (modified) (1 diff)
• protocols/nogaim.c (modified) (6 diffs)
• query.c (modified) (2 diffs)

Makefile

@@ -10 +10 @@
 
 # Program variables
-#objects = bitlbee.o chat.o dcc.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS)
-objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_channel.o irc_commands.o irc_send.o irc_user.o nick.o root_commands.o set.o storage.o $(STORAGE_OBJS)
+#objects = chat.o
+objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_channel.o irc_commands.o irc_send.o irc_user.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS)
 headers = account.h bitlbee.h commands.h conf.h config.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/ftutil.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/ft.h protocols/nogaim.h
 subdirs = lib protocols

protocols/nogaim.c

@@ -359 +359 @@
                query_callback doit, query_callback dont )
 {
-        //query_add( ic->irc, ic, msg, doit, dont, data );
+        query_add( (irc_t *) ic->bee->ui_data, ic, msg, doit, dont, data );
 }
 
@@ -452 +452 @@
 };
 
-#if 0
 static void imcb_ask_auth_cb_no( void *data )
 {
@@ -472 +471 @@
         g_free( cbd );
 }
-#endif
 
 void imcb_ask_auth( struct im_connection *ic, const char *handle, const char *realname )
 {
-#if 0
         struct imcb_ask_cb_data *data = g_new0( struct imcb_ask_cb_data, 1 );
         char *s, *realname_ = NULL;
@@ -490 +487 @@
         data->ic = ic;
         data->handle = g_strdup( handle );
-        query_add( ic->irc, ic, s, imcb_ask_auth_cb_yes, imcb_ask_auth_cb_no, data );
-#endif
-}
-
-
-#if 0
+        query_add( (irc_t *) ic->bee->ui_data, ic, s,
+                   imcb_ask_auth_cb_yes, imcb_ask_auth_cb_no, data );
+}
+
+
 static void imcb_ask_add_cb_no( void *data )
 {
@@ -510 +506 @@
         return imcb_ask_add_cb_no( data );
 }
-#endif
 
 void imcb_ask_add( struct im_connection *ic, const char *handle, const char *realname )
 {
-#if 0
         struct imcb_ask_cb_data *data = g_new0( struct imcb_ask_cb_data, 1 );
         char *s;
         
         /* TODO: Make a setting for this! */
-        if( user_findhandle( ic, handle ) != NULL )
+        if( bee_user_by_handle( ic->bee, ic, handle ) != NULL )
                 return;
         
@@ -526 +520 @@
         data->ic = ic;
         data->handle = g_strdup( handle );
-        query_add( ic->irc, ic, s, imcb_ask_add_cb_yes, imcb_ask_add_cb_no, data );
-#endif
+        query_add( (irc_t *) ic->bee->ui_data, ic, s,
+                   imcb_ask_add_cb_yes, imcb_ask_add_cb_no, data );
 }
 

query.c

@@ -64 +64 @@
         }
         
-        if( g_strcasecmp( set_getstr( &irc->set, "query_order" ), "lifo" ) == 0 || irc->queries == q )
+        if( g_strcasecmp( set_getstr( &irc->b->set, "query_order" ), "lifo" ) == 0 || irc->queries == q )
                 query_display( irc, q );
         
@@ -179 +179 @@
         query_t *q;
         
-        if( g_strcasecmp( set_getstr( &irc->set, "query_order" ), "fifo" ) == 0 )
+        if( g_strcasecmp( set_getstr( &irc->b->set, "query_order" ), "fifo" ) == 0 )
                 q = irc->queries;
         else