pidgin/pidgin

Make sure we're not including the gettext macros in header files and deal with the repercussions of that.

2020-05-21, Gary Kramlich
f23c7e772667
Parents 80d1a092cf5e
Children 21d18c56debc
Make sure we're not including the gettext macros in header files and deal with the repercussions of that.
69 files changed, 167 insertions(+), 38 deletions(-)
  • +1 -1
    finch/finch.c
  • +2 -0
    finch/gntaccount.c
  • +2 -0
    finch/gntblist.c
  • +2 -0
    finch/gntconn.c
  • +2 -0
    finch/gntconv.c
  • +2 -3
    finch/gntdebug.c
  • +2 -0
    finch/gntlog.c
  • +1 -3
    finch/gntmedia.c
  • +2 -0
    finch/gntplugin.c
  • +3 -3
    finch/gntsound.c
  • +1 -3
    finch/gntui.c
  • +2 -0
    finch/plugins/gntgf.c
  • +2 -0
    finch/plugins/gnthistory.c
  • +2 -0
    finch/plugins/gnttinyurl.c
  • +3 -0
    finch/plugins/grouping.c
  • +2 -0
    finch/plugins/lastlog.c
  • +3 -0
    libpurple/account.c
  • +3 -0
    libpurple/accounts.c
  • +8 -0
    libpurple/buddylist.c
  • +10 -3
    libpurple/buddylist.h
  • +2 -0
    libpurple/connection.c
  • +3 -0
    libpurple/conversation.c
  • +3 -0
    libpurple/conversationtypes.c
  • +3 -0
    libpurple/core.c
  • +2 -0
    libpurple/keyring.c
  • +2 -0
    libpurple/log.c
  • +2 -0
    libpurple/media/backend-fs2.c
  • +2 -0
    libpurple/mediamanager.c
  • +2 -0
    libpurple/message.c
  • +2 -0
    libpurple/options.c
  • +3 -0
    libpurple/plugins.c
  • +3 -0
    libpurple/presence.c
  • +3 -0
    libpurple/protocols.c
  • +8 -0
    libpurple/protocols/bonjour/bonjour.c
  • +3 -1
    libpurple/protocols/bonjour/bonjour.h
  • +2 -3
    libpurple/protocols/bonjour/bonjour_ft.c
  • +2 -0
    libpurple/protocols/bonjour/xmpp.c
  • +2 -0
    libpurple/protocols/facebook/facebook.c
  • +2 -0
    libpurple/protocols/gg/gg.c
  • +3 -0
    libpurple/protocols/gg/message-prpl.c
  • +2 -0
    libpurple/protocols/irc/dcc_send.c
  • +2 -0
    libpurple/protocols/irc/irc.c
  • +2 -0
    libpurple/protocols/irc/msgs.c
  • +2 -0
    libpurple/protocols/irc/parse.c
  • +2 -0
    libpurple/protocols/jabber/adhoccommands.c
  • +1 -3
    libpurple/protocols/jabber/auth_cyrus.c
  • +1 -3
    libpurple/protocols/jabber/google/google_session.c
  • +2 -0
    libpurple/protocols/jabber/gtalk.c
  • +1 -3
    libpurple/protocols/jabber/jabber.c
  • +1 -3
    libpurple/protocols/jabber/jingle/rtp.c
  • +3 -0
    libpurple/protocols/jabber/jutil.c
  • +1 -3
    libpurple/protocols/jabber/si.c
  • +1 -3
    libpurple/protocols/jabber/useravatar.c
  • +2 -0
    libpurple/protocols/jabber/usernick.c
  • +3 -0
    libpurple/protocols/jabber/xdata.c
  • +2 -0
    libpurple/protocols/jabber/xmpp.c
  • +2 -0
    libpurple/protocols/novell/nmuser.c
  • +2 -0
    libpurple/protocols/novell/novell.c
  • +2 -0
    libpurple/protocols/sametime/sametime.c
  • +2 -0
    libpurple/protocols/simple/simple.c
  • +2 -0
    libpurple/protocols/zephyr/zephyr.c
  • +2 -0
    libpurple/proxy.c
  • +2 -0
    libpurple/request.c
  • +3 -0
    libpurple/savedstatuses.c
  • +2 -0
    libpurple/server.c
  • +3 -0
    libpurple/status.c
  • +3 -0
    libpurple/util.c
  • +3 -0
    libpurple/xfer.c
  • +2 -0
    libpurple/xmlnode.c
    • --- a/finch/finch.c Mon May 11 22:31:08 2020 -0500
    +++ b/finch/finch.c Thu May 21 21:21:54 2020 -0500
    @@ -20,7 +20,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#include <glib/gi18n-lib.h>
    +#include <glib/gi18n.h>
    #include <purple.h>
    --- a/finch/gntaccount.c Mon May 11 22:31:08 2020 -0500
    +++ b/finch/gntaccount.c Thu May 21 21:21:54 2020 -0500
    @@ -20,6 +20,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include <gnt.h>
    --- a/finch/gntblist.c Mon May 11 22:31:08 2020 -0500
    +++ b/finch/gntblist.c Thu May 21 21:21:54 2020 -0500
    @@ -24,6 +24,8 @@
    #include NCURSES_HEADER
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "gntbox.h"
    --- a/finch/gntconn.c Mon May 11 22:31:08 2020 -0500
    +++ b/finch/gntconn.c Thu May 21 21:21:54 2020 -0500
    @@ -22,6 +22,8 @@
    #include "finch.h"
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "gntaccount.h"
    --- a/finch/gntconv.c Mon May 11 22:31:08 2020 -0500
    +++ b/finch/gntconv.c Thu May 21 21:21:54 2020 -0500
    @@ -24,6 +24,8 @@
    #include NCURSES_HEADER
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "gntaccount.h"
    --- a/finch/gntdebug.c Mon May 11 22:31:08 2020 -0500
    +++ b/finch/gntdebug.c Thu May 21 21:21:54 2020 -0500
    @@ -20,11 +20,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <config.h>
    #include <glib.h>
    +#include <glib/gi18n-lib.h>
    #include <glib/gstdio.h>
    #include <purple.h>
    --- a/finch/gntlog.c Mon May 11 22:31:08 2020 -0500
    +++ b/finch/gntlog.c Thu May 21 21:21:54 2020 -0500
    @@ -20,6 +20,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "finch.h"
    --- a/finch/gntmedia.c Mon May 11 22:31:08 2020 -0500
    +++ b/finch/gntmedia.c Thu May 21 21:21:54 2020 -0500
    @@ -20,9 +20,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <config.h>
    #include <glib/gi18n-lib.h>
    --- a/finch/gntplugin.c Mon May 11 22:31:08 2020 -0500
    +++ b/finch/gntplugin.c Thu May 21 21:21:54 2020 -0500
    @@ -20,6 +20,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include <gnt.h>
    --- a/finch/gntsound.c Mon May 11 22:31:08 2020 -0500
    +++ b/finch/gntsound.c Thu May 21 21:21:54 2020 -0500
    @@ -20,9 +20,9 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <config.h>
    +
    +#include <glib/gi18n-lib.h>
    #include "finch.h"
    --- a/finch/gntui.c Mon May 11 22:31:08 2020 -0500
    +++ b/finch/gntui.c Thu May 21 21:21:54 2020 -0500
    @@ -20,9 +20,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <config.h>
    #include <glib/gi18n-lib.h>
    --- a/finch/plugins/gntgf.c Mon May 11 22:31:08 2020 -0500
    +++ b/finch/plugins/gntgf.c Thu May 21 21:21:54 2020 -0500
    @@ -38,6 +38,8 @@
    #endif
    #include <glib.h>
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    --- a/finch/plugins/gnthistory.c Mon May 11 22:31:08 2020 -0500
    +++ b/finch/plugins/gnthistory.c Thu May 21 21:21:54 2020 -0500
    @@ -18,6 +18,8 @@
    /* Ripped from gtk/plugins/history.c */
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "gntconv.h"
    --- a/finch/plugins/gnttinyurl.c Mon May 11 22:31:08 2020 -0500
    +++ b/finch/plugins/gnttinyurl.c Thu May 21 21:21:54 2020 -0500
    @@ -16,6 +16,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #include <glib.h>
    #include <libsoup/soup.h>
    --- a/finch/plugins/grouping.c Mon May 11 22:31:08 2020 -0500
    +++ b/finch/plugins/grouping.c Thu May 21 21:21:54 2020 -0500
    @@ -15,6 +15,9 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
    */
    +
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "gntblist.h"
    --- a/finch/plugins/lastlog.c Mon May 11 22:31:08 2020 -0500
    +++ b/finch/plugins/lastlog.c Thu May 21 21:21:54 2020 -0500
    @@ -18,6 +18,8 @@
    #define PLUGIN_STATIC_NAME GntLastlog
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include <gnt.h>
    --- a/libpurple/account.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/account.c Thu May 21 21:21:54 2020 -0500
    @@ -18,6 +18,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 <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "accounts.h"
    --- a/libpurple/accounts.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/accounts.c Thu May 21 21:21:54 2020 -0500
    @@ -18,6 +18,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 <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "accounts.h"
    #include "core.h"
    --- a/libpurple/buddylist.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/buddylist.c Thu May 21 21:21:54 2020 -0500
    @@ -20,6 +20,9 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    *
    */
    +
    +#include <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "buddylist.h"
    #include "conversation.h"
    @@ -1981,6 +1984,11 @@
    }
    }
    +const gchar *
    +purple_blist_get_default_group_name(void) {
    + return _("Buddies");
    +}
    +
    void
    purple_blist_request_add_buddy(PurpleAccount *account, const char *username,
    --- a/libpurple/buddylist.h Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/buddylist.h Thu May 21 21:21:54 2020 -0500
    @@ -22,8 +22,6 @@
    #ifndef PURPLE_BUDDY_LIST_H
    #define PURPLE_BUDDY_LIST_H
    -#include <glib/gi18n-lib.h>
    -
    /**
    * SECTION:buddylist
    * @section_id: libpurple-buddylist
    @@ -39,7 +37,7 @@
    #define PURPLE_TYPE_BUDDY_LIST (purple_buddy_list_get_type())
    typedef struct _PurpleBuddyList PurpleBuddyList;
    -#define PURPLE_BLIST_DEFAULT_GROUP_NAME _("Buddies")
    +#define PURPLE_BLIST_DEFAULT_GROUP_NAME (purple_blist_get_default_group_name())
    #include "chat.h"
    #include "contact.h"
    @@ -435,6 +433,15 @@
    */
    void purple_blist_walk(PurpleBlistWalkFunc group_func, PurpleBlistWalkFunc chat_func, PurpleBlistWalkFunc meta_contact_func, PurpleBlistWalkFunc contact_func, gpointer data);
    +/**
    + * purple_blist_get_default_group_name:
    + *
    + * Gets the default group name for the buddy list.
    + *
    + * Returns: The name of the default group.
    + */
    +const gchar *purple_blist_get_default_group_name(void);
    +
    /****************************************************************************************/
    /* Buddy list file management API */
    /****************************************************************************************/
    --- a/libpurple/connection.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/connection.c Thu May 21 21:21:54 2020 -0500
    @@ -19,6 +19,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "account.h"
    --- a/libpurple/conversation.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/conversation.c Thu May 21 21:21:54 2020 -0500
    @@ -19,6 +19,9 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +
    +#include <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "buddylist.h"
    --- a/libpurple/conversationtypes.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/conversationtypes.c Thu May 21 21:21:54 2020 -0500
    @@ -19,6 +19,9 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +
    +#include <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "conversationtypes.h"
    #include "debug.h"
    --- a/libpurple/core.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/core.c Thu May 21 21:21:54 2020 -0500
    @@ -18,6 +18,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 <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "cmds.h"
    #include "connection.h"
    --- a/libpurple/keyring.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/keyring.c Thu May 21 21:21:54 2020 -0500
    @@ -20,6 +20,8 @@
    */
    #include <glib.h>
    +#include <glib/gi18n-lib.h>
    +
    #include <string.h>
    #include "account.h"
    #include "keyring.h"
    --- a/libpurple/log.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/log.c Thu May 21 21:21:54 2020 -0500
    @@ -19,6 +19,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include <glib.h>
    --- a/libpurple/media/backend-fs2.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/media/backend-fs2.c Thu May 21 21:21:54 2020 -0500
    @@ -19,6 +19,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "backend-fs2.h"
    --- a/libpurple/mediamanager.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/mediamanager.c Thu May 21 21:21:54 2020 -0500
    @@ -19,6 +19,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "account.h"
    --- a/libpurple/message.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/message.c Thu May 21 21:21:54 2020 -0500
    @@ -19,6 +19,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "debug.h"
    --- a/libpurple/options.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/options.c Thu May 21 21:21:54 2020 -0500
    @@ -19,6 +19,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "options.h"
    --- a/libpurple/plugins.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/plugins.c Thu May 21 21:21:54 2020 -0500
    @@ -19,6 +19,9 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +
    +#include <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "core.h"
    --- a/libpurple/presence.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/presence.c Thu May 21 21:21:54 2020 -0500
    @@ -18,6 +18,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 <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "debug.h"
    #include "presence.h"
    --- a/libpurple/protocols.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols.c Thu May 21 21:21:54 2020 -0500
    @@ -20,6 +20,9 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    *
    */
    +
    +#include <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "conversation.h"
    #include "debug.h"
    --- a/libpurple/protocols/bonjour/bonjour.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/bonjour/bonjour.c Thu May 21 21:21:54 2020 -0500
    @@ -19,6 +19,9 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +
    +#include <glib/gi18n-lib.h>
    +
    #include <glib.h>
    #ifndef _WIN32
    #include <pwd.h>
    @@ -51,6 +54,11 @@
    return bd->jid;
    }
    +const gchar *
    +bonjour_get_group_name(void) {
    + return _("Bonjour");
    +}
    +
    static void
    bonjour_removeallfromlocal(PurpleConnection *conn, PurpleGroup *bonjour_group)
    {
    --- a/libpurple/protocols/bonjour/bonjour.h Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/bonjour/bonjour.h Thu May 21 21:21:54 2020 -0500
    @@ -33,7 +33,7 @@
    #include "mdns_common.h"
    #include "xmpp.h"
    -#define BONJOUR_GROUP_NAME _("Bonjour")
    +#define BONJOUR_GROUP_NAME (bonjour_get_group_name())
    #define BONJOUR_PROTOCOL_NAME "bonjour"
    #define BONJOUR_ICON_NAME "bonjour"
    @@ -78,4 +78,6 @@
    */
    const char *bonjour_get_jid(PurpleAccount *account);
    +const gchar *bonjour_get_group_name(void);
    +
    #endif /* PURPLE_BONJOUR_BONJOUR_H */
    --- a/libpurple/protocols/bonjour/bonjour_ft.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/bonjour/bonjour_ft.c Thu May 21 21:21:54 2020 -0500
    @@ -19,9 +19,8 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +
    +#include <config.h>
    #include <sys/types.h>
    #ifndef _WIN32
    --- a/libpurple/protocols/bonjour/xmpp.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/bonjour/xmpp.c Thu May 21 21:21:54 2020 -0500
    @@ -20,6 +20,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "purpleprivate.h"
    --- a/libpurple/protocols/facebook/facebook.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/facebook/facebook.c Thu May 21 21:21:54 2020 -0500
    @@ -19,6 +19,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "api.h"
    --- a/libpurple/protocols/gg/gg.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/gg/gg.c Thu May 21 21:21:54 2020 -0500
    @@ -26,6 +26,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "purpleprivate.h"
    --- a/libpurple/protocols/gg/message-prpl.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/gg/message-prpl.c Thu May 21 21:21:54 2020 -0500
    @@ -25,6 +25,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 <glib/gi18n-lib.h>
    +
    #include "message-prpl.h"
    #include "gg.h"
    --- a/libpurple/protocols/irc/dcc_send.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/irc/dcc_send.c Thu May 21 21:21:54 2020 -0500
    @@ -19,6 +19,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #ifndef _WIN32
    # include <arpa/inet.h>
    #endif
    --- a/libpurple/protocols/irc/irc.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/irc/irc.c Thu May 21 21:21:54 2020 -0500
    @@ -21,6 +21,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "irc.h"
    --- a/libpurple/protocols/irc/msgs.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/irc/msgs.c Thu May 21 21:21:54 2020 -0500
    @@ -24,6 +24,8 @@
    * possible for a malicious server or man-in-the-middle to trigger a crash.
    */
    +#include <glib/gi18n-lib.h>
    +
    #include <ctype.h>
    #include <purple.h>
    --- a/libpurple/protocols/irc/parse.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/irc/parse.c Thu May 21 21:21:54 2020 -0500
    @@ -18,6 +18,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "irc.h"
    --- a/libpurple/protocols/jabber/adhoccommands.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/jabber/adhoccommands.c Thu May 21 21:21:54 2020 -0500
    @@ -21,6 +21,8 @@
    *
    */
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "adhoccommands.h"
    --- a/libpurple/protocols/jabber/auth_cyrus.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/jabber/auth_cyrus.c Thu May 21 21:21:54 2020 -0500
    @@ -21,9 +21,7 @@
    *
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <config.h>
    #include <glib/gi18n-lib.h>
    --- a/libpurple/protocols/jabber/google/google_session.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/jabber/google/google_session.c Thu May 21 21:21:54 2020 -0500
    @@ -18,9 +18,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <config.h>
    #include <purple.h>
    --- a/libpurple/protocols/jabber/gtalk.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/jabber/gtalk.c Thu May 21 21:21:54 2020 -0500
    @@ -20,6 +20,8 @@
    *
    */
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "gtalk.h"
    --- a/libpurple/protocols/jabber/jabber.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/jabber/jabber.c Thu May 21 21:21:54 2020 -0500
    @@ -21,9 +21,7 @@
    *
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <config.h>
    #include <glib/gi18n-lib.h>
    --- a/libpurple/protocols/jabber/jingle/rtp.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/jabber/jingle/rtp.c Thu May 21 21:21:54 2020 -0500
    @@ -22,9 +22,7 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <config.h>
    #ifdef USE_VV
    --- a/libpurple/protocols/jabber/jutil.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/jabber/jutil.c Thu May 21 21:21:54 2020 -0500
    @@ -20,6 +20,9 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    *
    */
    +
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "chat.h"
    --- a/libpurple/protocols/jabber/si.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/jabber/si.c Thu May 21 21:21:54 2020 -0500
    @@ -22,9 +22,7 @@
    *
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <config.h>
    #include <sys/types.h>
    #ifndef _WIN32
    --- a/libpurple/protocols/jabber/useravatar.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/jabber/useravatar.c Thu May 21 21:21:54 2020 -0500
    @@ -21,9 +21,7 @@
    *
    */
    -#ifdef HAVE_CONFIG_H
    -# include <config.h>
    -#endif
    +#include <config.h>
    #ifndef _WIN32
    # include <arpa/inet.h>
    --- a/libpurple/protocols/jabber/usernick.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/jabber/usernick.c Thu May 21 21:21:54 2020 -0500
    @@ -21,6 +21,8 @@
    *
    */
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "usernick.h"
    --- a/libpurple/protocols/jabber/xdata.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/jabber/xdata.c Thu May 21 21:21:54 2020 -0500
    @@ -20,6 +20,9 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    *
    */
    +
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "xdata.h"
    --- a/libpurple/protocols/jabber/xmpp.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/jabber/xmpp.c Thu May 21 21:21:54 2020 -0500
    @@ -20,6 +20,8 @@
    *
    */
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "xmpp.h"
    --- a/libpurple/protocols/novell/nmuser.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/novell/nmuser.c Thu May 21 21:21:54 2020 -0500
    @@ -18,6 +18,8 @@
    *
    */
    +#include <glib/gi18n-lib.h>
    +
    #include <string.h>
    #include <purple.h>
    #include "nmfield.h"
    --- a/libpurple/protocols/novell/novell.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/novell/novell.c Thu May 21 21:21:54 2020 -0500
    @@ -18,6 +18,8 @@
    *
    */
    +#include <glib/gi18n-lib.h>
    +
    #ifndef _WIN32
    # include <sys/utsname.h>
    #endif
    --- a/libpurple/protocols/sametime/sametime.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/sametime/sametime.c Thu May 21 21:21:54 2020 -0500
    @@ -21,6 +21,8 @@
    USA.
    */
    +#include <glib/gi18n-lib.h>
    +
    #define BUF_LEN (2048)
    #define BUF_LONG (BUF_LEN * 2)
    --- a/libpurple/protocols/simple/simple.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/simple/simple.c Thu May 21 21:21:54 2020 -0500
    @@ -22,6 +22,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include "purpleprivate.h"
    --- a/libpurple/protocols/zephyr/zephyr.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/protocols/zephyr/zephyr.c Thu May 21 21:21:54 2020 -0500
    @@ -27,6 +27,8 @@
    */
    +#include <glib/gi18n-lib.h>
    +
    #include <glib.h>
    #include <glib/gstdio.h>
    --- a/libpurple/proxy.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/proxy.c Thu May 21 21:21:54 2020 -0500
    @@ -25,6 +25,8 @@
    , 2nd provide an easy way to add socks support
    , 3rd draw women to it like flies to honey */
    +#include <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "debug.h"
    #include "notify.h"
    --- a/libpurple/request.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/request.c Thu May 21 21:21:54 2020 -0500
    @@ -19,6 +19,8 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "notify.h"
    --- a/libpurple/savedstatuses.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/savedstatuses.c Thu May 21 21:21:54 2020 -0500
    @@ -18,6 +18,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 <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "debug.h"
    --- a/libpurple/server.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/server.c Thu May 21 21:21:54 2020 -0500
    @@ -23,6 +23,8 @@
    /* This file is the fullcrap */
    +#include <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "buddylist.h"
    #include "conversation.h"
    --- a/libpurple/status.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/status.c Thu May 21 21:21:54 2020 -0500
    @@ -18,6 +18,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 <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "purpleprivate.h"
    --- a/libpurple/util.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/util.c Thu May 21 21:21:54 2020 -0500
    @@ -16,6 +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 <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "purpleprivate.h"
    --- a/libpurple/xfer.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/xfer.c Thu May 21 21:21:54 2020 -0500
    @@ -19,6 +19,9 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    *
    */
    +
    +#include <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "glibcompat.h" /* for purple_g_stat on win32 */
    --- a/libpurple/xmlnode.c Mon May 11 22:31:08 2020 -0500
    +++ b/libpurple/xmlnode.c Thu May 21 21:21:54 2020 -0500
    @@ -24,6 +24,8 @@
    * write my own stuff. Also, re-writing this lets me be as lightweight
    * as I want to be. Thank you libxode for giving me a good starting point */
    +#include <glib/gi18n-lib.h>
    +
    #include "internal.h"
    #include "debug.h"