HGKeeper

pidgin/pidgin

Fix Finch for the libgnt single header file

2020-08-15, Gary Kramlich

ec08ac1f7d5f

Parents 09975c2082c5
Children 05663def7b82

Fix Finch for the libgnt single header file

Fix finch for the gnt.h single include header

Testing Done:
Compiled on linux and ran finch-docs.

Reviewed at https://reviews.imfreedom.org/r/70/

25 files changed, 21 insertions(+), 142 deletions(-)

+0 -10

+1 -17

+1 -2

+2 -14

+0 -2

+0 -8

+3 -2

+0 -7

+1 -1

+2 -5

+2 -5

+0 -1

+0 -6

+0 -6

+0 -9

+2 -2

+0 -9

+3 -8

+0 -8

+2 -8

+0 -1

finch/plugins/gntclipboard.c

+0 -5

finch/plugins/gntgf.c

+1 -3

finch/plugins/gnttinyurl.c

+1 -1

finch/plugins/grouping.c

+0 -2

finch/plugins/lastlog.c

~~--- a/finch/gntaccount.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntaccount.c Sat Aug 15 23:33:09 2020 -0500

@@ -25,16 +25,6 @@

#include <purple.h>

#include <gnt.h>

~~-#include <gntbox.h>~~

~~-#include <gntbutton.h>~~

~~-#include <gntcheckbox.h>~~

~~-#include <gntcombobox.h>~~

~~-#include <gntentry.h>~~

~~-#include <gntlabel.h>~~

~~-#include <gntline.h>~~

~~-#include <gnttree.h>~~

~~-#include <gntutils.h>~~

~~-#include <gntwindow.h>~~

#include "finch.h"

~~--- a/finch/gntblist.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntblist.c Sat Aug 15 23:33:09 2020 -0500

@@ -28,23 +28,7 @@

#include <purple.h>

~~-#include "gntbox.h"~~

~~-#include "gntcolors.h"~~

~~-#include "gntcombobox.h"~~

~~-#include "gntentry.h"~~

~~-#include "gntxfer.h"~~

~~-#include "gntlabel.h"~~

~~-#include "gntline.h"~~

~~-#include "gntlog.h"~~

~~-#include "gntmenu.h"~~

~~-#include "gntmenuitem.h"~~

~~-#include "gntmenuitemcheck.h"~~

~~-#include "gntmenuutil.h"~~

~~-#include "gntpounce.h"~~

~~-#include "gntstyle.h"~~

~~-#include "gnttree.h"~~

~~-#include "gntutils.h"~~

~~-#include "gntwindow.h"~~

+#include <gnt.h>

#include "gntblist.h"

#include "gntconv.h"

~~--- a/finch/gntblist.h Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntblist.h Sat Aug 15 23:33:09 2020 -0500

@@ -36,8 +36,7 @@

#include <purple.h>

~~-#include "gnt.h"~~

~~-#include "gnttree.h"~~

+#include <gnt.h>

#define FINCH_TYPE_BUDDY_LIST (finch_buddy_list_get_type())

#define FINCH_TYPE_BLIST_MANAGER (finch_blist_manager_get_type())

~~--- a/finch/gntconv.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntconv.c Sat Aug 15 23:33:09 2020 -0500

@@ -30,6 +30,8 @@

#include <purple.h>

+#include <gnt.h>

#include "gntaccount.h"

#include "gntblist.h"

#include "gntconv.h"

@@ -41,20 +43,6 @@

#include "gntrequest.h"

#include "gntstatus.h"

~~-#include "gnt.h"~~

~~-#include "gntbox.h"~~

~~-#include "gntentry.h"~~

~~-#include "gntlabel.h"~~

~~-#include "gntmenu.h"~~

~~-#include "gntmenuitem.h"~~

~~-#include "gntmenuitemcheck.h"~~

~~-#include "gntmenuutil.h"~~

~~-#include "gntstyle.h"~~

~~-#include "gnttextview.h"~~

~~-#include "gnttree.h"~~

~~-#include "gntutils.h"~~

~~-#include "gntwindow.h"~~

#define PREF_ROOT "/finch/conversations"

#define PREF_CHAT PREF_ROOT "/chats"

#define PREF_USERLIST PREF_CHAT "/userlist"

~~--- a/finch/gntconv.h Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntconv.h Sat Aug 15 23:33:09 2020 -0500

@@ -35,8 +35,6 @@

#include <gnt.h>

~~-#include <gntwidget.h>~~

~~-#include <gntmenuitem.h>~~

#include <purple.h>

~~--- a/finch/gntdebug.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntdebug.c Sat Aug 15 23:33:09 2020 -0500

@@ -29,14 +29,6 @@

#include <purple.h>

#include <gnt.h>

~~-#include <gntbox.h>~~

~~-#include <gntbutton.h>~~

~~-#include <gntcheckbox.h>~~

~~-#include <gntentry.h>~~

~~-#include <gntfilesel.h>~~

~~-#include <gntlabel.h>~~

~~-#include <gntline.h>~~

~~-#include <gnttextview.h>~~

#include "gntdebug.h"

#include "finch.h"

~~--- a/finch/gntidle.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntidle.c Sat Aug 15 23:33:09 2020 -0500

@@ -22,10 +22,11 @@

#include <purple.h>

+#include <gnt.h>

#include "finch.h"

#include "gntidle.h"

~~-#include "gnt.h"~~

~~-#include "gntwm.h"~~

static time_t

finch_get_idle_time(void)

~~--- a/finch/gntlog.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntlog.c Sat Aug 15 23:33:09 2020 -0500

@@ -27,13 +27,6 @@

#include "finch.h"

#include <gnt.h>

~~-#include <gntbox.h>~~

~~-#include <gntbutton.h>~~

~~-#include <gntentry.h>~~

~~-#include <gntlabel.h>~~

~~-#include <gnttextview.h>~~

~~-#include <gnttree.h>~~

~~-#include <gntwindow.h>~~

#include "gntlog.h"

~~--- a/finch/gntlog.h Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntlog.h Sat Aug 15 23:33:09 2020 -0500

@@ -36,7 +36,7 @@

#include <purple.h>

~~-#include "gntwidget.h"~~

+#include <gnt.h>

typedef struct _FinchLogViewer FinchLogViewer;

~~--- a/finch/gntmedia.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntmedia.c Sat Aug 15 23:33:09 2020 -0500

@@ -26,15 +26,12 @@

#include <purple.h>

+#include <gnt.h>

#include "finch.h"

#include "gntconv.h"

#include "gntmedia.h"

~~-#include "gnt.h"~~

~~-#include "gntbutton.h"~~

~~-#include "gntbox.h"~~

~~-#include "gntlabel.h"~~

/* An incredibly large part of the following is from gtkmedia.c */

#ifdef USE_VV

~~--- a/finch/gntmenuutil.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntmenuutil.c Sat Aug 15 23:33:09 2020 -0500

@@ -22,12 +22,9 @@

#include <purple.h>

~~-#include "finch.h"~~

+#include <gnt.h>

~~-#include "gnt.h"~~

~~-#include "gntmenu.h"~~

~~-#include "gntmenuitem.h"~~

~~-#include "gntmenuutil.h"~~

+#include "finch.h"

static void

context_menu_callback(GntMenuItem *item, gpointer data)

~~--- a/finch/gntmenuutil.h Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntmenuutil.h Sat Aug 15 23:33:09 2020 -0500

@@ -37,7 +37,6 @@

#include <purple.h>

#include <gnt.h>

~~-#include <gntmenu.h>~~

/***************************************************************************

* GNT Menu Utility Functions

~~--- a/finch/gntnotify.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntnotify.c Sat Aug 15 23:33:09 2020 -0500

@@ -25,12 +25,6 @@

#include <purple.h>

#include <gnt.h>

~~-#include <gntbox.h>~~

~~-#include <gntbutton.h>~~

~~-#include <gntlabel.h>~~

~~-#include <gnttree.h>~~

~~-#include <gntutils.h>~~

~~-#include <gntwindow.h>~~

#include "finch.h"

~~--- a/finch/gntplugin.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntplugin.c Sat Aug 15 23:33:09 2020 -0500

@@ -25,12 +25,6 @@

#include <purple.h>

#include <gnt.h>

~~-#include <gntbox.h>~~

~~-#include <gntbutton.h>~~

~~-#include <gntlabel.h>~~

~~-#include <gntline.h>~~

~~-#include <gnttree.h>~~

~~-#include <gntutils.h>~~

#include "finch.h"

~~--- a/finch/gntpounce.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntpounce.c Sat Aug 15 23:33:09 2020 -0500

@@ -27,15 +27,6 @@

#include NCURSES_HEADER

#include <gnt.h>

~~-#include <gntbox.h>~~

~~-#include <gntbutton.h>~~

~~-#include <gntcheckbox.h>~~

~~-#include <gntcombobox.h>~~

~~-#include <gntentry.h>~~

~~-#include <gntlabel.h>~~

~~-#include <gntline.h>~~

~~-#include <gnttree.h>~~

~~-#include <gntutils.h>~~

#include "finch.h"

~~--- a/finch/gntprefs.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntprefs.c Sat Aug 15 23:33:09 2020 -0500

@@ -26,11 +26,11 @@

#include <purple.h>

+#include <gnt.h>

#include "gntprefs.h"

#include "gntrequest.h"

~~-#include "gnt.h"~~

~~-#include "gntwidget.h"~~

#include <string.h>

~~--- a/finch/gntrequest.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntrequest.c Sat Aug 15 23:33:09 2020 -0500

@@ -25,15 +25,6 @@

#include <purple.h>

#include <gnt.h>

~~-#include <gntbox.h>~~

~~-#include <gntbutton.h>~~

~~-#include <gntcheckbox.h>~~

~~-#include <gntcombobox.h>~~

~~-#include <gntentry.h>~~

~~-#include <gntfilesel.h>~~

~~-#include <gntlabel.h>~~

~~-#include <gntline.h>~~

~~-#include <gnttree.h>~~

#include "finch.h"

#include "gntrequest.h"

~~--- a/finch/gntroomlist.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntroomlist.c Sat Aug 15 23:33:09 2020 -0500

@@ -22,18 +22,13 @@

#include <glib/gi18n-lib.h>

~~-#include "finch.h"~~

+#include <finch.h>

+#include <gnt.h>

#include "gntrequest.h"

#include "gntroomlist.h"

~~-#include "gntbox.h"~~

~~-#include "gntbutton.h"~~

~~-#include "gntcombobox.h"~~

~~-#include "gnttextview.h"~~

~~-#include "gnttree.h"~~

~~-#include "gntwindow.h"~~

#define PREF_ROOT "/finch/roomlist"

~~--- a/finch/gntstatus.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntstatus.c Sat Aug 15 23:33:09 2020 -0500

@@ -25,14 +25,6 @@

#include <purple.h>

#include <gnt.h>

~~-#include <gntbox.h>~~

~~-#include <gntbutton.h>~~

~~-#include <gntcombobox.h>~~

~~-#include <gntentry.h>~~

~~-#include <gntlabel.h>~~

~~-#include <gntline.h>~~

~~-#include <gnttree.h>~~

~~-#include <gntutils.h>~~

#include "finch.h"

~~--- a/finch/gntxfer.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/gntxfer.c Sat Aug 15 23:33:09 2020 -0500

@@ -24,15 +24,9 @@

#include <purple.h>

~~-#include "finch.h"~~

+#include <gnt.h>

~~-#include <gnt.h>~~

~~-#include <gntbox.h>~~

~~-#include <gntbutton.h>~~

~~-#include <gntcheckbox.h>~~

~~-#include <gntlabel.h>~~

~~-#include <gnttree.h>~~

+#include "finch.h"

#include "gntxfer.h"

~~--- a/finch/plugins/gntclipboard.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/plugins/gntclipboard.c Sat Aug 15 23:33:09 2020 -0500

@@ -37,7 +37,6 @@

#include <purple.h>

#include <gnt.h>

~~-#include <gntwm.h>~~

#include <finch.h>

~~--- a/finch/plugins/gntgf.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/plugins/gntgf.c Sat Aug 15 23:33:09 2020 -0500

@@ -44,11 +44,6 @@

#include <purple.h>

#include <gnt.h>

~~-#include <gntbox.h>~~

~~-#include <gntbutton.h>~~

~~-#include <gntcheckbox.h>~~

~~-#include <gntlabel.h>~~

~~-#include <gnttree.h>~~

#include <finch.h>

~~--- a/finch/plugins/gnttinyurl.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/plugins/gnttinyurl.c Sat Aug 15 23:33:09 2020 -0500

@@ -30,9 +30,7 @@

#include <glib.h>

~~-#include <gntlabel.h>~~

~~-#include <gnttextview.h>~~

~~-#include <gntwindow.h>~~

+#include <gnt.h>

#include <finch.h>

~~--- a/finch/plugins/grouping.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/plugins/grouping.c Sat Aug 15 23:33:09 2020 -0500

@@ -20,7 +20,7 @@

#include <purple.h>

~~-#include "gnttree.h"~~

+#include <gnt.h>

#include <finch.h>

~~--- a/finch/plugins/lastlog.c Fri Aug 14 01:18:11 2020 -0500~~

+++ b/finch/plugins/lastlog.c Sat Aug 15 23:33:09 2020 -0500

@@ -23,8 +23,6 @@

#include <purple.h>

#include <gnt.h>

~~-#include <gnttextview.h>~~

~~-#include <gntwindow.h>~~

#include <finch.h>