Changeset b79308b for query.c

Timestamp:

2008-04-14T13:10:53Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

0cab388

Parents:

6cac643 (diff), aa31117 (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:

merged in upstream r379 (somewhere after 1.2-3).
Just one trivial conflict in the jabber Makefile, went smoothly.

File:

• query.c (modified) (2 diffs)

query.c

@@ -30 +30 @@
 static query_t *query_default( irc_t *irc );
 
-query_t *query_add( irc_t *irc, struct im_connection *ic, char *question, void *yes, void *no, void *data )
+query_t *query_add( irc_t *irc, struct im_connection *ic, char *question,
+                    query_callback yes, query_callback no, void *data )
 {
         query_t *q = g_new0( query_t, 1 );
@@ -140 +141 @@
         if( ans )
         {
-                imcb_log( q->ic, "Accepted: %s", q->question );
-                q->yes( NULL, q->data );
+                if( q->ic )
+                        imcb_log( q->ic, "Accepted: %s", q->question );
+                else
+                        irc_usermsg( irc, "Accepted: %s", q->question );
+                q->yes( q->data );
         }
         else
         {
-                imcb_log( q->ic, "Rejected: %s", q->question );
-                q->no( NULL, q->data );
+                if( q->ic )
+                        imcb_log( q->ic, "Rejected: %s", q->question );
+                else
+                        irc_usermsg( irc, "Rejected: %s", q->question );
+                q->no( q->data );
         }
         q->data = NULL;