changeset 20083:6e2bd948a897

merge of '249b00cea42025dd90023ffcffb778f320c99c99' and '7e7c1dcb86828e5d333f960959a5b86a4b02556e'
author Eoin Coffey <ecoffey@soc.pidgin.im>
date Sun, 16 Sep 2007 01:40:57 +0000
parents 539d042c8fc6 (diff) 90b5255f0a30 (current diff)
children de39f3855e8f bd60afa72fce
files pidgin/gtkblist.c
diffstat 178 files changed, 532 insertions(+), 355 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Sep 15 23:58:30 2007 +0000
+++ b/ChangeLog	Sun Sep 16 01:40:57 2007 +0000
@@ -12,6 +12,7 @@
 	  is listening to some soothing music.
 	* 'Move to' menu in buddy list context menu for moving buddies to
   	   other groups
+	* Move "Smiley" to the top-level of the toolbar
 
 Version 2.2.0 (09/13/2007):
 	http://developer.pidgin.im/query?status=closed&milestone=2.2.0
--- a/finch/finch.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/finch.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,7 +1,8 @@
 /**
  * @defgroup finch Finch (GNT User Interface)
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntaccount.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntaccount.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntaccount.c GNT Account API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntaccount.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntaccount.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntaccount.h GNT Account API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntblist.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntblist.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntblist.c GNT BuddyList API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntblist.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntblist.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntblist.h GNT BuddyList API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntcertmgr.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntcertmgr.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntcertmgr.c GNT Certificate Manager API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntcertmgr.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntcertmgr.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntcertmgr.h GNT Certificate Manager API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntconn.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntconn.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntconn.c GNT Connection API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntconn.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntconn.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntconn.h GNT Connection API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntconv.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntconv.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntconv.c GNT Conversation API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntconv.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntconv.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntconv.h GNT Conversation API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntdebug.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntdebug.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntdebug.c GNT Debug API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntdebug.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntdebug.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntdebug.h GNT Debug API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntft.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntft.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntft.c GNT File Transfer UI
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntft.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntft.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntft.h GNT File Transfer UI
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntidle.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntidle.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntidle.h GNT Idle API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntnotify.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntnotify.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntnotify.c GNT Notify API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntnotify.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntnotify.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntnotify.h GNT Notify API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntplugin.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntplugin.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntplugin.c GNT Plugins API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntplugin.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntplugin.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntplugin.h GNT Plugins API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntpounce.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntpounce.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntpounce.c GNT Buddy Pounce API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntpounce.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntpounce.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntpounce.h GNT Buddy Pounce API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntprefs.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntprefs.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntprefs.c GNT Preferences API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntprefs.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntprefs.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntprefs.h GNT Preferences API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntrequest.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntrequest.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntrequest.c GNT Request API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntrequest.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntrequest.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntrequest.h GNT Request API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntsound.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntsound.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntsound.c GNT Sound API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntsound.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntsound.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntsound.h GNT Sound API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntstatus.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntstatus.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntstatus.c GNT Status API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/finch/gntstatus.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/finch/gntstatus.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gntstatus.h GNT Status API
  * @ingroup finch
- *
- * finch
+ */
+
+/* finch
  *
  * Finch is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/account.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/account.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file account.c Account API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/account.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/account.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file account.h Account API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/accountopt.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/accountopt.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file accountopt.c Account Options API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/accountopt.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/accountopt.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file accountopt.h Account Options API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/blist.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/blist.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file blist.h Buddy List API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/buddyicon.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/buddyicon.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file icon.c Buddy Icon API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/buddyicon.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/buddyicon.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file buddyicon.h Buddy Icon API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/cipher.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/cipher.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file cipher.h Purple Cipher API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/circbuffer.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/circbuffer.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file circbuffer.h Buffer Utility Functions
  * @ingroup core
- *
- * Purple is the legal property of its developers, whose names are too numerous
+ */
+
+/* Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
--- a/libpurple/circbuffer.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/circbuffer.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
-/*
+/**
  * @file circbuffer.h Buffer Utility Functions
  * @ingroup core
- *
- * Purple is the legal property of its developers, whose names are too numerous
+ */
+
+/* Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
--- a/libpurple/cmds.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/cmds.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file cmds.c Commands API
  * @ingroup core
- *
- * Copyright (C) 2003-2004 Timothy Ringenbach <omarvo@hotmail.com
+ */
+
+/* Copyright (C) 2003-2004 Timothy Ringenbach <omarvo@hotmail.com
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
--- a/libpurple/cmds.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/cmds.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file cmds.h Commands API
  * @ingroup core
- *
- * Copyright (C) 2003 Timothy Ringenbach <omarvo@hotmail.com>
+ */
+
+/* Copyright (C) 2003 Timothy Ringenbach <omarvo@hotmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
--- a/libpurple/connection.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/connection.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file connection.c Connection API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/connection.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/connection.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file connection.h Connection API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/conversation.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/conversation.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file conversation.h Conversation API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/core.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/core.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file core.c Purple Core API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/core.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/core.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,7 +1,8 @@
 /**
  * @defgroup core libpurple
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/dbus-bindings.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/dbus-bindings.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file dbus-bindings.h Purple DBUS Bindings
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/dbus-server.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/dbus-server.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file dbus-server.h Purple DBUS Server
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/debug.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/debug.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file debug.c Debug API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/debug.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/debug.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file debug.h Debug API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/desktopitem.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/desktopitem.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file purple-desktop-item.c Functions for managing .desktop files
  * @ingroup core
- *
- * Purple is the legal property of its developers, whose names are too numerous
+ */
+
+/* Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
--- a/libpurple/desktopitem.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/desktopitem.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file desktopitem.h Functions for managing .desktop files
  * @ingroup core
- *
- * Purple is the legal property of its developers, whose names are too numerous
+ */
+
+/* Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
--- a/libpurple/dnsquery.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/dnsquery.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file dnsquery.c DNS query API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/dnsquery.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/dnsquery.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file dnsquery.h DNS query API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/dnssrv.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/dnssrv.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,7 +1,8 @@
 /**
  * @file dnssrv.c
- *
- * purple
+ */
+
+/* purple
  *
  * Copyright (C) 2005 Thomas Butter <butter@uni-mannheim.de>
  *
--- a/libpurple/dnssrv.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/dnssrv.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,10 +1,11 @@
 /**
  * @file dnssrv.h
- *
- * purple
+ */
+
+/* purple
  *
  * Copyright (C) 2005, Thomas Butter <butter@uni-mannheim.de>
- *i
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
--- a/libpurple/eventloop.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/eventloop.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file eventloop.c Purple Event Loop API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/eventloop.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/eventloop.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file eventloop.h Purple Event Loop API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/ft.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/ft.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,7 +1,8 @@
 /**
  * @file ft.c File Transfer API
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/ft.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/ft.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file ft.h File Transfer API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/gaim-compat.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/gaim-compat.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gaim-compat.h Gaim Compat macros
  * @ingroup core
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/idle.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/idle.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file idle.h Idle API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/imgstore.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/imgstore.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file imgstore.h IM Image Store API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/imgstore.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/imgstore.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file imgstore.h IM Image Store API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/internal.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/internal.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file internal.h Internal definitions and includes
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/log.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/log.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file log.c Logging API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/log.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/log.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file log.h Logging API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/nat-pmp.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/nat-pmp.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file nat-pmp.c NAT-PMP Implementation
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/nat-pmp.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/nat-pmp.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file nat-pmp.h NAT-PMP Implementation
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/network.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/network.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file network.c Network Implementation
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/network.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/network.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file network.h Network API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/notify.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/notify.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file notify.c Notification API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/notify.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/notify.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file notify.h Notification API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/ntlm.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/ntlm.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,7 +1,8 @@
 /**
  * @file ntlm.c
- *
- * purple
+ */
+
+/* purple
  *
  * Copyright (C) 2005 Thomas Butter <butter@uni-mannheim.de>
  *
--- a/libpurple/ntlm.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/ntlm.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,7 +1,8 @@
 /**
  * @file ntlm.h
- *
- * purple
+ */
+
+/* purple
  *
  * Copyright (C) 2005, Thomas Butter <butter@uni-mannheim.de>
  *
--- a/libpurple/plugin.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/plugin.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file plugin.h Plugin API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/pluginpref.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/pluginpref.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file pluginpref.h Plugin Preferences API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/pounce.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/pounce.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file pounce.c Buddy Pounce API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/pounce.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/pounce.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file pounce.h Buddy Pounce API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/prefs.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/prefs.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file prefs.h Prefs API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/privacy.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/privacy.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file privacy.h Privacy API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/protocols/jabber/jabber.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sun Sep 16 01:40:57 2007 +0000
@@ -141,6 +141,7 @@
 		if(jabber_process_starttls(js, packet))
 			return;
 	} else if(purple_account_get_bool(js->gc->account, "require_tls", FALSE) && !js->gsc) {
+		js->gc->wants_to_die = TRUE;
 		purple_connection_error(js->gc, _("You require encryption, but it is not available on this server."));
 		return;
 	}
--- a/libpurple/proxy.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/proxy.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file proxy.c Proxy API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/proxy.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/proxy.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file proxy.h Proxy API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/prpl.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/prpl.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file prpl.h Protocol Plugin functions
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/request.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/request.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file request.c Request API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/request.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/request.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file request.h Request API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/roomlist.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/roomlist.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file roomlist.c Room List API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/roomlist.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/roomlist.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file roomlist.h Room List API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/savedstatuses.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/savedstatuses.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file savedstatuses.c Saved Status API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/savedstatuses.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/savedstatuses.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file savedstatuses.h Saved Status API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/server.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/server.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file server.h Server API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/signals.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/signals.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file signals.c Signal API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/signals.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/signals.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file signals.h Signal API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/sound.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/sound.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file sound.h Sound API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/sslconn.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/sslconn.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file sslconn.c SSL API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/sslconn.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/sslconn.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file sslconn.h SSL API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/status.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/status.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file status.c Status API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/stringref.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/stringref.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file stringref.c Reference-counted immutable strings
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/stringref.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/stringref.h	Sun Sep 16 01:40:57 2007 +0000
@@ -3,8 +3,9 @@
 /**
  * @file stringref.h Reference-counted immutable strings
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/stun.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/stun.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file stun.c STUN (RFC3489) Implementation
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * STUN implementation inspired by jstun [http://jstun.javawi.de/]
  *
--- a/libpurple/stun.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/stun.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file stun.h STUN API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/upnp.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/upnp.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file upnp.c UPnP Implementation
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/upnp.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/upnp.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file upnp.h Universal Plug N Play API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/util.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/util.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file util.h Utility Functions
  * @ingroup core
- *
- * Purple is the legal property of its developers, whose names are too numerous
+ */
+
+/* Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
--- a/libpurple/util.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/util.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file util.h Utility Functions
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/value.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/value.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file value.c Value wrapper API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/value.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/value.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file value.h Value wrapper API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/version.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/version.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file version.c Version Functions
  * @ingroup core
- *
- * Purple is the legal property of its developers, whose names are too numerous
+ */
+
+/* Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
--- a/libpurple/whiteboard.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/whiteboard.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,7 +1,8 @@
 /**
  * @file whiteboard.h The PurpleWhiteboard core object
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/xmlnode.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/xmlnode.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,7 +1,8 @@
 /**
  * @file xmlnode.c XML DOM functions
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/libpurple/xmlnode.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/libpurple/xmlnode.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file xmlnode.h XML DOM functions
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkaccount.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkaccount.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkaccount.c GTK+ Account Editor UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkaccount.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkaccount.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkaccount.h GTK+ Account Editor UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkblist.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkblist.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file gtkblist.c GTK+ BuddyList API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkblist.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkblist.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkblist.h GTK+ Buddy List API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkcellrendererexpander.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkcellrendererexpander.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file gtkcellrendererexpander.c GTK+ Cell Renderer Expander
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkcellrendererprogress.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkcellrendererprogress.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file gtkcellrendererprogress.c GTK+ Cell Renderer Progress
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkcertmgr.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkcertmgr.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file gtkcertmgr.c GTK+ Certificate Manager API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkconn.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkconn.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file gtkconn.c GTK+ Connection API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkconn.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkconn.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,7 +1,8 @@
 /**
  * @file gtkconn.h GTK+ Connection API
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkconv.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkconv.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkconv.c GTK+ Conversation API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkconv.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkconv.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkconv.h GTK+ Conversation API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkconvwin.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkconvwin.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkconvwin.h GTK+ Conversation Window API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkdebug.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkdebug.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkdebug.c GTK+ Debug API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkdebug.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkdebug.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkdebug.h GTK+ Debug API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkdialogs.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkdialogs.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file gtkdialogs.c GTK+ Dialogs
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkdialogs.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkdialogs.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,7 +1,8 @@
 /**
  * @defgroup pidgin Pidgin (GTK+ User Interface)
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkdnd-hints.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkdnd-hints.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file gtkdnd-hints.c GTK+ Drag-and-Drop arrow hints
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkdnd-hints.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkdnd-hints.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkdnd-hints.h GTK+ Drag-and-Drop arrow hints
  * @ingroup pidgin
- *
- * Pidgin is the legal property of its developers, whose names are too numerous
+ */
+
+/* Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
--- a/pidgin/gtkeventloop.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkeventloop.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtk_eventloop.c Purple Event Loop API (gtk implementation)
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkeventloop.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkeventloop.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkeventloop.h Pidgin GTK+ Event Loop Implementation
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkft.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkft.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkft.c GTK+ File Transfer UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkft.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkft.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkft.h GTK+ File Transfer UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkgaim-compat.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkgaim-compat.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,7 +1,8 @@
 /**
  * @file gtkgaim-compat.h Gtk Gaim Compat macros
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkidle.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkidle.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkidle.h GTK+ Idle API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkimhtml.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkimhtml.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file gtkimhtml.c GTK+ IMHtml
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkimhtml.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkimhtml.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkimhtml.h GTK+ IM/HTML rendering component
  * @ingroup pidgin
- *
- * Pidgin is the legal property of its developers, whose names are too numerous
+ */
+
+/* Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
--- a/pidgin/gtkimhtmltoolbar.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file gtkimhtmltoolbar.c GTK+ IMHtml Toolbar
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtklog.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtklog.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtklog.c GTK+ Log viewer
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtklog.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtklog.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtklog.h GTK+ Log viewer
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkmenutray.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkmenutray.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkmenutray.h GTK+ Tray menu item
  * @ingroup pidgin
- *
- * Pidgin is the legal property of its developers, whose names are too numerous
+ */
+
+/* Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
--- a/pidgin/gtknickcolors.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtknickcolors.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtknickcolors.h GTK+ Conversation API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
--- a/pidgin/gtknotify.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtknotify.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtknotify.c GTK+ Notification API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtknotify.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtknotify.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtknotify.h GTK+ Notification API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkplugin.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkplugin.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkplugin.c GTK+ Plugins support
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkplugin.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkplugin.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkplugin.h GTK+ Plugin API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkpluginpref.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkpluginpref.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkpluginpref.c GTK+ Plugin preferences
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkpluginpref.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkpluginpref.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkpluginpref.h GTK+ Plugin Preferences
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkpounce.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkpounce.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkpounce.c GTK+ Buddy Pounce API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkpounce.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkpounce.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkpounce.h GTK+ Buddy Pounce API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkprefs.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkprefs.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkprefs.c GTK+ Preferences
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkprefs.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkprefs.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkprefs.h GTK+ Preferences
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkprivacy.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkprivacy.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkprivacy.c GTK+ Privacy UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkprivacy.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkprivacy.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkprivacy.h GTK+ Privacy UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkrequest.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkrequest.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkrequest.c GTK+ Request API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
@@ -998,7 +999,6 @@
 
 	/* Create the tree view */
 	treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
-	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview), TRUE);
 	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
 
 	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
--- a/pidgin/gtkrequest.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkrequest.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkrequest.h GTK+ Request API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkroomlist.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkroomlist.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkroomlist.c GTK+ Room List UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkroomlist.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkroomlist.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkroomlist.h GTK+ Room List UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtksavedstatuses.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtksavedstatuses.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtksavedstatus.c GTK+ Saved Status Editor UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtksavedstatuses.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtksavedstatuses.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtksavedstatuses.h GTK+ Saved Status Editor UI
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkscrollbook.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkscrollbook.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file gtkscrollbook.c GTK+ Scrolling notebook widget 
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkscrollbook.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkscrollbook.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file gtkscrollbook  GTK+ Scrolling notebook Widget
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtksession.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtksession.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file gtksession.c X Windows session management API
  * @ingroup pidgin
- *
- * Pidgin is the legal property of its developers, whose names are too numerous
+ */
+
+/* Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
--- a/pidgin/gtksession.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtksession.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtksession.h X Windows session management API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtksound.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtksound.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file gtksound.c GTK+ Sound
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtksound.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtksound.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtksound.h GTK+ Sound API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkstatusbox.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file gtkstatusbox.c GTK+ Status Selection Widget
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkstatusbox.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkstatusbox.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /*
  * @file gtkstatusbox.c GTK+ Status Selection Widget
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkthemes.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkthemes.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkthemes.h GTK+ Smiley Theme API
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkutils.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkutils.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkutils.c GTK+ utility functions
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkutils.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkutils.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gtkutils.h GTK+ utility functions
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/gtkwhiteboard.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/gtkwhiteboard.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,7 +1,8 @@
 /**
  * @file gtkwhiteboard.h The PidginWhiteboard frontend object
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/pidgin.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/pidgin.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file pidgin.h UI definitions and includes
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/pidginstock.c	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/pidginstock.c	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file pidginstock.c GTK+ Stock resources
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
--- a/pidgin/pidginstock.h	Sat Sep 15 23:58:30 2007 +0000
+++ b/pidgin/pidginstock.h	Sun Sep 16 01:40:57 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file pidginstock.h GTK+ Stock resources
  * @ingroup pidgin
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this