pidgin/pidgin

pidgin.h phase3: create pidgin.h and force its usage

2020-08-06, Gary Kramlich
875489636847
Parents 011cdaa64ecc
Children af35bc5fc875
pidgin.h phase3: create pidgin.h and force its usage

fix the section id of pidgincore.h

Generate our pidgin.h file

Add include guard to all pidgin/*.h files and deal with the fallout from that.

Also had to namespace PIDGIN_BLIST_COLUMN_NAME, will come back and get the rest at a later time.

Testing Done:
Compile test, including some plugins that don't build by default. Also ran everything seems fine.

Reviewed at https://reviews.imfreedom.org/r/50/
85 files changed, 364 insertions(+), 133 deletions(-)
  • +4 -0
    pidgin/gtkaccount.h
  • +4 -0
    pidgin/gtkblist-theme-loader.h
  • +4 -0
    pidgin/gtkblist-theme.h
  • +21 -0
    pidgin/gtkblist.c
  • +0 -22
    pidgin/gtkblist.h
  • +4 -0
    pidgin/gtkcellrendererexpander.h
  • +4 -0
    pidgin/gtkconn.h
  • +4 -0
    pidgin/gtkconv.h
  • +4 -0
    pidgin/gtkconvwin.h
  • +4 -0
    pidgin/gtkdialogs.h
  • +4 -0
    pidgin/gtkdnd-hints.h
  • +4 -0
    pidgin/gtkicon-theme-loader.h
  • +4 -0
    pidgin/gtkicon-theme.h
  • +4 -0
    pidgin/gtkidle.h
  • +4 -0
    pidgin/gtkinternal.h
  • +4 -0
    pidgin/gtkmedia.h
  • +4 -0
    pidgin/gtknickcolors.h
  • +4 -0
    pidgin/gtknotify.h
  • +4 -0
    pidgin/gtkpluginpref.h
  • +4 -0
    pidgin/gtkpounce.h
  • +4 -0
    pidgin/gtkprefs.h
  • +4 -0
    pidgin/gtkprivacy.h
  • +4 -0
    pidgin/gtkrequest.h
  • +4 -0
    pidgin/gtkroomlist.h
  • +4 -0
    pidgin/gtksavedstatuses.h
  • +4 -0
    pidgin/gtkscrollbook.h
  • +4 -0
    pidgin/gtksmiley-manager.h
  • +4 -0
    pidgin/gtksmiley-theme.h
  • +4 -0
    pidgin/gtksound.h
  • +4 -0
    pidgin/gtkstatus-icon-theme.h
  • +4 -0
    pidgin/gtkstatusbox.h
  • +4 -0
    pidgin/gtkstyle.h
  • +4 -0
    pidgin/gtkutils.h
  • +4 -0
    pidgin/gtkwhiteboard.h
  • +4 -0
    pidgin/gtkxfer.h
  • +18 -4
    pidgin/meson.build
  • +4 -0
    pidgin/minidialog.h
  • +3 -1
    pidgin/pidgin.c
  • +48 -0
    pidgin/pidgin.h.in
  • +4 -0
    pidgin/pidginabout.h
  • +5 -0
    pidgin/pidginaccountactionsmenu.h
  • +4 -0
    pidgin/pidginaccountchooser.h
  • +5 -0
    pidgin/pidginaccountsmenu.h
  • +5 -0
    pidgin/pidginactiongroup.h
  • +5 -0
    pidgin/pidginbuddylistmenu.h
  • +4 -0
    pidgin/pidgincontactcompletion.h
  • +6 -4
    pidgin/pidgincore.h
  • +4 -0
    pidgin/pidgindebug.h
  • +4 -0
    pidgin/pidgingdkpixbuf.h
  • +4 -0
    pidgin/pidginicon.h
  • +4 -0
    pidgin/pidgininvitedialog.h
  • +4 -0
    pidgin/pidginlog.h
  • +4 -0
    pidgin/pidginmenutray.h
  • +4 -0
    pidgin/pidginmessage.h
  • +4 -0
    pidgin/pidginmooddialog.h
  • +5 -0
    pidgin/pidginplugininfo.h
  • +0 -3
    pidgin/pidginpluginsdialog.c
  • +4 -0
    pidgin/pidginpluginsdialog.h
  • +5 -0
    pidgin/pidginpluginsmenu.h
  • +4 -0
    pidgin/pidginprotocolchooser.h
  • +4 -0
    pidgin/pidginprotocolstore.h
  • +4 -0
    pidgin/pidginstock.h
  • +4 -0
    pidgin/pidgintalkatu.h
  • +4 -0
    pidgin/pidgintooltip.h
  • +1 -3
    pidgin/plugins/contact_priority.c
  • +1 -8
    pidgin/plugins/disco/gtkdisco.c
  • +1 -2
    pidgin/plugins/disco/xmppdisco.c
  • +1 -2
    pidgin/plugins/gestures/gestures.c
  • +2 -6
    pidgin/plugins/gevolution/add_buddy_dialog.c
  • +3 -7
    pidgin/plugins/gevolution/assoc-buddy.c
  • +1 -4
    pidgin/plugins/gevolution/eds-utils.c
  • +1 -4
    pidgin/plugins/gevolution/gevo-util.c
  • +2 -6
    pidgin/plugins/gevolution/gevolution.c
  • +1 -5
    pidgin/plugins/gevolution/new_person_dialog.c
  • +1 -4
    pidgin/plugins/gtk-signals-test.c
  • +2 -3
    pidgin/plugins/gtkbuddynote.c
  • +1 -2
    pidgin/plugins/iconaway.c
  • +1 -3
    pidgin/plugins/musicmessaging/musicmessaging.c
  • +2 -5
    pidgin/plugins/notify.c
  • +1 -5
    pidgin/plugins/relnot.c
  • +6 -9
    pidgin/plugins/spellchk.c
  • +1 -4
    pidgin/plugins/ticker/ticker.c
  • +1 -4
    pidgin/plugins/unity.c
  • +1 -9
    pidgin/plugins/win32/winprefs/winprefs.c
  • +3 -4
    pidgin/plugins/xmppconsole/xmppconsole.c
    • --- a/pidgin/gtkaccount.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkaccount.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINACCOUNT_H_
    #define _PIDGINACCOUNT_H_
    /**
    --- a/pidgin/gtkblist-theme-loader.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkblist-theme-loader.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_BLIST_THEME_LOADER_H
    #define PIDGIN_BLIST_THEME_LOADER_H
    /**
    --- a/pidgin/gtkblist-theme.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkblist-theme.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_BLIST_THEME_H
    #define PIDGIN_BLIST_THEME_H
    /**
    --- a/pidgin/gtkblist.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkblist.c Thu Aug 06 22:22:03 2020 -0500
    @@ -121,6 +121,27 @@
    G_DEFINE_TYPE_WITH_PRIVATE(PidginBuddyList, pidgin_buddy_list,
    PURPLE_TYPE_BUDDY_LIST)
    +enum {
    + STATUS_ICON_COLUMN,
    + STATUS_ICON_VISIBLE_COLUMN,
    + NAME_COLUMN,
    + IDLE_COLUMN,
    + IDLE_VISIBLE_COLUMN,
    + BUDDY_ICON_COLUMN,
    + BUDDY_ICON_VISIBLE_COLUMN,
    + NODE_COLUMN,
    + BGCOLOR_COLUMN,
    + GROUP_EXPANDER_COLUMN,
    + GROUP_EXPANDER_VISIBLE_COLUMN,
    + CONTACT_EXPANDER_COLUMN,
    + CONTACT_EXPANDER_VISIBLE_COLUMN,
    + EMBLEM_COLUMN,
    + EMBLEM_VISIBLE_COLUMN,
    + PROTOCOL_ICON_COLUMN,
    + PROTOCOL_ICON_VISIBLE_COLUMN,
    + BLIST_COLUMNS
    +};
    +
    #define PIDGIN_WINDOW_ICONIFIED(x) \
    (gdk_window_get_state(gtk_widget_get_window(GTK_WIDGET(x))) & \
    GDK_WINDOW_STATE_ICONIFIED)
    --- a/pidgin/gtkblist.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkblist.h Thu Aug 06 22:22:03 2020 -0500
    @@ -33,28 +33,6 @@
    typedef struct _PidginBuddyList PidginBuddyList;
    -enum {
    - STATUS_ICON_COLUMN,
    - STATUS_ICON_VISIBLE_COLUMN,
    - NAME_COLUMN,
    - IDLE_COLUMN,
    - IDLE_VISIBLE_COLUMN,
    - BUDDY_ICON_COLUMN,
    - BUDDY_ICON_VISIBLE_COLUMN,
    - NODE_COLUMN,
    - BGCOLOR_COLUMN,
    - GROUP_EXPANDER_COLUMN,
    - GROUP_EXPANDER_VISIBLE_COLUMN,
    - CONTACT_EXPANDER_COLUMN,
    - CONTACT_EXPANDER_VISIBLE_COLUMN,
    - EMBLEM_COLUMN,
    - EMBLEM_VISIBLE_COLUMN,
    - PROTOCOL_ICON_COLUMN,
    - PROTOCOL_ICON_VISIBLE_COLUMN,
    - BLIST_COLUMNS
    -
    -};
    -
    typedef enum {
    PIDGIN_STATUS_ICON_LARGE,
    PIDGIN_STATUS_ICON_SMALL
    --- a/pidgin/gtkcellrendererexpander.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkcellrendererexpander.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    *
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINCELLRENDEREREXPANDER_H_
    #define _PIDGINCELLRENDEREREXPANDER_H_
    /**
    --- a/pidgin/gtkconn.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkconn.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINCONN_H_
    #define _PIDGINCONN_H_
    /**
    --- a/pidgin/gtkconv.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkconv.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGIN_CONVERSATION_H_
    #define _PIDGIN_CONVERSATION_H_
    /**
    --- a/pidgin/gtkconvwin.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkconvwin.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGIN_CONVERSATION_WINDOW_H_
    #define _PIDGIN_CONVERSATION_WINDOW_H_
    /**
    --- a/pidgin/gtkdialogs.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkdialogs.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINDIALOGS_H_
    #define _PIDGINDIALOGS_H_
    /**
    --- a/pidgin/gtkdnd-hints.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkdnd-hints.h Thu Aug 06 22:22:03 2020 -0500
    @@ -17,6 +17,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGIN_DND_HINTS_H_
    #define _PIDGIN_DND_HINTS_H_
    /**
    --- a/pidgin/gtkicon-theme-loader.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkicon-theme-loader.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_ICON_THEME_LOADER_H
    #define PIDGIN_ICON_THEME_LOADER_H
    /**
    --- a/pidgin/gtkicon-theme.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkicon-theme.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_ICON_THEME_H
    #define PIDGIN_ICON_THEME_H
    /**
    --- a/pidgin/gtkidle.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkidle.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGIN_IDLE_H_
    #define _PIDGIN_IDLE_H_
    /**
    --- a/pidgin/gtkinternal.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkinternal.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGIN_INTERNAL_H_
    #define _PIDGIN_INTERNAL_H_
    /*
    --- a/pidgin/gtkmedia.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkmedia.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef __GTKMEDIA_H_
    #define __GTKMEDIA_H_
    /**
    --- a/pidgin/gtknickcolors.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtknickcolors.h Thu Aug 06 22:22:03 2020 -0500
    @@ -18,6 +18,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINNICKCOLORS_H_
    #define _PIDGINNICKCOLORS_H_
    /**
    --- a/pidgin/gtknotify.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtknotify.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINNOTIFY_H_
    #define _PIDGINNOTIFY_H_
    /**
    --- a/pidgin/gtkpluginpref.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkpluginpref.h Thu Aug 06 22:22:03 2020 -0500
    @@ -20,6 +20,10 @@
    *
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINPLUGINPREF_H_
    #define _PIDGINPLUGINPREF_H_
    /**
    --- a/pidgin/gtkpounce.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkpounce.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINPOUNCE_H_
    #define _PIDGINPOUNCE_H_
    /**
    --- a/pidgin/gtkprefs.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkprefs.h Thu Aug 06 22:22:03 2020 -0500
    @@ -20,6 +20,10 @@
    *
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINPREFS_H_
    #define _PIDGINPREFS_H_
    /**
    --- a/pidgin/gtkprivacy.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkprivacy.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINPRIVACY_H_
    #define _PIDGINPRIVACY_H_
    /**
    --- a/pidgin/gtkrequest.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkrequest.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINREQUEST_H_
    #define _PIDGINREQUEST_H_
    /**
    --- a/pidgin/gtkroomlist.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkroomlist.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINROOMLIST_H_
    #define _PIDGINROOMLIST_H_
    /**
    --- a/pidgin/gtksavedstatuses.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtksavedstatuses.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINSAVEDSTATUSES_H_
    #define _PIDGINSAVEDSTATUSES_H_
    /**
    --- a/pidgin/gtkscrollbook.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkscrollbook.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef __PIDGIN_SCROLL_BOOK_H__
    #define __PIDGIN_SCROLL_BOOK_H__
    /**
    --- a/pidgin/gtksmiley-manager.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtksmiley-manager.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGIN_SMILEY_MANAGER_H_
    #define _PIDGIN_SMILEY_MANAGER_H_
    /**
    --- a/pidgin/gtksmiley-theme.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtksmiley-theme.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGIN_SMILEY_THEME_H_
    #define _PIDGIN_SMILEY_THEME_H_
    /**
    --- a/pidgin/gtksound.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtksound.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINSOUND_H_
    #define _PIDGINSOUND_H_
    /**
    --- a/pidgin/gtkstatus-icon-theme.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkstatus-icon-theme.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_STATUS_ICON_THEME_H
    #define PIDGIN_STATUS_ICON_THEME_H
    /**
    --- a/pidgin/gtkstatusbox.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkstatusbox.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef __PIDGIN_STATUS_BOX_H__
    #define __PIDGIN_STATUS_BOX_H__
    /**
    --- a/pidgin/gtkstyle.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkstyle.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    /**
    * SECTION:gtkstyle
    * @section_id: pidgin-gtkstyle
    --- a/pidgin/gtkutils.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkutils.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINUTILS_H_
    #define _PIDGINUTILS_H_
    /**
    --- a/pidgin/gtkwhiteboard.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkwhiteboard.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINWHITEBOARD_H_
    #define _PIDGINWHITEBOARD_H_
    /**
    --- a/pidgin/gtkxfer.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/gtkxfer.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGINXFER_H_
    #define _PIDGINXFER_H_
    /**
    --- a/pidgin/meson.build Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/meson.build Thu Aug 06 22:22:03 2020 -0500
    @@ -93,9 +93,9 @@
    'gtkxfer.h',
    'minidialog.h',
    'pidginabout.h',
    - 'pidginaccountactionsmenu.c',
    + 'pidginaccountactionsmenu.h',
    'pidginaccountchooser.h',
    - 'pidginaccountsmenu.c',
    + 'pidginaccountsmenu.h',
    'pidginactiongroup.h',
    'pidginbuddylistmenu.h',
    'pidgincontactcompletion.h',
    @@ -163,6 +163,19 @@
    )
    endif
    + PIDGIN_H_INCLUDES = []
    + foreach header : libpidgin_headers
    + PIDGIN_H_INCLUDES += '#include <pidgin/@0@>'.format(header)
    + endforeach
    + pidgin_h_conf = configuration_data()
    + pidgin_h_conf.set('PIDGIN_H_INCLUDES', '\n'.join(PIDGIN_H_INCLUDES))
    + pidgin_h = configure_file(input : 'pidgin.h.in',
    + output : 'pidgin.h',
    + configuration : pidgin_h_conf,
    + install : true,
    + install_dir : get_option('includedir') / purple_filebase)
    +
    +
    install_headers(libpidgin_headers, subdir : 'pidgin-3')
    _libpidgin_dependencies = [
    @@ -184,6 +197,7 @@
    libpidgin = shared_library('pidgin3',
    libpidgin_SOURCES,
    package_revision,
    + c_args : ['-DPIDGIN_COMPILATION'],
    include_directories : [toplevel_inc],
    version : PURPLE_LIB_VERSION,
    dependencies : _libpidgin_dependencies,
    @@ -191,7 +205,7 @@
    libpidgin_dep = declare_dependency(
    include_directories : [toplevel_inc, libpidgin_inc],
    link_with : libpidgin,
    - dependencies : [gtk, glib, math])
    + dependencies : [gtk, glib, math, talkatu_dep])
    pidgin = executable('pidgin3',
    pidgin_SOURCES,
    @@ -256,7 +270,7 @@
    talkatu_include_directories,
    ],
    install : true,
    - extra_args : ['--quiet'])
    + extra_args : ['-DPIDGIN_COMPILATION', '--quiet'])
    endif
    subdir('data')
    --- a/pidgin/minidialog.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/minidialog.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef __PIDGIN_MINI_DIALOG_H__
    #define __PIDGIN_MINI_DIALOG_H__
    /**
    --- a/pidgin/pidgin.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidgin.c Thu Aug 06 22:22:03 2020 -0500
    @@ -21,7 +21,9 @@
    *
    */
    -#include "pidgincore.h"
    +#include <glib/gi18n.h>
    +
    +#include <pidgin.h>
    #ifdef _WIN32
    /* suppress gcc "no previous prototype" warning */
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/pidgin/pidgin.h.in Thu Aug 06 22:22:03 2020 -0500
    @@ -0,0 +1,48 @@
    +/*
    + * pidgin
    + *
    + * 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.
    + *
    + * 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
    + * (at your option) any later version.
    + *
    + * This program is distributed in the hope that it will be useful,
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    + * GNU General Public License for more details.
    + *
    + * You should have received a copy of the GNU General Public License
    + * along with this program; if not, it can be viewed online at
    + * https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
    + */
    +
    +#ifndef PIDGIN_PIDGIN_H
    +#define PIDGIN_PIDGIN_H
    +
    +/**
    + * SECTION:pidgin
    + * @section_id: libpurple-purple
    + * @short_description: <filename>pidgin.h</filename>
    + * @title: Global header for Pidgin
    + *
    + * This file contains all the necessary preprocessor directives to include
    + * Pidgin's headers and other preprocessor directives required for plugins
    + * to build. Including this file eliminates the need to directly include any
    + * other Pidgin files.
    + */
    +
    +#include <glib.h>
    +
    +#ifndef PIDGIN_GLOBAL_HEADER_INSIDE
    +#define PIDGIN_GLOBAL_HEADER_INSIDE
    +#endif
    +
    +@PIDGIN_H_INCLUDES@
    +
    +#undef PIDGIN_GLOBAL_HEADER_INSIDE
    +
    +#endif /* PIDGIN_PIDGIN_H */
    --- a/pidgin/pidginabout.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginabout.h Thu Aug 06 22:22:03 2020 -0500
    @@ -1,3 +1,7 @@
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_ABOUT_H
    #define PIDGIN_ABOUT_H
    --- a/pidgin/pidginaccountactionsmenu.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginaccountactionsmenu.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,11 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_ACCOUNT_ACTIONS_MENU_H
    #define PIDGIN_ACCOUNT_ACTIONS_MENU_H
    --- a/pidgin/pidginaccountchooser.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginaccountchooser.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_ACCOUNT_CHOOSER_H
    #define PIDGIN_ACCOUNT_CHOOSER_H
    /**
    --- a/pidgin/pidginaccountsmenu.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginaccountsmenu.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,11 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_ACCOUNTS_MENU_H
    #define PIDGIN_ACCOUNTS_MENU_H
    --- a/pidgin/pidginactiongroup.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginactiongroup.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,11 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_ACTION_GROUP_H
    #define PIDGIN_ACTION_GROUP_H
    --- a/pidgin/pidginbuddylistmenu.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginbuddylistmenu.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,11 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_BUDDY_LIST_MENU_H
    #define PIDGIN_BUDDY_LIST_MENU_H
    --- a/pidgin/pidgincontactcompletion.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidgincontactcompletion.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_CONTACT_COMPLETION_H
    #define PIDGIN_CONTACT_COMPLETION_H
    --- a/pidgin/pidgincore.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidgincore.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,17 +19,19 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_CORE_H
    #define PIDGIN_CORE_H
    /**
    - * SECTION:pidgin
    - * @section_id: pidgin-pidgin
    + * SECTION:core
    + * @section_id: pidgin-core
    * @short_description: <filename>pidgincore.h</filename>
    * @title: UI Definitions and Includes
    */
    -#include <glib/gi18n-lib.h>
    -
    #include <glib.h>
    #ifdef _WIN32
    --- a/pidgin/pidgindebug.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidgindebug.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_DEBUG_H
    #define PIDGIN_DEBUG_H
    /**
    --- a/pidgin/pidgingdkpixbuf.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidgingdkpixbuf.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_GDK_PIXBUF_H
    #define PIDGIN_GDK_PIXBUF_H
    --- a/pidgin/pidginicon.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginicon.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_ICON_H
    #define PIDGIN_ICON_H
    --- a/pidgin/pidgininvitedialog.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidgininvitedialog.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_INVITE_DIALOG_H
    #define PIDGIN_INVITE_DIALOG_H
    --- a/pidgin/pidginlog.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginlog.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_LOG_H
    #define PIDGIN_LOG_H
    /**
    --- a/pidgin/pidginmenutray.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginmenutray.h Thu Aug 06 22:22:03 2020 -0500
    @@ -17,6 +17,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_MENU_TRAY_H
    #define PIDGIN_MENU_TRAY_H
    --- a/pidgin/pidginmessage.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginmessage.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_MESSAGE_H
    #define PIDGIN_MESSAGE_H
    --- a/pidgin/pidginmooddialog.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginmooddialog.h Thu Aug 06 22:22:03 2020 -0500
    @@ -20,6 +20,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_MOOD_DIALOG_H
    #define PIDGIN_MOOD_DIALOG_H
    --- a/pidgin/pidginplugininfo.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginplugininfo.h Thu Aug 06 22:22:03 2020 -0500
    @@ -18,6 +18,11 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_PLUGIN_INFO_H
    #define PIDGIN_PLUGIN_INFO_H
    --- a/pidgin/pidginpluginsdialog.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginpluginsdialog.c Thu Aug 06 22:22:03 2020 -0500
    @@ -23,10 +23,7 @@
    #include "pidginpluginsdialog.h"
    -# warning "fix this when pidgincore.h no longer icnludes gi18n.h"
    -#if 0
    #include <glib/gi18n.h>
    -#endif
    #include <gplugin.h>
    #include <gplugin-gtk.h>
    --- a/pidgin/pidginpluginsdialog.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginpluginsdialog.h Thu Aug 06 22:22:03 2020 -0500
    @@ -20,6 +20,10 @@
    *
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_PLUGINS_DIALOG_H
    #define PIDGIN_PLUGINS_DIALOG_H
    --- a/pidgin/pidginpluginsmenu.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginpluginsmenu.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,11 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_PLUGINS_MENU_H
    #define PIDGIN_PLUGINS_MENU_H
    --- a/pidgin/pidginprotocolchooser.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginprotocolchooser.h Thu Aug 06 22:22:03 2020 -0500
    @@ -21,6 +21,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_PROTOCOL_CHOOSER_H
    #define PIDGIN_PROTOCOL_CHOOSER_H
    --- a/pidgin/pidginprotocolstore.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginprotocolstore.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_PROTOCOL_STORE_H
    #define PIDGIN_PROTOCOL_STORE_H
    --- a/pidgin/pidginstock.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidginstock.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGIN_STOCK_H_
    #define _PIDGIN_STOCK_H_
    /**
    --- a/pidgin/pidgintalkatu.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidgintalkatu.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef PIDGIN_TALKATU_H
    #define PIDGIN_TALKATU_H
    --- a/pidgin/pidgintooltip.h Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/pidgintooltip.h Thu Aug 06 22:22:03 2020 -0500
    @@ -19,6 +19,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#if !defined(PIDGIN_GLOBAL_HEADER_INSIDE) && !defined(PIDGIN_COMPILATION)
    +# error "only <pidgin.h> may be included directly"
    +#endif
    +
    #ifndef _PIDGIN_TOOLTIP_H_
    #define _PIDGIN_TOOLTIP_H_
    /**
    --- a/pidgin/plugins/contact_priority.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/contact_priority.c Thu Aug 06 22:22:03 2020 -0500
    @@ -24,9 +24,7 @@
    #include <purple.h>
    -#include "gtkutils.h"
    -#include "pidginplugininfo.h"
    -#include "pidginaccountchooser.h"
    +#include <pidgin.h>
    #define CONTACT_PRIORITY_PLUGIN_ID "gtk-contact-priority"
    --- a/pidgin/plugins/disco/gtkdisco.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/disco/gtkdisco.c Thu Aug 06 22:22:03 2020 -0500
    @@ -1,8 +1,3 @@
    -/**
    - * @file gtkdisco.c GTK+ Service Discovery UI
    - * @ingroup pidgin
    - */
    -
    /* pidgin
    *
    * Pidgin is the legal property of its developers, whose names are too numerous
    @@ -32,9 +27,7 @@
    #include <purple.h>
    -#include "gtkutils.h"
    -#include "pidginaccountchooser.h"
    -#include "pidgintooltip.h"
    +#include <pidgin.h>
    #include "gtkdisco.h"
    #include "xmppdisco.h"
    --- a/pidgin/plugins/disco/xmppdisco.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/disco/xmppdisco.c Thu Aug 06 22:22:03 2020 -0500
    @@ -40,8 +40,7 @@
    #include <purple.h>
    -#include "gtkconv.h"
    -#include "pidginplugininfo.h"
    +#include <pidgin.h>
    #include "xmppdisco.h"
    #include "gtkdisco.h"
    --- a/pidgin/plugins/gestures/gestures.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/gestures/gestures.c Thu Aug 06 22:22:03 2020 -0500
    @@ -23,8 +23,7 @@
    #include <purple.h>
    -#include "gtkconv.h"
    -#include "gtkutils.h"
    +#include <pidgin.h>
    #include "gstroke.h"
    --- a/pidgin/plugins/gevolution/add_buddy_dialog.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/gevolution/add_buddy_dialog.c Thu Aug 06 22:22:03 2020 -0500
    @@ -18,16 +18,12 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    * 02111-1301, USA.
    */
    -#include "internal.h"
    -#include "gtkblist.h"
    -#include "pidgin.h"
    +#include <stdlib.h>
    -#include "gtkutils.h"
    +#include <pidgin.h>
    #include "gevolution.h"
    -#include <stdlib.h>
    -
    enum
    {
    COLUMN_NAME,
    --- a/pidgin/plugins/gevolution/assoc-buddy.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/gevolution/assoc-buddy.c Thu Aug 06 22:22:03 2020 -0500
    @@ -18,17 +18,13 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    * 02111-1301, USA.
    */
    -#include "internal.h"
    -#include "gtkblist.h"
    -#include "pidgin.h"
    +#include <stdlib.h>
    +#include <gtk/gtk.h>
    -#include "gtkutils.h"
    +#include <pidgin.h>
    #include "gevolution.h"
    -#include <stdlib.h>
    -#include <gtk/gtk.h>
    -
    enum
    {
    COLUMN_NAME,
    --- a/pidgin/plugins/gevolution/eds-utils.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/gevolution/eds-utils.c Thu Aug 06 22:22:03 2020 -0500
    @@ -19,10 +19,7 @@
    * 02111-1301, USA.
    */
    -#include "internal.h"
    -#include "gtkblist.h"
    -#include "pidgin.h"
    -#include "gtkutils.h"
    +#include <pidgin.h>
    #include "gevolution.h"
    --- a/pidgin/plugins/gevolution/gevo-util.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/gevolution/gevo-util.c Thu Aug 06 22:22:03 2020 -0500
    @@ -18,10 +18,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    * 02111-1301, USA.
    */
    -#include "internal.h"
    -#include "gtkblist.h"
    -#include "pidgin.h"
    -#include "gtkutils.h"
    +#include <pidgin.h>
    #include "gevolution.h"
    --- a/pidgin/plugins/gevolution/gevolution.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/gevolution/gevolution.c Thu Aug 06 22:22:03 2020 -0500
    @@ -18,15 +18,11 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    * 02111-1301, USA.
    */
    -#include "internal.h"
    -#include "pidgin.h"
    +#include <glib/gi18n-lib.h>
    #include <purple.h>
    -#include "gtkblist.h"
    -#include "gtkconv.h"
    -#include "gtkutils.h"
    -#include "pidginplugininfo.h"
    +#include <pidgin.h>
    #include "gevolution.h"
    --- a/pidgin/plugins/gevolution/new_person_dialog.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/gevolution/new_person_dialog.c Thu Aug 06 22:22:03 2020 -0500
    @@ -18,11 +18,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    * 02111-1301, USA.
    */
    -#include "internal.h"
    -#include "pidgin.h"
    -
    -#include "gtkutils.h"
    -#include "pidginaccountchooser.h"
    +#include <pidgin.h>
    #include "gevolution.h"
    --- a/pidgin/plugins/gtk-signals-test.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/gtk-signals-test.c Thu Aug 06 22:22:03 2020 -0500
    @@ -26,10 +26,7 @@
    #include <purple.h>
    -#include "gtkaccount.h"
    -#include "gtkblist.h"
    -#include "gtkconv.h"
    -#include "pidginplugininfo.h"
    +#include <pidgin.h>
    /**************************************************************************
    * Account subsystem signal callbacks
    --- a/pidgin/plugins/gtkbuddynote.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/gtkbuddynote.c Thu Aug 06 22:22:03 2020 -0500
    @@ -19,10 +19,9 @@
    #include <glib/gi18n.h>
    -#include <gtkblist.h>
    -#include <pidginplugininfo.h>
    +#include <purple.h>
    -#include <purple.h>
    +#include <pidgin.h>
    static void
    append_to_tooltip(PurpleBlistNode *node, GString *text, gboolean full)
    --- a/pidgin/plugins/iconaway.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/iconaway.c Thu Aug 06 22:22:03 2020 -0500
    @@ -22,8 +22,7 @@
    #include <purple.h>
    -#include "gtkconv.h"
    -#include "pidginplugininfo.h"
    +#include <pidgin.h>
    #define ICONAWAY_PLUGIN_ID "gtk-iconaway"
    --- a/pidgin/plugins/musicmessaging/musicmessaging.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/musicmessaging/musicmessaging.c Thu Aug 06 22:22:03 2020 -0500
    @@ -28,9 +28,7 @@
    #include <purple.h>
    -#include "gtkconv.h"
    -#include "gtkplugin.h"
    -#include "gtkutils.h"
    +#include <pidgin.h>
    #define DBUS_API_SUBJECT_TO_CHANGE
    #include <dbus/dbus.h>
    --- a/pidgin/plugins/notify.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/notify.c Thu Aug 06 22:22:03 2020 -0500
    @@ -83,14 +83,11 @@
    * -Added Raise option, formally in Purple proper
    */
    -#include "internal.h"
    -#include "pidgin.h"
    -#include "gtkprefs.h"
    +#include <glib/gi18n-lib.h>
    #include <purple.h>
    -#include "gtkplugin.h"
    -#include "gtkutils.h"
    +#include <pidgin.h>
    #define NOTIFY_PLUGIN_ID "gtk-x11-notify"
    --- a/pidgin/plugins/relnot.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/relnot.c Thu Aug 06 22:22:03 2020 -0500
    @@ -26,11 +26,7 @@
    #include <purple.h>
    -#include "gtkblist.h"
    -#include "gtkutils.h"
    -#include "pidgincore.h"
    -#include "pidginicon.h"
    -#include "pidginplugininfo.h"
    +#include <pidgin.h>
    static SoupSession *session = NULL;
    --- a/pidgin/plugins/spellchk.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/spellchk.c Thu Aug 06 22:22:03 2020 -0500
    @@ -30,18 +30,15 @@
    * or nearly directly from xchat, version 1.4.2 by Peter Zelezny and others.
    */
    -#include "internal.h"
    -#include "pidgin.h"
    +#include <stdio.h>
    +#include <string.h>
    +#include <sys/types.h>
    +
    +#include <glib/gi18n-lib.h>
    #include <purple.h>
    -#include "gtkplugin.h"
    -#include "gtkprefs.h"
    -#include "gtkutils.h"
    -
    -#include <stdio.h>
    -#include <string.h>
    -#include <sys/types.h>
    +#include <pidgin.h>
    #define SPELLCHECK_PLUGIN_ID "gtk-spellcheck"
    #define SPELLCHK_OBJECT_KEY "spellchk"
    --- a/pidgin/plugins/ticker/ticker.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/ticker/ticker.c Thu Aug 06 22:22:03 2020 -0500
    @@ -29,10 +29,7 @@
    #include <purple.h>
    -#include "gtkblist.h"
    -#include "gtkutils.h"
    -#include "pidginplugininfo.h"
    -#include "pidginstock.h"
    +#include <pidgin.h>
    #include "gtkticker.h"
    --- a/pidgin/plugins/unity.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/unity.c Thu Aug 06 22:22:03 2020 -0500
    @@ -16,12 +16,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 "internal.h"
    #include <purple.h>
    -#include "gtkplugin.h"
    -#include "gtkconv.h"
    -#include "gtkutils.h"
    +#include <pidgin.h>
    #include <unity.h>
    #include <messaging-menu.h>
    --- a/pidgin/plugins/win32/winprefs/winprefs.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/win32/winprefs/winprefs.c Thu Aug 06 22:22:03 2020 -0500
    @@ -20,18 +20,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    *
    */
    -#include "internal.h"
    -
    -#include "pidgin.h"
    #include <purple.h>
    -#include "gtkappbar.h"
    -#include "gtkblist.h"
    -#include "gtkconv.h"
    -#include "gtkplugin.h"
    -#include "gtkprefs.h"
    -#include "gtkutils.h"
    +#include <pidgin.h>
    /*
    * MACROS & DEFINES
    --- a/pidgin/plugins/xmppconsole/xmppconsole.c Mon Aug 03 20:20:02 2020 -0500
    +++ b/pidgin/plugins/xmppconsole/xmppconsole.c Thu Aug 06 22:22:03 2020 -0500
    @@ -23,12 +23,11 @@
    #include <glib/gi18n-lib.h>
    +#include <gdk/gdkkeysyms.h>
    +
    #include <purple.h>
    -#include "gtkutils.h"
    -#include "pidginplugininfo.h"
    -
    -#include <gdk/gdkkeysyms.h>
    +#include <pidgin.h>
    #define PLUGIN_ID "gtk-xmpp"
    #define PLUGIN_DOMAIN (g_quark_from_static_string(PLUGIN_ID))