Mercurial > pidgin
changeset 18825:952c01c26d67
merge of '3d3413c72d837a38e71907dab714b6b4ddd4a5af'
and 'e4a4828b90bf84ab1080455e29ac8770e0276211'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 07 Aug 2007 06:45:23 +0000 |
| parents | 8410abf85678 (current diff) 8e09a0c971b9 (diff) |
| children | f8bea3e688b0 2ae9b483c4db |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Doxyfile.in Tue Aug 07 00:13:57 2007 +0000 +++ b/Doxyfile.in Tue Aug 07 06:45:23 2007 +0000 @@ -300,7 +300,7 @@ # by member name. If set to NO (the default) the members will appear in # declaration order. -SORT_BRIEF_DOCS = YES +SORT_BRIEF_DOCS = NO # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be # sorted by fully-qualified names, including namespaces. If set to
--- a/libpurple/conversation.c Tue Aug 07 00:13:57 2007 +0000 +++ b/libpurple/conversation.c Tue Aug 07 06:45:23 2007 +0000 @@ -1106,7 +1106,7 @@ c = purple_conv_im_get_conversation(im); - /* Raise the window, if specified in prefs. */ + /* Pass this on to either the ops structure or the default write func. */ if (c->ui_ops != NULL && c->ui_ops->write_im != NULL) c->ui_ops->write_im(c, who, message, flags, mtime); else