Changeset 6738a67 for query.c

Timestamp:

2008-07-16T23:22:52Z (16 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

9b55485

Parents:

9730d72 (diff), 6a78c0e (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:

merge in latest trunk

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 );
@@ -143 +144 @@
         if( ans )
         {
-                if(q->ic)
+                if( q->ic )
                         imcb_log( q->ic, "Accepted: %s", q->question );
                 else
                         irc_usermsg( irc, "Accepted: %s", q->question );
-                if(q->yes)
-                        q->yes( q->ic ? (gpointer)q->ic : (gpointer)irc, q->data );
+                if( q->yes )
+                        q->yes( q->data );
         }
         else
         {
-                if(q->ic)
+                if( q->ic )
                         imcb_log( q->ic, "Rejected: %s", q->question );
                 else
                         irc_usermsg( irc, "Rejected: %s", q->question );
-                if(q->no)
-                        q->no( q->ic ? (gpointer)q->ic : (gpointer)irc, q->data );
+                if( q->no )
+                        q->no( q->data );
         }
         q->data = NULL;