pidgin/pidgin

Make all of finch use purple.h

2020-05-01, Gary Kramlich
ca141ea93b83
Parents e6fe6fc1f516
Children e21f3bbcc2a5
Make all of finch use purple.h
39 files changed, 42 insertions(+), 134 deletions(-)
  • +1 -1
    finch/finch.c
  • +1 -1
    finch/gntaccount.h
  • +1 -13
    finch/gntblist.c
  • +2 -1
    finch/gntblist.h
  • +1 -5
    finch/gntconn.c
  • +1 -1
    finch/gntconn.h
  • +1 -5
    finch/gntconv.c
  • +1 -1
    finch/gntconv.h
  • +1 -2
    finch/gntdebug.c
  • +1 -1
    finch/gntdebug.h
  • +1 -2
    finch/gntidle.c
  • +1 -1
    finch/gntidle.h
  • +1 -6
    finch/gntlog.c
  • +2 -2
    finch/gntlog.h
  • +1 -4
    finch/gntmedia.c
  • +1 -1
    finch/gntmenuutil.h
  • +1 -2
    finch/gntnotify.c
  • +1 -1
    finch/gntnotify.h
  • +1 -2
    finch/gntplugin.h
  • +1 -8
    finch/gntpounce.c
  • +1 -1
    finch/gntpounce.h
  • +1 -2
    finch/gntprefs.c
  • +2 -1
    finch/gntrequest.h
  • +0 -2
    finch/gntroomlist.c
  • +1 -1
    finch/gntroomlist.h
  • +1 -5
    finch/gntsound.c
  • +1 -1
    finch/gntsound.h
  • +1 -2
    finch/gntstatus.c
  • +1 -2
    finch/gntstatus.h
  • +1 -1
    finch/gntui.c
  • +1 -6
    finch/gntxfer.c
  • +1 -2
    finch/gntxfer.h
  • +1 -16
    finch/libfinch.c
  • +2 -4
    finch/plugins/gntclipboard.c
  • +1 -7
    finch/plugins/gntgf.c
  • +1 -8
    finch/plugins/gnthistory.c
  • +1 -7
    finch/plugins/gnttinyurl.c
  • +1 -1
    finch/plugins/grouping.c
  • +1 -5
    finch/plugins/lastlog.c
    • --- a/finch/finch.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/finch.c Fri May 01 04:51:01 2020 -0500
    @@ -21,7 +21,7 @@
    */
    #include "internal.h"
    -#include "core.h"
    +#include <purple.h>
    #include "finch.h"
    #include "gnt.h"
    --- a/finch/gntaccount.h Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntaccount.h Fri May 01 04:51:01 2020 -0500
    @@ -30,7 +30,7 @@
    * @title: Account API
    */
    -#include "account.h"
    +#include <purple.h>
    /**********************************************************************
    * GNT Account API
    --- a/finch/gntblist.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntblist.c Fri May 01 04:51:01 2020 -0500
    @@ -25,19 +25,7 @@
    #include NCURSES_HEADER
    -#include <account.h>
    -#include <action.h>
    -#include <buddylist.h>
    -#include <log.h>
    -#include <notify.h>
    -#include <request.h>
    -#include <plugins.h>
    -#include <savedstatuses.h>
    -#include <server.h>
    -#include <signal.h>
    -#include <status.h>
    -#include <util.h>
    -#include "debug.h"
    +#include <purple.h>
    #include "gntbox.h"
    #include "gntcolors.h"
    --- a/finch/gntblist.h Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntblist.h Fri May 01 04:51:01 2020 -0500
    @@ -30,7 +30,8 @@
    * @title: Buddy List API
    */
    -#include "buddylist.h"
    +#include <purple.h>
    +
    #include "gnt.h"
    #include "gnttree.h"
    --- a/finch/gntconn.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntconn.c Fri May 01 04:51:01 2020 -0500
    @@ -23,11 +23,7 @@
    #include <internal.h>
    #include "finch.h"
    -#include "account.h"
    -#include "core.h"
    -#include "connection.h"
    -#include "debug.h"
    -#include "request.h"
    +#include <purple.h>
    #include "gntaccount.h"
    #include "gntconn.h"
    --- a/finch/gntconn.h Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntconn.h Fri May 01 04:51:01 2020 -0500
    @@ -30,7 +30,7 @@
    * @title: Connection API
    */
    -#include "connection.h"
    +#include <purple.h>
    /**********************************************************************
    * GNT Connection API
    --- a/finch/gntconv.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntconv.c Fri May 01 04:51:01 2020 -0500
    @@ -25,11 +25,7 @@
    #include NCURSES_HEADER
    -#include <cmds.h>
    -#include <core.h>
    -#include <idle.h>
    -#include <prefs.h>
    -#include <util.h>
    +#include <purple.h>
    #include "gntaccount.h"
    #include "gntblist.h"
    --- a/finch/gntconv.h Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntconv.h Fri May 01 04:51:01 2020 -0500
    @@ -34,7 +34,7 @@
    #include <gntwidget.h>
    #include <gntmenuitem.h>
    -#include "conversation.h"
    +#include <purple.h>
    /* Grabs the conv out of a PurpleConverstation */
    #define FINCH_CONV(conv) ((FinchConv *)purple_conversation_get_ui_data(conv))
    --- a/finch/gntdebug.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntdebug.c Fri May 01 04:51:01 2020 -0500
    @@ -21,6 +21,7 @@
    */
    #include <internal.h>
    +#include <purple.h>
    #include <gnt.h>
    #include <gntbox.h>
    @@ -34,8 +35,6 @@
    #include "gntdebug.h"
    #include "finch.h"
    -#include "notify.h"
    -#include "util.h"
    #include <stdio.h>
    #include <string.h>
    --- a/finch/gntdebug.h Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntdebug.h Fri May 01 04:51:01 2020 -0500
    @@ -30,7 +30,7 @@
    * @title: Debug API
    */
    -#include "debug.h"
    +#include <purple.h>
    G_BEGIN_DECLS
    --- a/finch/gntidle.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntidle.c Fri May 01 04:51:01 2020 -0500
    @@ -21,14 +21,13 @@
    */
    #include <internal.h>
    +#include <purple.h>
    #include "finch.h"
    #include "gntidle.h"
    #include "gnt.h"
    #include "gntwm.h"
    -#include "idle.h"
    -
    static time_t
    finch_get_idle_time(void)
    {
    --- a/finch/gntidle.h Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntidle.h Fri May 01 04:51:01 2020 -0500
    @@ -30,7 +30,7 @@
    * @title: Idle API
    */
    -#include "idle.h"
    +#include <purple.h>
    /**************************************************************************/
    /* GNT Idle API */
    --- a/finch/gntlog.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntlog.c Fri May 01 04:51:01 2020 -0500
    @@ -32,12 +32,7 @@
    #include <gnttree.h>
    #include <gntwindow.h>
    -#include "account.h"
    -#include "debug.h"
    -#include "log.h"
    -#include "notify.h"
    -#include "request.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gntlog.h"
    --- a/finch/gntlog.h Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntlog.h Fri May 01 04:51:01 2020 -0500
    @@ -30,8 +30,8 @@
    * @title: Log Viewer
    */
    -#include "log.h"
    -#include "account.h"
    +#include <purple.h>
    +
    #include "gntwidget.h"
    typedef struct _FinchLogViewer FinchLogViewer;
    --- a/finch/gntmedia.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntmedia.c Fri May 01 04:51:01 2020 -0500
    @@ -30,10 +30,7 @@
    #include "gntbox.h"
    #include "gntlabel.h"
    -#include "cmds.h"
    -#include "conversation.h"
    -#include "debug.h"
    -#include "mediamanager.h"
    +#include <purple.h>
    /* An incredibly large part of the following is from gtkmedia.c */
    #ifdef USE_VV
    --- a/finch/gntmenuutil.h Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntmenuutil.h Fri May 01 04:51:01 2020 -0500
    @@ -30,7 +30,7 @@
    * @title: Menu Utility functions
    */
    -#include <action.h>
    +#include <purple.h>
    #include <gnt.h>
    #include <gntmenu.h>
    --- a/finch/gntnotify.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntnotify.c Fri May 01 04:51:01 2020 -0500
    @@ -32,10 +32,9 @@
    #include "finch.h"
    -#include <util.h>
    +#include <purple.h>
    #include "gntnotify.h"
    -#include "debug.h"
    static struct
    {
    --- a/finch/gntnotify.h Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntnotify.h Fri May 01 04:51:01 2020 -0500
    @@ -30,7 +30,7 @@
    * @title: Notify API
    */
    -#include "notify.h"
    +#include <purple.h>
    /**********************************************************************
    * GNT Notify API
    --- a/finch/gntplugin.h Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntplugin.h Fri May 01 04:51:01 2020 -0500
    @@ -32,8 +32,7 @@
    #include <gnt.h>
    -#include <plugins.h>
    -#include <pluginpref.h>
    +#include <purple.h>
    #include <string.h>
    --- a/finch/gntpounce.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntpounce.c Fri May 01 04:51:01 2020 -0500
    @@ -37,14 +37,7 @@
    #include "finch.h"
    -#include "account.h"
    -#include "conversation.h"
    -#include "debug.h"
    -#include "notify.h"
    -#include "protocol.h"
    -#include "request.h"
    -#include "server.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gntpounce.h"
    --- a/finch/gntpounce.h Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntpounce.h Fri May 01 04:51:01 2020 -0500
    @@ -30,7 +30,7 @@
    * @title: Buddy Pounce API
    */
    -#include "pounce.h"
    +#include <purple.h>
    /**
    * finch_pounce_editor_show:
    --- a/finch/gntprefs.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntprefs.c Fri May 01 04:51:01 2020 -0500
    @@ -23,8 +23,7 @@
    #include "finch.h"
    #include <internal.h>
    -#include <prefs.h>
    -#include <savedstatuses.h>
    +#include <purple.h>
    #include "gntprefs.h"
    #include "gntrequest.h"
    --- a/finch/gntrequest.h Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntrequest.h Fri May 01 04:51:01 2020 -0500
    @@ -30,7 +30,8 @@
    * @title: Request API
    */
    -#include "request.h"
    +#include <purple.h>
    +
    #include "gnt.h"
    /**********************************************************************
    --- a/finch/gntroomlist.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntroomlist.c Fri May 01 04:51:01 2020 -0500
    @@ -33,8 +33,6 @@
    #include "gnttree.h"
    #include "gntwindow.h"
    -#include "debug.h"
    -
    #define PREF_ROOT "/finch/roomlist"
    --- a/finch/gntroomlist.h Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntroomlist.h Fri May 01 04:51:01 2020 -0500
    @@ -30,7 +30,7 @@
    * @title: Room List API
    */
    -#include "roomlist.h"
    +#include <purple.h>
    /**********************************************************************
    * GNT Room List API
    --- a/finch/gntsound.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntsound.c Fri May 01 04:51:01 2020 -0500
    @@ -34,11 +34,7 @@
    #include <gst/gst.h>
    #endif /* USE_GSTREAMER */
    -#include "debug.h"
    -#include "notify.h"
    -#include "prefs.h"
    -#include "sound.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gntconv.h"
    --- a/finch/gntsound.h Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntsound.h Fri May 01 04:51:01 2020 -0500
    @@ -30,7 +30,7 @@
    * @title: Sound API
    */
    -#include "sound.h"
    +#include <purple.h>
    /**********************************************************************/
    /* GNT Sound API */
    --- a/finch/gntstatus.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntstatus.c Fri May 01 04:51:01 2020 -0500
    @@ -34,8 +34,7 @@
    #include "finch.h"
    -#include <notify.h>
    -#include <request.h>
    +#include <purple.h>
    #include "gntstatus.h"
    --- a/finch/gntstatus.h Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntstatus.h Fri May 01 04:51:01 2020 -0500
    @@ -30,8 +30,7 @@
    * @title: Status API
    */
    -#include <status.h>
    -#include <savedstatuses.h>
    +#include <purple.h>
    /**********************************************************************
    * GNT BuddyList API
    --- a/finch/gntui.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntui.c Fri May 01 04:51:01 2020 -0500
    @@ -42,7 +42,7 @@
    #include "gntstatus.h"
    #include "gntsound.h"
    -#include <prefs.h>
    +#include <purple.h>
    void finch_ui_init()
    {
    --- a/finch/gntxfer.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntxfer.c Fri May 01 04:51:01 2020 -0500
    @@ -30,14 +30,9 @@
    #include <gntlabel.h>
    #include <gnttree.h>
    -#include "debug.h"
    -#include "notify.h"
    -#include "xfer.h"
    -#include "protocol.h"
    -#include "util.h"
    +#include <purple.h>
    #include "gntxfer.h"
    -#include "prefs.h"
    typedef struct
    {
    --- a/finch/gntxfer.h Fri May 01 04:42:52 2020 -0500
    +++ b/finch/gntxfer.h Fri May 01 04:51:01 2020 -0500
    @@ -30,8 +30,7 @@
    * @title: File Transfer UI
    */
    -#include "xfer.h"
    -
    +#include <purple.h>
    /**************************************************************************/
    /* GNT File Transfer Dialog API */
    --- a/finch/libfinch.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/libfinch.c Fri May 01 04:51:01 2020 -0500
    @@ -24,22 +24,7 @@
    #include <locale.h>
    #include "finch.h"
    -#include "account.h"
    -#include "conversation.h"
    -#include "core.h"
    -#include "debug.h"
    -#include "log.h"
    -#include "notify.h"
    -#include "options.h"
    -#include "plugins.h"
    -#include "protocol.h"
    -#include "pounce.h"
    -#include "savedstatuses.h"
    -#include "sound.h"
    -#include "status.h"
    -#include "util.h"
    -#include "whiteboard.h"
    -#include "xfer.h"
    +#include <purple.h>
    #include "gntdebug.h"
    #include "gntprefs.h"
    --- a/finch/plugins/gntclipboard.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/plugins/gntclipboard.c Fri May 01 04:51:01 2020 -0500
    @@ -34,10 +34,8 @@
    #include <glib.h>
    -#include <plugins.h>
    -#include <version.h>
    -#include <debug.h>
    -#include <notify.h>
    +#include <purple.h>
    +
    #include <gnt.h>
    #include <gntwm.h>
    --- a/finch/plugins/gntgf.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/plugins/gntgf.c Fri May 01 04:51:01 2020 -0500
    @@ -41,13 +41,7 @@
    #include <glib.h>
    -#include <plugins.h>
    -#include <version.h>
    -#include <buddylist.h>
    -#include <conversation.h>
    -#include <debug.h>
    -#include <eventloop.h>
    -#include <util.h>
    +#include <purple.h>
    #include <gnt.h>
    #include <gntbox.h>
    --- a/finch/plugins/gnthistory.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/plugins/gnthistory.c Fri May 01 04:51:01 2020 -0500
    @@ -20,14 +20,7 @@
    #include "internal.h"
    -#include "conversation.h"
    -#include "debug.h"
    -#include "log.h"
    -#include "request.h"
    -#include "prefs.h"
    -#include "signals.h"
    -#include "util.h"
    -#include "version.h"
    +#include <purple.h>
    #include "gntconv.h"
    #include "gntplugin.h"
    --- a/finch/plugins/gnttinyurl.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/plugins/gnttinyurl.c Fri May 01 04:51:01 2020 -0500
    @@ -25,16 +25,10 @@
    #define PREF_LENGTH PREFS_BASE "/length"
    #define PREF_URL PREFS_BASE "/url"
    -#include <conversation.h>
    -#include <signals.h>
    +#include <purple.h>
    #include <glib.h>
    -#include <plugins.h>
    -#include <version.h>
    -#include <debug.h>
    -#include <notify.h>
    -
    #include <gntconv.h>
    #include <gntplugin.h>
    --- a/finch/plugins/grouping.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/plugins/grouping.c Fri May 01 04:51:01 2020 -0500
    @@ -16,7 +16,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
    */
    #include "internal.h"
    -#include "purple.h"
    +#include <purple.h>
    #include "gntblist.h"
    #include "gntplugin.h"
    --- a/finch/plugins/lastlog.c Fri May 01 04:42:52 2020 -0500
    +++ b/finch/plugins/lastlog.c Fri May 01 04:51:01 2020 -0500
    @@ -19,11 +19,7 @@
    #define PLUGIN_STATIC_NAME GntLastlog
    #include "internal.h"
    -
    -#include <plugins.h>
    -#include <version.h>
    -
    -#include <cmds.h>
    +#include <purple.h>
    #include <gnt.h>
    #include <gnttextview.h>