pidgin.vv: 85389d6c: Remove some extra edits that snuck into ...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 85389d6ca8dc05827fa7e57e17906b2f73e2c676
Ancestor: e88cf2f16fad3ff4dbcf4c59bc35103168e2af6e
Author: maiku at soc.pidgin.im
Date: 2009-03-23T01:06:15
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/85389d6ca8dc05827fa7e57e17906b2f73e2c676

Modified files:
        finch/gntaccount.c finch/gntdebug.c finch/gntft.c
        finch/gntnotify.c finch/gntplugin.c finch/gntpounce.c
        finch/gntrequest.c finch/gntstatus.c finch/gntui.c
        finch/libgnt/wms/s.c

ChangeLog: 

Remove some extra edits that snuck into Finch.

-------------- next part --------------
============================================================
--- finch/gntaccount.c	c9d7181124827154c66a6a9e8a23e9c6cbb6b5a1
+++ finch/gntaccount.c	ad5bad90ce6fb9b08f62329ac36e8cc5dcfb71d0
@@ -1099,4 +1099,3 @@ PurpleAccountUiOps *finch_accounts_get_u
 	return &ui_ops;
 }
 
-
============================================================
--- finch/gntdebug.c	a8bdd0e3b9f5d6b286928f933023fb07af5a978b
+++ finch/gntdebug.c	f25109c6fe8c8ae2972323f72b22a923c334829a
@@ -23,8 +23,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "util.h"
-
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -38,6 +36,7 @@
 #include "gntdebug.h"
 #include "finch.h"
 #include "notify.h"
+#include "util.h"
 
 #include <stdio.h>
 #include <string.h>
============================================================
--- finch/gntft.c	9a0e0cea0208bdceef3c9af5ecbbe28c3f58076f
+++ finch/gntft.c	464c5a1c86e38be2ffb920b661097679d0909688
@@ -25,12 +25,6 @@
  */
 #include "finch.h"
 
-#include "debug.h"
-#include "notify.h"
-#include "ft.h"
-#include "prpl.h"
-#include "util.h"
-
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -38,6 +32,12 @@
 #include <gntlabel.h>
 #include <gnttree.h>
 
+#include "debug.h"
+#include "notify.h"
+#include "ft.h"
+#include "prpl.h"
+#include "util.h"
+
 #include "gntft.h"
 #include "prefs.h"
 
============================================================
--- finch/gntnotify.c	9d69105ee2af7b86900e19d894f38213698bc0f5
+++ finch/gntnotify.c	c9f267524c4411e19306cfaa762b5d800b94873e
@@ -23,8 +23,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include <util.h>
-
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -35,6 +33,7 @@
 
 #include "finch.h"
 
+#include <util.h>
 
 #include "gntnotify.h"
 #include "debug.h"
============================================================
--- finch/gntplugin.c	f99cfb577d6d3cd99b90d3ca1ddbe4feb912d357
+++ finch/gntplugin.c	de6a2c7d1b48b79e31995896ff37ba983b42c991
@@ -23,9 +23,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "notify.h"
-#include "request.h"
-
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -37,6 +34,8 @@
 #include "finch.h"
 
 #include "debug.h"
+#include "notify.h"
+#include "request.h"
 
 #include "gntplugin.h"
 #include "gntrequest.h"
============================================================
--- finch/gntpounce.c	f6107c79b301e97c1652ebff52abe9fea763f9b2
+++ finch/gntpounce.c	6f2b17da15f2d323271e599d32bbbb32427c5903
@@ -24,16 +24,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include "internal.h"
-#include "account.h"
-#include "conversation.h"
-#include "debug.h"
-#include "notify.h"
-#include "prpl.h"
-#include "request.h"
-#include "server.h"
-#include "util.h"
-
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -47,6 +37,15 @@
 
 #include "finch.h"
 
+#include "account.h"
+#include "conversation.h"
+#include "debug.h"
+#include "notify.h"
+#include "prpl.h"
+#include "request.h"
+#include "server.h"
+#include "util.h"
+
 #include "gntpounce.h"
 
 
============================================================
--- finch/gntrequest.c	ebd160f873ca9411db226fa7b1e29214ba37fe2b
+++ finch/gntrequest.c	bebb397405fd5e53b8cc8c2156683f9b62354f61
@@ -23,9 +23,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-
-#include "util.h"
-
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
============================================================
--- finch/gntstatus.c	ded87b222a72945fcce7811cc8334a2a74a44674
+++ finch/gntstatus.c	d5c598d5a2a03f0a3b911e3a3ac3a3e7a2aa4c13
@@ -23,10 +23,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-
-#include <notify.h>
-#include <request.h>
-
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -39,6 +35,9 @@
 
 #include "finch.h"
 
+#include <notify.h>
+#include <request.h>
+
 #include "gntstatus.h"
 
 static struct
============================================================
--- finch/gntui.c	378563e37041e431c152b71bf0bd50e1c8bd50de
+++ finch/gntui.c	c51864a6b76d20a1041fb44f305b412ab764e5d7
@@ -19,9 +19,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include <prefs.h>
 #include "finch.h"
 
+#include "gntui.h"
 
 #include "gntaccount.h"
 #include "gntblist.h"
@@ -41,7 +41,7 @@
 #include "gntstatus.h"
 #include "gntsound.h"
 
-#include "gntui.h"
+#include <prefs.h>
 
 void gnt_ui_init()
 {
============================================================
--- finch/libgnt/wms/s.c	4c6469a55225b730d24abf5feec215f975ed9f55
+++ finch/libgnt/wms/s.c	667904c592fd5b19ccc4ead46fd91004f4ac671d
@@ -2,7 +2,6 @@
 #include <sys/types.h>
 
 #include "internal.h"
-#include "blist.h"
 
 #include "gnt.h"
 #include "gntbox.h"
@@ -12,6 +11,7 @@
 #include "gntwindow.h"
 #include "gntlabel.h"
 
+#include "blist.h"
 
 #define TYPE_S				(s_get_gtype())