Changeset dd34575 for query.c


Ignore:
Timestamp:
2008-04-02T13:28:23Z (16 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
6ff51ff, 85d7b85
Parents:
0db75ad (diff), fa75134 (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 trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • query.c

    r0db75ad rdd34575  
    140140        if( ans )
    141141        {
    142                 imcb_log( q->ic, "Accepted: %s", q->question );
     142                if( q->ic )
     143                        imcb_log( q->ic, "Accepted: %s", q->question );
     144                else
     145                        irc_usermsg( irc, "Accepted: %s", q->question );
    143146                q->yes( NULL, q->data );
    144147        }
    145148        else
    146149        {
    147                 imcb_log( q->ic, "Rejected: %s", q->question );
     150                if( q->ic )
     151                        imcb_log( q->ic, "Rejected: %s", q->question );
     152                else
     153                        irc_usermsg( irc, "Rejected: %s", q->question );
    148154                q->no( NULL, q->data );
    149155        }
Note: See TracChangeset for help on using the changeset viewer.