Changes in query.c [5f4eede:9143aeb]

File:

• query.c (modified) (3 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 );
@@ -102 +103 @@
         int count = 0;
         
-        if(!ic)
-                return;
-        
         q = irc->queries;
         def = query_default( irc );
@@ -143 +141 @@
         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 );
+                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 );
+                q->no( q->data );
         }
         q->data = NULL;