Mercurial > pidgin
changeset 26347:1c73d2ef9ddc
Remove some extra edits that snuck into Finch.
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Mon, 23 Mar 2009 01:06:15 +0000 |
| parents | 7b63af454f26 |
| children | d7393eebf1f4 |
| 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 |
| diffstat | 10 files changed, 25 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/gntaccount.c Sun Mar 22 23:33:42 2009 +0000 +++ b/finch/gntaccount.c Mon Mar 23 01:06:15 2009 +0000 @@ -1099,4 +1099,3 @@ return &ui_ops; } -
--- a/finch/gntdebug.c Sun Mar 22 23:33:42 2009 +0000 +++ b/finch/gntdebug.c Mon Mar 23 01:06:15 2009 +0000 @@ -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>
--- a/finch/gntft.c Sun Mar 22 23:33:42 2009 +0000 +++ b/finch/gntft.c Mon Mar 23 01:06:15 2009 +0000 @@ -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"
--- a/finch/gntnotify.c Sun Mar 22 23:33:42 2009 +0000 +++ b/finch/gntnotify.c Mon Mar 23 01:06:15 2009 +0000 @@ -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"
--- a/finch/gntplugin.c Sun Mar 22 23:33:42 2009 +0000 +++ b/finch/gntplugin.c Mon Mar 23 01:06:15 2009 +0000 @@ -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"
--- a/finch/gntpounce.c Sun Mar 22 23:33:42 2009 +0000 +++ b/finch/gntpounce.c Mon Mar 23 01:06:15 2009 +0000 @@ -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"
--- a/finch/gntrequest.c Sun Mar 22 23:33:42 2009 +0000 +++ b/finch/gntrequest.c Mon Mar 23 01:06:15 2009 +0000 @@ -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>
--- a/finch/gntstatus.c Sun Mar 22 23:33:42 2009 +0000 +++ b/finch/gntstatus.c Mon Mar 23 01:06:15 2009 +0000 @@ -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
--- a/finch/gntui.c Sun Mar 22 23:33:42 2009 +0000 +++ b/finch/gntui.c Mon Mar 23 01:06:15 2009 +0000 @@ -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() {
--- a/finch/libgnt/wms/s.c Sun Mar 22 23:33:42 2009 +0000 +++ b/finch/libgnt/wms/s.c Mon Mar 23 01:06:15 2009 +0000 @@ -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())