pidgin/pidgin

phase2 of pidgin.h: move existing file to pidgincore.h

2020-07-23, Gary Kramlich
6941fece679b
Parents f764203de1a9
Children 2f45a03838e9
phase2 of pidgin.h: move existing file to pidgincore.h

Rename pidgin.h to pidgincore.h and update everything accordingly.

Testing Done:
Compile test only.

Reviewed at https://reviews.imfreedom.org/r/43/
54 files changed, 161 insertions(+), 175 deletions(-)
  • +1 -2
    pidgin/gtkaccount.c
  • +1 -2
    pidgin/gtkblist.c
  • +0 -1
    pidgin/gtkblist.h
  • +1 -1
    pidgin/gtkconn.c
  • +1 -4
    pidgin/gtkconv.c
  • +0 -1
    pidgin/gtkconv.h
  • +2 -0
    pidgin/gtkconvwin.h
  • +1 -1
    pidgin/gtkdialogs.c
  • +0 -2
    pidgin/gtkdialogs.h
  • +3 -1
    pidgin/gtkmedia.c
  • +2 -3
    pidgin/gtknotify.c
  • +0 -2
    pidgin/gtkpluginpref.h
  • +1 -2
    pidgin/gtkpounce.c
  • +1 -2
    pidgin/gtkprefs.c
  • +0 -2
    pidgin/gtkprivacy.c
  • +2 -3
    pidgin/gtkrequest.c
  • +6 -5
    pidgin/gtkroomlist.c
  • +2 -2
    pidgin/gtksavedstatuses.c
  • +4 -3
    pidgin/gtksmiley-theme.c
  • +1 -2
    pidgin/gtksound.c
  • +4 -2
    pidgin/gtkstatusbox.c
  • +3 -6
    pidgin/gtkutils.c
  • +0 -1
    pidgin/gtkutils.h
  • +2 -0
    pidgin/gtkwhiteboard.c
  • +0 -2
    pidgin/gtkwhiteboard.h
  • +3 -2
    pidgin/gtkxfer.c
  • +1 -1
    pidgin/libpidgin.c
  • +1 -1
    pidgin/meson.build
  • +1 -2
    pidgin/minidialog.c
  • +1 -1
    pidgin/pidgin.c
  • +0 -69
    pidgin/pidgin.h
  • +4 -2
    pidgin/pidginabout.c
  • +3 -3
    pidgin/pidginaccountactionsmenu.c
  • +1 -1
    pidgin/pidginaccountchooser.c
  • +0 -2
    pidgin/pidginaccountchooser.h
  • +4 -3
    pidgin/pidginaccountsmenu.c
  • +12 -11
    pidgin/pidginactiongroup.c
  • +68 -0
    pidgin/pidgincore.h
  • +2 -1
    pidgin/pidgindebug.c
  • +5 -3
    pidgin/pidginlog.c
  • +0 -2
    pidgin/pidginlog.h
  • +2 -0
    pidgin/pidginplugininfo.c
  • +0 -2
    pidgin/pidginplugininfo.h
  • +4 -0
    pidgin/pidginpluginsdialog.c
  • +2 -3
    pidgin/pidginstock.c
  • +0 -1
    pidgin/pidgintooltip.c
  • +4 -4
    pidgin/plugins/contact_priority.c
  • +0 -1
    pidgin/plugins/disco/gtkdisco.c
  • +0 -2
    pidgin/plugins/disco/xmppdisco.c
  • +2 -0
    pidgin/plugins/gtk-signals-test.c
  • +2 -0
    pidgin/plugins/gtkbuddynote.c
  • +0 -2
    pidgin/plugins/iconaway.c
  • +1 -2
    pidgin/plugins/relnot.c
  • +0 -2
    pidgin/plugins/ticker/ticker.c
    • --- a/pidgin/gtkaccount.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkaccount.c Thu Jul 23 20:13:47 2020 -0500
    @@ -25,8 +25,6 @@
    #include <glib/gi18n-lib.h>
    -#include "pidgin.h"
    -
    #include <purple.h>
    #include "gtkaccount.h"
    @@ -34,6 +32,7 @@
    #include "gtkdialogs.h"
    #include "gtkutils.h"
    #include "gtkstatusbox.h"
    +#include "pidgincore.h"
    #include "pidginstock.h"
    #include "minidialog.h"
    #include "pidginprotocolchooser.h"
    --- a/pidgin/gtkblist.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkblist.c Thu Jul 23 20:13:47 2020 -0500
    @@ -25,8 +25,6 @@
    #include <glib/gi18n-lib.h>
    -#include "pidgin.h"
    -
    #include <purple.h>
    #include "gtkaccount.h"
    @@ -48,6 +46,7 @@
    #include "pidgin/pidginaccountchooser.h"
    #include "pidgin/pidginactiongroup.h"
    #include "pidgin/pidginbuddylistmenu.h"
    +#include "pidgin/pidgincore.h"
    #include "pidgin/pidgindebug.h"
    #include "pidgin/pidgingdkpixbuf.h"
    #include "pidgin/pidginlog.h"
    --- a/pidgin/gtkblist.h Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkblist.h Thu Jul 23 20:13:47 2020 -0500
    @@ -63,7 +63,6 @@
    #include <purple.h>
    -#include "pidgin.h"
    #include "gtkblist-theme.h"
    /**************************************************************************
    --- a/pidgin/gtkconn.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkconn.c Thu Jul 23 20:13:47 2020 -0500
    @@ -18,7 +18,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 "pidgin.h"
    #include <purple.h>
    @@ -26,6 +25,7 @@
    #include "gtkconn.h"
    #include "gtkdialogs.h"
    #include "gtkstatusbox.h"
    +#include "pidgincore.h"
    #include "pidginstock.h"
    #include "gtkutils.h"
    --- a/pidgin/gtkconv.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkconv.c Thu Jul 23 20:13:47 2020 -0500
    @@ -29,8 +29,6 @@
    #define BUF_LONG (4096)
    -#include "pidgin.h"
    -
    #ifdef HAVE_X11
    # include <X11/Xlib.h>
    #endif
    @@ -54,6 +52,7 @@
    #include "gtkprivacy.h"
    #include "gtkstyle.h"
    #include "gtkutils.h"
    +#include "pidgincore.h"
    #include "pidgingdkpixbuf.h"
    #include "pidgininvitedialog.h"
    #include "pidginlog.h"
    @@ -6759,8 +6758,6 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    *
    */
    -#include "pidgin.h"
    -
    #include <gdk/gdkkeysyms.h>
    --- a/pidgin/gtkconv.h Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkconv.h Thu Jul 23 20:13:47 2020 -0500
    @@ -75,7 +75,6 @@
    #include <purple.h>
    -#include "pidgin.h"
    #include "gtkconvwin.h"
    /**************************************************************************
    --- a/pidgin/gtkconvwin.h Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkconvwin.h Thu Jul 23 20:13:47 2020 -0500
    @@ -28,6 +28,8 @@
    * @title: Conversation Window API
    */
    +#include <gtk/gtk.h>
    +
    #define PIDGIN_TYPE_CONV_WINDOW (pidgin_conv_window_get_type())
    typedef struct _PidginConvWindowMenu PidginConvWindowMenu;
    --- a/pidgin/gtkdialogs.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkdialogs.c Thu Jul 23 20:13:47 2020 -0500
    @@ -27,7 +27,6 @@
    #include <talkatu.h>
    -#include "pidgin.h"
    #include "package_revision.h"
    #ifdef HAVE_MESON_CONFIG
    #include "meson-config.h"
    @@ -38,6 +37,7 @@
    #include "gtkblist.h"
    #include "gtkdialogs.h"
    #include "gtkutils.h"
    +#include "pidgincore.h"
    #include "pidginlog.h"
    #include "pidginstock.h"
    --- a/pidgin/gtkdialogs.h Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkdialogs.h Thu Jul 23 20:13:47 2020 -0500
    @@ -28,8 +28,6 @@
    * @title: Pidgin Dialogs
    */
    -#include "pidgin.h"
    -
    #include <purple.h>
    G_BEGIN_DECLS
    --- a/pidgin/gtkmedia.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkmedia.c Thu Jul 23 20:13:47 2020 -0500
    @@ -25,11 +25,13 @@
    #include <glib/gi18n-lib.h>
    +#include <gtk/gtk.h>
    +
    #include <purple.h>
    -#include "pidgin.h"
    #include "gtkmedia.h"
    #include "gtkutils.h"
    +#include "pidgincore.h"
    #include "pidginstock.h"
    #ifdef USE_VV
    --- a/pidgin/gtknotify.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtknotify.c Thu Jul 23 20:13:47 2020 -0500
    @@ -24,15 +24,14 @@
    #include <gdk/gdkkeysyms.h>
    #include <talkatu.h>
    -#include "pidgin.h"
    -
    #include <purple.h>
    -#include "pidginstock.h"
    #include "gtkblist.h"
    #include "gtknotify.h"
    #include "gtkpounce.h"
    #include "gtkutils.h"
    +#include "pidgincore.h"
    +#include "pidginstock.h"
    typedef struct
    {
    --- a/pidgin/gtkpluginpref.h Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkpluginpref.h Thu Jul 23 20:13:47 2020 -0500
    @@ -31,8 +31,6 @@
    #include <purple.h>
    -#include "pidgin.h"
    -
    G_BEGIN_DECLS
    /**
    --- a/pidgin/gtkpounce.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkpounce.c Thu Jul 23 20:13:47 2020 -0500
    @@ -24,8 +24,6 @@
    #include <talkatu.h>
    -#include "pidgin.h"
    -
    #include <purple.h>
    #include "gtkblist.h"
    @@ -35,6 +33,7 @@
    #include "pidginstock.h"
    #include "gtkutils.h"
    #include "pidginaccountchooser.h"
    +#include "pidgincore.h"
    #include "pidgintalkatu.h"
    #include <gdk/gdkkeysyms.h>
    --- a/pidgin/gtkprefs.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkprefs.c Thu Jul 23 20:13:47 2020 -0500
    @@ -32,8 +32,6 @@
    #include <talkatu.h>
    -#include "pidgin.h"
    -
    #include <purple.h>
    #include "gtkblist.h"
    @@ -45,6 +43,7 @@
    #include "gtksound.h"
    #include "gtkstatus-icon-theme.h"
    #include "gtkutils.h"
    +#include "pidgincore.h"
    #include "pidgindebug.h"
    #include "pidginstock.h"
    #ifdef USE_VV
    --- a/pidgin/gtkprivacy.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkprivacy.c Thu Jul 23 20:13:47 2020 -0500
    @@ -21,8 +21,6 @@
    #include <glib/gi18n-lib.h>
    -#include "pidgin.h"
    -
    #include <purple.h>
    #include "gtkaccount.h"
    --- a/pidgin/gtkrequest.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkrequest.c Thu Jul 23 20:13:47 2020 -0500
    @@ -23,16 +23,15 @@
    #include <talkatu.h>
    -#include "pidgin.h"
    -
    #include <purple.h>
    #include "gtkrequest.h"
    #include "gtkutils.h"
    -#include "pidginstock.h"
    #include "gtkblist.h"
    #include "gtkinternal.h"
    #include "pidginaccountchooser.h"
    +#include "pidgincore.h"
    +#include "pidginstock.h"
    #include <gdk/gdkkeysyms.h>
    --- a/pidgin/gtkroomlist.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkroomlist.c Thu Jul 23 20:13:47 2020 -0500
    @@ -21,16 +21,17 @@
    #include <glib/gi18n-lib.h>
    -#include "pidgin.h"
    +#include <gtk/gtk.h>
    +
    +#include <purple.h>
    +
    +#include "gtkroomlist.h"
    +
    #include "gtkutils.h"
    #include "pidginaccountchooser.h"
    #include "pidginstock.h"
    #include "pidgintooltip.h"
    -#include <purple.h>
    -
    -#include "gtkroomlist.h"
    -
    #define PIDGIN_TYPE_ROOMLIST_DIALOG (pidgin_roomlist_dialog_get_type())
    G_DECLARE_FINAL_TYPE(PidginRoomlistDialog, pidgin_roomlist_dialog, PIDGIN,
    ROOMLIST_DIALOG, GtkDialog)
    --- a/pidgin/gtksavedstatuses.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtksavedstatuses.c Thu Jul 23 20:13:47 2020 -0500
    @@ -26,10 +26,10 @@
    #include <purple.h>
    #include "gtkblist.h"
    -#include "pidgin.h"
    #include "gtksavedstatuses.h"
    +#include "gtkutils.h"
    +#include "pidgincore.h"
    #include "pidginstock.h"
    -#include "gtkutils.h"
    /*
    * TODO: Should attach to the account-deleted and account-added signals
    --- a/pidgin/gtksmiley-theme.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtksmiley-theme.c Thu Jul 23 20:13:47 2020 -0500
    @@ -23,13 +23,14 @@
    # include <config.h>
    #endif
    -#include "gtksmiley-theme.h"
    +#include <glib/gstdio.h>
    #include <purple.h>
    -#include "gtkutils.h"
    +#include "gtksmiley-theme.h"
    -#include <glib/gstdio.h>
    +#include "gtkutils.h"
    +#include "pidgincore.h"
    #define PIDGIN_SMILEY_THEME_MAX_LINES 1024
    #define PIDGIN_SMILEY_THEME_MAX_TOKENS 1024
    --- a/pidgin/gtksound.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtksound.c Thu Jul 23 20:13:47 2020 -0500
    @@ -30,8 +30,6 @@
    #include <glib/gi18n-lib.h>
    -#include "pidgin.h"
    -
    #ifdef _WIN32
    #include <windows.h>
    #include <mmsystem.h>
    @@ -45,6 +43,7 @@
    #include "gtkconv.h"
    #include "gtksound.h"
    +#include "pidgincore.h"
    struct pidgin_sound_event {
    char *label;
    --- a/pidgin/gtkstatusbox.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkstatusbox.c Thu Jul 23 20:13:47 2020 -0500
    @@ -37,16 +37,18 @@
    #include <glib/gi18n-lib.h>
    +#include <gtk/gtk.h>
    +
    #include <gdk/gdkkeysyms.h>
    #include <purple.h>
    -#include "pidgin.h"
    #include "gtksavedstatuses.h"
    -#include "pidginstock.h"
    #include "gtkstatusbox.h"
    #include "gtkutils.h"
    +#include "pidgincore.h"
    #include "pidgingdkpixbuf.h"
    +#include "pidginstock.h"
    /* Timeout for typing notifications in seconds */
    #define TYPING_TIMEOUT 4
    --- a/pidgin/gtkutils.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkutils.c Thu Jul 23 20:13:47 2020 -0500
    @@ -30,8 +30,6 @@
    #include <purple.h>
    -#include "pidgin.h"
    -
    #ifdef _WIN32
    # undef small
    # include <shellapi.h>
    @@ -41,17 +39,16 @@
    #include <talkatu.h>
    -#include <purple.h>
    -
    #include "gtkaccount.h"
    #include "gtkprefs.h"
    #include "gtkconv.h"
    #include "gtkdialogs.h"
    -#include "pidginstock.h"
    #include "gtkrequest.h"
    #include "gtkutils.h"
    -#include "pidgin/minidialog.h"
    +#include "minidialog.h"
    +#include "pidgincore.h"
    +#include "pidginstock.h"
    /******************************************************************************
    * Enums
    --- a/pidgin/gtkutils.h Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkutils.h Thu Jul 23 20:13:47 2020 -0500
    @@ -29,7 +29,6 @@
    */
    #include "gtkconv.h"
    -#include "pidgin.h"
    #include <purple.h>
    --- a/pidgin/gtkwhiteboard.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkwhiteboard.c Thu Jul 23 20:13:47 2020 -0500
    @@ -23,6 +23,8 @@
    #include <glib/gi18n-lib.h>
    +#include <gtk/gtk.h>
    +
    #include <math.h>
    #include <purple.h>
    --- a/pidgin/gtkwhiteboard.h Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkwhiteboard.h Thu Jul 23 20:13:47 2020 -0500
    @@ -28,8 +28,6 @@
    * @title: Whiteboard Frontend
    */
    -#include "pidgin.h"
    -
    G_BEGIN_DECLS
    /*****************************************************************************/
    --- a/pidgin/gtkxfer.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/gtkxfer.c Thu Jul 23 20:13:47 2020 -0500
    @@ -21,13 +21,14 @@
    #include <glib/gi18n-lib.h>
    -#include "pidgin.h"
    +#include <gtk/gtk.h>
    #include <purple.h>
    #include "gtkxfer.h"
    +#include "gtkutils.h"
    +#include "pidgincore.h"
    #include "pidginstock.h"
    -#include "gtkutils.h"
    #ifdef _WIN32
    # include <shellapi.h>
    --- a/pidgin/libpidgin.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/libpidgin.c Thu Jul 23 20:13:47 2020 -0500
    @@ -31,7 +31,6 @@
    #include <glib/gstdio.h>
    #include <locale.h>
    -#include "pidgin.h"
    #include <purple.h>
    @@ -54,6 +53,7 @@
    #include "gtksound.h"
    #include "gtkutils.h"
    #include "gtkwhiteboard.h"
    +#include "pidgincore.h"
    #include "pidgindebug.h"
    #include "pidginlog.h"
    #include "pidginplugininfo.h"
    --- a/pidgin/meson.build Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/meson.build Thu Jul 23 20:13:47 2020 -0500
    @@ -99,6 +99,7 @@
    'pidginactiongroup.h',
    'pidginbuddylistmenu.h',
    'pidgincontactcompletion.h',
    + 'pidgincore.h',
    'pidgindebug.h',
    'pidgingdkpixbuf.h',
    'pidginicon.h',
    @@ -114,7 +115,6 @@
    'pidginprotocolstore.h',
    'pidgintalkatu.h',
    'pidgintooltip.h',
    - 'pidgin.h',
    ]
    pidgin_SOURCES = [
    --- a/pidgin/minidialog.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/minidialog.c Thu Jul 23 20:13:47 2020 -0500
    @@ -23,8 +23,7 @@
    #include <purple.h>
    -#include "pidgin/minidialog.h"
    -#include "pidgin/pidgin.h"
    +#include "minidialog.h"
    static void pidgin_mini_dialog_init (PidginMiniDialog *self);
    static void pidgin_mini_dialog_class_init (PidginMiniDialogClass *klass);
    --- a/pidgin/pidgin.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/pidgin.c Thu Jul 23 20:13:47 2020 -0500
    @@ -21,7 +21,7 @@
    *
    */
    -#include "pidgin.h"
    +#include "pidgincore.h"
    #ifdef _WIN32
    /* suppress gcc "no previous prototype" warning */
    --- a/pidgin/pidgin.h Wed Jul 22 06:12:44 2020 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,69 +0,0 @@
    -/* pidgin
    - *
    - * Pidgin 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, write to the Free Software
    - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    - */
    -/* #warning ***pidgin*** */
    -
    -#ifndef _PIDGIN_H_
    -#define _PIDGIN_H_
    -/**
    - * SECTION:pidgin
    - * @section_id: pidgin-pidgin
    - * @short_description: <filename>pidgin.h</filename>
    - * @title: UI Definitions and Includes
    - */
    -
    -#include <glib/gi18n-lib.h>
    -
    -#include <gtk/gtk.h>
    -
    -#ifdef _WIN32
    -# include "win32/gtkwin32dep.h"
    -#endif
    -
    -/**
    - * PIDGIN_UI:
    - *
    - * Our UI's identifier.
    - */
    -/* leave this as gtk-gaim until we have a decent way to migrate UI-prefs */
    -#define PIDGIN_UI "gtk-gaim"
    -
    -/* change this only when we have a sane upgrade path for old prefs */
    -#define PIDGIN_PREFS_ROOT "/pidgin"
    -
    -/* Translators may want to transliterate the name.
    - It is not to be translated. */
    -#define PIDGIN_NAME _("Pidgin")
    -
    -#ifndef _WIN32
    -# define PIDGIN_ALERT_TITLE ""
    -#else
    -# define PIDGIN_ALERT_TITLE PIDGIN_NAME
    -#endif
    -
    -/**
    - * pidgin_start:
    - *
    - * Start pidgin with the given command line arguments.
    - */
    -int pidgin_start(int argc, char *argv[]);
    -
    -#endif /* _PIDGIN_H_ */
    -
    --- a/pidgin/pidginabout.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/pidginabout.c Thu Jul 23 20:13:47 2020 -0500
    @@ -27,10 +27,12 @@
    #include <json-glib/json-glib.h>
    #include <talkatu.h>
    +#include "pidginabout.h"
    +
    #include "package_revision.h"
    -#include "pidginabout.h"
    +#include "gtkutils.h"
    +#include "pidgincore.h"
    #include "pidginresources.h"
    -#include "gtkutils.h"
    #include <stdio.h>
    --- a/pidgin/pidginaccountactionsmenu.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/pidginaccountactionsmenu.c Thu Jul 23 20:13:47 2020 -0500
    @@ -24,9 +24,9 @@
    #include <purple.h>
    -#include "pidgin/gtkaccount.h"
    -#include "pidgin/pidgin.h"
    -#include "pidgin/pidginmooddialog.h"
    +#include "gtkaccount.h"
    +#include "pidgincore.h"
    +#include "pidginmooddialog.h"
    struct _PidginAccountActionsMenu {
    GtkMenu parent;
    --- a/pidgin/pidginaccountchooser.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/pidginaccountchooser.c Thu Jul 23 20:13:47 2020 -0500
    @@ -18,7 +18,7 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#include "pidgin.h"
    +#include <gtk/gtk.h>
    #include "gtkutils.h"
    #include "pidginaccountchooser.h"
    --- a/pidgin/pidginaccountchooser.h Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/pidginaccountchooser.h Thu Jul 23 20:13:47 2020 -0500
    @@ -32,8 +32,6 @@
    #include <purple.h>
    -#include "pidgin.h"
    -
    G_BEGIN_DECLS
    #define PIDGIN_TYPE_ACCOUNT_CHOOSER (pidgin_account_chooser_get_type())
    --- a/pidgin/pidginaccountsmenu.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/pidginaccountsmenu.c Thu Jul 23 20:13:47 2020 -0500
    @@ -24,9 +24,10 @@
    #include <purple.h>
    -#include "pidgin/gtkaccount.h"
    -#include "pidgin/pidgin.h"
    -#include "pidgin/pidginaccountactionsmenu.h"
    +#include "pidginaccountactionsmenu.h"
    +
    +#include "gtkaccount.h"
    +#include "pidgincore.h"
    struct _PidginAccountsMenu {
    GtkMenu parent;
    --- a/pidgin/pidginactiongroup.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/pidginactiongroup.c Thu Jul 23 20:13:47 2020 -0500
    @@ -24,17 +24,18 @@
    #include <purple.h>
    -#include "pidgin/gtkblist.h"
    -#include "pidgin/gtkdialogs.h"
    -#include "pidgin/gtkpounce.h"
    -#include "pidgin/gtkprefs.h"
    -#include "pidgin/gtkprivacy.h"
    -#include "pidgin/gtkroomlist.h"
    -#include "pidgin/gtksmiley-manager.h"
    -#include "pidgin/gtkxfer.h"
    -#include "pidgin/pidginabout.h"
    -#include "pidgin/pidginlog.h"
    -#include "pidgin/pidginmooddialog.h"
    +#include "gtkblist.h"
    +#include "gtkdialogs.h"
    +#include "gtkpounce.h"
    +#include "gtkprefs.h"
    +#include "gtkprivacy.h"
    +#include "gtkroomlist.h"
    +#include "gtksmiley-manager.h"
    +#include "gtkxfer.h"
    +#include "pidginabout.h"
    +#include "pidgincore.h"
    +#include "pidginlog.h"
    +#include "pidginmooddialog.h"
    struct _PidginActionGroup {
    GSimpleActionGroup parent;
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/pidgin/pidgincore.h Thu Jul 23 20:13:47 2020 -0500
    @@ -0,0 +1,68 @@
    +/* pidgin
    + *
    + * Pidgin 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, write to the Free Software
    + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    + */
    +
    +#ifndef PIDGIN_CORE_H
    +#define PIDGIN_CORE_H
    +/**
    + * SECTION:pidgin
    + * @section_id: pidgin-pidgin
    + * @short_description: <filename>pidgincore.h</filename>
    + * @title: UI Definitions and Includes
    + */
    +
    +#include <glib/gi18n-lib.h>
    +
    +#include <glib.h>
    +
    +#ifdef _WIN32
    +# include "win32/gtkwin32dep.h"
    +#endif
    +
    +/**
    + * PIDGIN_UI:
    + *
    + * Our UI's identifier.
    + */
    +/* leave this as gtk-gaim until we have a decent way to migrate UI-prefs */
    +#define PIDGIN_UI "gtk-gaim"
    +
    +/* change this only when we have a sane upgrade path for old prefs */
    +#define PIDGIN_PREFS_ROOT "/pidgin"
    +
    +/* Translators may want to transliterate the name.
    + It is not to be translated. */
    +#define PIDGIN_NAME _("Pidgin")
    +
    +#ifndef _WIN32
    +# define PIDGIN_ALERT_TITLE ""
    +#else
    +# define PIDGIN_ALERT_TITLE PIDGIN_NAME
    +#endif
    +
    +/**
    + * pidgin_start:
    + *
    + * Start pidgin with the given command line arguments.
    + */
    +int pidgin_start(int argc, char *argv[]);
    +
    +#endif /* PIDGIN_CORE_H */
    +
    --- a/pidgin/pidgindebug.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/pidgindebug.c Thu Jul 23 20:13:47 2020 -0500
    @@ -26,12 +26,13 @@
    #include <glib/gi18n-lib.h>
    #include <glib/gstdio.h>
    -#include "pidgin.h"
    +#include <gtk/gtk.h>
    #include <purple.h>
    #include "gtkdialogs.h"
    #include "gtkutils.h"
    +#include "pidgincore.h"
    #include "pidgindebug.h"
    #include "pidginstock.h"
    --- a/pidgin/pidginlog.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/pidginlog.c Thu Jul 23 20:13:47 2020 -0500
    @@ -21,16 +21,18 @@
    #include <glib/gi18n-lib.h>
    -#include "pidgin.h"
    +#include <gtk/gtk.h>
    #include <talkatu.h>
    #include <purple.h>
    -#include "pidginstock.h"
    +#include "pidginlog.h"
    +
    #include "gtkblist.h"
    #include "gtkutils.h"
    -#include "pidginlog.h"
    +#include "pidgincore.h"
    +#include "pidginstock.h"
    #define PIDGIN_TYPE_LOG_VIEWER pidgin_log_viewer_get_type()
    /**
    --- a/pidgin/pidginlog.h Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/pidginlog.h Thu Jul 23 20:13:47 2020 -0500
    @@ -29,8 +29,6 @@
    * @see_also: <link linkend="chapter-signals-gtklog">Log signals</link>
    */
    -#include "pidgin.h"
    -
    #include <purple.h>
    G_BEGIN_DECLS
    --- a/pidgin/pidginplugininfo.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/pidginplugininfo.c Thu Jul 23 20:13:47 2020 -0500
    @@ -20,6 +20,8 @@
    */
    #include "pidginplugininfo.h"
    +#include "pidgincore.h"
    +
    struct _PidginPluginInfo {
    PurplePluginInfo parent;
    };
    --- a/pidgin/pidginplugininfo.h Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/pidginplugininfo.h Thu Jul 23 20:13:47 2020 -0500
    @@ -25,8 +25,6 @@
    #include <purple.h>
    -#include "pidgin.h"
    -
    G_BEGIN_DECLS
    #define PIDGIN_TYPE_PLUGIN_INFO (pidgin_plugin_info_get_type())
    --- a/pidgin/pidginpluginsdialog.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/pidginpluginsdialog.c Thu Jul 23 20:13:47 2020 -0500
    @@ -23,7 +23,10 @@
    #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>
    @@ -31,6 +34,7 @@
    #include <purple.h>
    #include "gtkpluginpref.h"
    +#include "pidgincore.h"
    struct _PidginPluginsDialog {
    GtkDialog parent;
    --- a/pidgin/pidginstock.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/pidginstock.c Thu Jul 23 20:13:47 2020 -0500
    @@ -27,11 +27,10 @@
    #include <purple.h>
    -#include "pidgin.h"
    +#include "pidginstock.h"
    #include "gtkicon-theme-loader.h"
    -
    -#include "pidginstock.h"
    +#include "pidgincore.h"
    #warning GtkStock is deprecated. Port usage of PidginStock to GtkIconTheme \
    and friends.
    --- a/pidgin/pidgintooltip.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/pidgintooltip.c Thu Jul 23 20:13:47 2020 -0500
    @@ -23,7 +23,6 @@
    #include <purple.h>
    -#include "pidgin.h"
    #include "pidgintooltip.h"
    static gboolean enable_tooltips;
    --- a/pidgin/plugins/contact_priority.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/plugins/contact_priority.c Thu Jul 23 20:13:47 2020 -0500
    @@ -20,14 +20,14 @@
    #include <glib/gi18n-lib.h>
    -#include "pidgin.h"
    +#include <gtk/gtk.h>
    +
    +#include <purple.h>
    +
    #include "gtkutils.h"
    #include "pidginplugininfo.h"
    #include "pidginaccountchooser.h"
    -#include <purple.h>
    -
    -
    #define CONTACT_PRIORITY_PLUGIN_ID "gtk-contact-priority"
    static void
    --- a/pidgin/plugins/disco/gtkdisco.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/plugins/disco/gtkdisco.c Thu Jul 23 20:13:47 2020 -0500
    @@ -33,7 +33,6 @@
    #include <purple.h>
    #include "gtkutils.h"
    -#include "pidgin.h"
    #include "pidginaccountchooser.h"
    #include "pidgintooltip.h"
    --- a/pidgin/plugins/disco/xmppdisco.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/plugins/disco/xmppdisco.c Thu Jul 23 20:13:47 2020 -0500
    @@ -38,8 +38,6 @@
    #include <glib/gi18n-lib.h>
    -#include "pidgin.h"
    -
    #include <purple.h>
    #include "gtkconv.h"
    --- a/pidgin/plugins/gtk-signals-test.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/plugins/gtk-signals-test.c Thu Jul 23 20:13:47 2020 -0500
    @@ -20,6 +20,8 @@
    */
    #define GTK_SIGNAL_TEST_PLUGIN_ID "gtk-signals-test"
    +#include <glib/gi18n.h>
    +
    #include <gtk/gtk.h>
    #include <purple.h>
    --- a/pidgin/plugins/gtkbuddynote.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/plugins/gtkbuddynote.c Thu Jul 23 20:13:47 2020 -0500
    @@ -17,6 +17,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
    */
    +#include <glib/gi18n.h>
    +
    #include <gtkblist.h>
    #include <pidginplugininfo.h>
    --- a/pidgin/plugins/iconaway.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/plugins/iconaway.c Thu Jul 23 20:13:47 2020 -0500
    @@ -22,8 +22,6 @@
    #include <purple.h>
    -#include "pidgin.h"
    -
    #include "gtkconv.h"
    #include "pidginplugininfo.h"
    --- a/pidgin/plugins/relnot.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/plugins/relnot.c Thu Jul 23 20:13:47 2020 -0500
    @@ -28,11 +28,10 @@
    #include "gtkblist.h"
    #include "gtkutils.h"
    +#include "pidgincore.h"
    #include "pidginicon.h"
    #include "pidginplugininfo.h"
    -#include "pidgin.h"
    -
    static SoupSession *session = NULL;
    /* 1 day */
    --- a/pidgin/plugins/ticker/ticker.c Wed Jul 22 06:12:44 2020 -0500
    +++ b/pidgin/plugins/ticker/ticker.c Thu Jul 23 20:13:47 2020 -0500
    @@ -27,8 +27,6 @@
    #include <glib/gi18n-lib.h>
    -#include "pidgin.h"
    -
    #include <purple.h>
    #include "gtkblist.h"