pidgin/purple-plugin-pack

merge of '2d1032f97c0bf069a0ae6192bef505de0951cd26'
org.guifications.plugins
2007-07-05, sadrul
1e730acf8b3f
Parents b1926224855c12edada45c40
Children eedcbb944cc4531fa0e12bbe
merge of '2d1032f97c0bf069a0ae6192bef505de0951cd26'
and '6525b5ac14431cfbd26f95df3f55ea7430a14df8'
53 files changed, 110 insertions(+), 97 deletions(-)
  • +1 -1
    album/album.h
  • +1 -1
    autorejoin/autorejoin.c
  • +1 -1
    autoreply/autoreply.c
  • +1 -1
    awaynotify/awaynotify.c
  • +1 -1
    bash/bash.c
  • +1 -1
    bit/bit.c
  • +1 -1
    blistops/blistops.c
  • +1 -1
    broadcast/broadcast.c
  • +1 -1
    buddytime/buddytime.c
  • +1 -1
    chronic/chronic.c
  • +1 -1
    common/Makefile.am
  • +1 -1
    common/core-template.c
  • +1 -1
    common/gtk-template.c
  • +0 -46
    common/i18n.h
  • +59 -0
    common/pp_internal.h
  • +1 -1
    convbadger/convbadger.c
  • +1 -1
    dice/dice.c
  • +1 -1
    difftopic/difftopic.c
  • +1 -1
    eight_ball/eight_ball.c
  • +1 -1
    flip/flip.c
  • +1 -1
    gRIM/gRIM.c
  • +1 -1
    groupmsg/groupmsg.c
  • +1 -1
    hideconv/hideconv.c
  • +1 -1
    highlight/highlight.c
  • +1 -1
    ignorance/ignorance.h
  • +1 -1
    ignorance/support.c
  • +1 -1
    ignore/ignore.c
  • +1 -1
    irc-more/irc-more.c
  • +1 -1
    irchelper/irchelper.c
  • +1 -1
    irssi/datechange.c
  • +1 -1
    irssi/irssi.c
  • +1 -1
    irssi/lastlog.c
  • +1 -1
    irssi/layout.c
  • +1 -1
    irssi/textfmt.c
  • +1 -1
    irssi/window.c
  • +1 -1
    lastseen/lastseen.c
  • +1 -1
    listhandler/listhandler.h
  • +1 -1
    mystatusbox/mystatusbox.c
  • +1 -1
    napster/napster.c
  • +1 -1
    nicksaid/nicksaid.c
  • +1 -1
    oldlogger/oldlogger.c
  • +1 -1
    schedule/schedule.h
  • +1 -1
    sepandtab/sepandtab.c
  • +1 -1
    showoffline/showoffline.c
  • +1 -1
    simfix/simfix.c
  • +1 -1
    slashexec/slashexec.c
  • +1 -1
    sslinfo/sslinfo.c
  • +1 -1
    stocker/stocker.c
  • +1 -1
    stocker/stocker_prefs.c
  • +1 -1
    switchspell/switchspell.c
  • +1 -1
    talkfilters/talkfilters.c
  • +1 -1
    xchat-chats/gaim-xchat.c
  • +1 -1
    xchat-chats/xchat-chats.c
    • --- a/album/album.h Thu Jul 05 02:33:18 2007 -0400
    +++ b/album/album.h Thu Jul 05 02:35:16 2007 -0400
    @@ -24,7 +24,7 @@
    #include <blist.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #define PLUGIN_STATIC_NAME "album"
    #define PLUGIN_ID "gtk-rlaager-" PLUGIN_STATIC_NAME
    --- a/autorejoin/autorejoin.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/autorejoin/autorejoin.c Thu Jul 05 02:35:16 2007 -0400
    @@ -41,7 +41,7 @@
    #include <version.h>
    /* Pack/Local headers */
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    static gboolean
    show_them(gpointer data)
    --- a/autoreply/autoreply.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/autoreply/autoreply.c Thu Jul 05 02:35:16 2007 -0400
    @@ -51,7 +51,7 @@
    #include <version.h>
    /* Plugin Pack Headers */
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #define PREFS_PREFIX "/plugins/core/" PLUGIN_ID
    #define PREFS_IDLE PREFS_PREFIX "/idle"
    --- a/awaynotify/awaynotify.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/awaynotify/awaynotify.c Thu Jul 05 02:35:16 2007 -0400
    @@ -21,7 +21,7 @@
    # include "../pp_config.h"
    #endif
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #define PURPLE_PLUGINS
    --- a/bash/bash.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/bash/bash.c Thu Jul 05 02:35:16 2007 -0400
    @@ -25,7 +25,7 @@
    # include "../pp_config.h"
    #endif
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    /* libc */
    #include <ctype.h>
    --- a/bit/bit.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/bit/bit.c Thu Jul 05 02:35:16 2007 -0400
    @@ -29,7 +29,7 @@
    #include <request.h>
    #include <version.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    PurplePlugin *bit = NULL; /* the request api prefers this for a plugin */
    static PurpleBuddyList *buddies = NULL;
    --- a/blistops/blistops.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/blistops/blistops.c Thu Jul 05 02:35:16 2007 -0400
    @@ -34,7 +34,7 @@
    #include <string.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #define PREF_MY "/plugins/gtk/amc_grim"
    #define PREF_ROOT "/plugins/gtk/amc_grim/blistops"
    --- a/broadcast/broadcast.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/broadcast/broadcast.c Thu Jul 05 02:35:16 2007 -0400
    @@ -29,7 +29,7 @@
    #include <util.h>
    #include <version.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #define BROADCAST_CATEGORY "plugin pack: broadcast"
    --- a/buddytime/buddytime.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/buddytime/buddytime.c Thu Jul 05 02:35:16 2007 -0400
    @@ -40,7 +40,7 @@
    #include <gtkplugin.h>
    #include <request.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    /******************************************************************************
    * Defines
    --- a/chronic/chronic.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/chronic/chronic.c Thu Jul 05 02:35:16 2007 -0400
    @@ -21,7 +21,7 @@
    # include "../pp_config.h"
    #endif /* HAVE_CONFIG_H */
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    /* libc */
    #include <string.h>
    --- a/common/Makefile.am Thu Jul 05 02:33:18 2007 -0400
    +++ b/common/Makefile.am Thu Jul 05 02:35:16 2007 -0400
    @@ -1,4 +1,4 @@
    EXTRA_DIST = \
    core-template.c \
    gtk-template.c \
    - i18n.h
    + pp_internal.h
    --- a/common/core-template.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/common/core-template.c Thu Jul 05 02:35:16 2007 -0400
    @@ -38,7 +38,7 @@
    #include <version.h>
    /* Pack/Local headers */
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    static gboolean
    plugin_load(PurplePlugin *plugin) {
    --- a/common/gtk-template.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/common/gtk-template.c Thu Jul 05 02:35:16 2007 -0400
    @@ -40,7 +40,7 @@
    #include <version.h>
    /* Pack/Local headers */
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    static gboolean
    plugin_load(PurplePlugin *plugin) {
    --- a/common/i18n.h Thu Jul 05 02:33:18 2007 -0400
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,46 +0,0 @@
    -/*
    - * Purple Plugin Pack
    - * Copyright (C) 2003-2005
    - * See AUTHORS for a list of all authors
    - *
    - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    - */
    -#ifndef PP_INTL_H
    -#define PP_INTL_H
    -
    -#ifdef HAVE_CONFIG_H
    -# include "../pp_config.h"
    -#endif
    -
    -#include <glib.h>
    -#if GLIB_CHECK_VERSION(2,4,0)
    -#include <glib/gi18n-lib.h>
    -#else
    -#include <locale.h>
    -#include <libintl.h>
    -#define _(String) dgettext (GETTEXT_PACKAGE, String)
    -#define Q_(String) g_strip_context ((String), dgettext (GETTEXT_PACKAGE, String))
    -#ifdef gettext_noop
    -#define N_(String) gettext_noop (String)
    -#else
    -#define N_(String) (String)
    -#endif
    -#endif
    -
    -#ifdef _WIN32
    -# include <win32dep.h>
    -#endif
    -
    -#endif /* PP_I18N_H */
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/common/pp_internal.h Thu Jul 05 02:35:16 2007 -0400
    @@ -0,0 +1,59 @@
    +/*
    + * Purple Plugin Pack
    + * Copyright (C) 2003-2005
    + * See AUTHORS for a list of all authors
    + *
    + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    + */
    +#ifndef PP_INTERNAL_H
    +#define PP_INTERNAL_H
    +
    +#ifdef HAVE_CONFIG_H
    +# include "../pp_config.h"
    +#endif
    +
    +#include <glib.h>
    +
    +/* This works around the lack of i18n support in old glib. Needed because
    + * we moved to using intltool and glib wrappings. */
    +#if GLIB_CHECK_VERSION(2,4,0)
    +# include <glib/gi18n-lib.h>
    +#else
    +# include <locale.h>
    +# include <libintl.h>
    +# define _(String) dgettext (GETTEXT_PACKAGE, String)
    +# define Q_(String) g_strip_context ((String), dgettext (GETTEXT_PACKAGE, String))
    +# ifdef gettext_noop
    +# define N_(String) gettext_noop (String)
    +# else
    +# define N_(String) (String)
    +# endif
    +#endif
    +
    +#ifdef _WIN32
    +# include <win32dep.h>
    +#endif
    +
    +/* This works around the lack of G_GNUC_NULL_TERMINATED in old glib and the
    + * lack of the NULL sentinel in GCC older than 4.0.0 and non-GCC compilers */
    +#ifndef G_GNUC_NULL_TERMINATED
    +# if __GNUC__ >= 4
    +# define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
    +# else
    +# define G_GNUC_NULL_TERMINATED
    +# endif
    +#endif
    +
    +#endif /* PP_INTERNAL_H */
    --- a/convbadger/convbadger.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/convbadger/convbadger.c Thu Jul 05 02:35:16 2007 -0400
    @@ -30,7 +30,7 @@
    #include <util.h>
    #include <version.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    static gboolean
    plugin_load(PurplePlugin *plugin) {
    --- a/dice/dice.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/dice/dice.c Thu Jul 05 02:35:16 2007 -0400
    @@ -33,7 +33,7 @@
    #include <plugin.h>
    #include <version.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    static PurpleCmdId dice_cmd_id = 0;
    --- a/difftopic/difftopic.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/difftopic/difftopic.c Thu Jul 05 02:35:16 2007 -0400
    @@ -46,7 +46,7 @@
    #include <gtkimhtml.h>
    /* Pack/Local headers */
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #define SAME(a,b) ((isalnum((a)) && isalnum((b))) || (!isalnum((a)) && !isalnum((b))))
    --- a/eight_ball/eight_ball.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/eight_ball/eight_ball.c Thu Jul 05 02:35:16 2007 -0400
    @@ -24,7 +24,7 @@
    # include "../pp_config.h"
    #endif
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    /* libc */
    #include <ctype.h>
    --- a/flip/flip.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/flip/flip.c Thu Jul 05 02:35:16 2007 -0400
    @@ -32,7 +32,7 @@
    #include <plugin.h>
    #include <version.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    static PurpleCmdId flip_cmd_id = 0;
    --- a/gRIM/gRIM.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/gRIM/gRIM.c Thu Jul 05 02:35:16 2007 -0400
    @@ -47,7 +47,7 @@
    #include <plugin.h>
    #include <version.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #if GLIB_CHECK_VERSION(2,6,0)
    #include <glib/gstdio.h>
    --- a/groupmsg/groupmsg.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/groupmsg/groupmsg.c Thu Jul 05 02:35:16 2007 -0400
    @@ -30,7 +30,7 @@
    #include <util.h>
    #include <version.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    static void
    dont_do_it_cb(GList *list, const char *text)
    --- a/hideconv/hideconv.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/hideconv/hideconv.c Thu Jul 05 02:35:16 2007 -0400
    @@ -40,7 +40,7 @@
    #include <version.h>
    /* Pack/Local headers */
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include <gtkconv.h>
    #include <gtkconvwin.h>
    --- a/highlight/highlight.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/highlight/highlight.c Thu Jul 05 02:35:16 2007 -0400
    @@ -38,7 +38,7 @@
    #include <string.h>
    /* Pack/Local headers */
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #define PREF_PREFIX "/plugins/core/highlight"
    #define PREF_WORDS PREF_PREFIX "/words"
    --- a/ignorance/ignorance.h Thu Jul 05 02:33:18 2007 -0400
    +++ b/ignorance/ignorance.h Thu Jul 05 02:35:16 2007 -0400
    @@ -21,7 +21,7 @@
    # include "../pp_config.h"
    #endif
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include "ignorance_level.h"
    --- a/ignorance/support.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/ignorance/support.c Thu Jul 05 02:35:16 2007 -0400
    @@ -18,7 +18,7 @@
    # include "../pp_config.h"
    #endif
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include <sys/types.h>
    #include <sys/stat.h>
    --- a/ignore/ignore.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/ignore/ignore.c Thu Jul 05 02:35:16 2007 -0400
    @@ -35,7 +35,7 @@
    #include <string.h>
    /* Pack/Local headers */
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #define PREF_ROOT "/plugins/ignore"
    --- a/irc-more/irc-more.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/irc-more/irc-more.c Thu Jul 05 02:35:16 2007 -0400
    @@ -32,7 +32,7 @@
    #include <string.h>
    /* Pack/Local headers */
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #define CTCP_REPLY purple_account_get_string(account, "ctcp-message", "Purple IRC")
    #define PART_MESSAGE purple_account_get_string(account, "part-message", "Leaving.")
    --- a/irchelper/irchelper.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/irchelper/irchelper.c Thu Jul 05 02:35:16 2007 -0400
    @@ -44,7 +44,7 @@
    #include <util.h>
    #include <version.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #define PLUGIN_STATIC_NAME "irchelper"
    #define PLUGIN_ID "core-rlaager-" PLUGIN_STATIC_NAME
    --- a/irssi/datechange.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/irssi/datechange.c Thu Jul 05 02:35:16 2007 -0400
    @@ -29,7 +29,7 @@
    #include <plugin.h>
    #include <cmds.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include "datechange.h"
    /******************************************************************************
    --- a/irssi/irssi.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/irssi/irssi.c Thu Jul 05 02:35:16 2007 -0400
    @@ -59,7 +59,7 @@
    #include "window.h"
    /* Pack/Local headers */
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    static gboolean
    irssi_load(PurplePlugin *plugin) {
    --- a/irssi/lastlog.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/irssi/lastlog.c Thu Jul 05 02:35:16 2007 -0400
    @@ -33,7 +33,7 @@
    #include <gtkconv.h>
    #include <gtkimhtml.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include "lastlog.h"
    /******************************************************************************
    --- a/irssi/layout.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/irssi/layout.c Thu Jul 05 02:35:16 2007 -0400
    @@ -31,7 +31,7 @@
    #include <gtkblist.h>
    #include <gtkconv.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include "layout.h"
    #define IRSSI_LAYOUT_SETTING "irssi::layout"
    --- a/irssi/textfmt.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/irssi/textfmt.c Thu Jul 05 02:35:16 2007 -0400
    @@ -31,7 +31,7 @@
    #include <plugin.h>
    #include <cmds.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include "textfmt.h"
    /******************************************************************************
    --- a/irssi/window.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/irssi/window.c Thu Jul 05 02:35:16 2007 -0400
    @@ -32,7 +32,7 @@
    #include <gtkconv.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include "window.h"
    /******************************************************************************
    --- a/lastseen/lastseen.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/lastseen/lastseen.c Thu Jul 05 02:35:16 2007 -0400
    @@ -32,7 +32,7 @@
    #include <gtkplugin.h>
    #include <gtkblist.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    /* global list of accounts connecting, to avoid inaccurate signon times
    * idea stolen from guifications :) - thanks Gary.
    --- a/listhandler/listhandler.h Thu Jul 05 02:33:18 2007 -0400
    +++ b/listhandler/listhandler.h Thu Jul 05 02:35:16 2007 -0400
    @@ -40,7 +40,7 @@
    #include <version.h>
    #include <xmlnode.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include "lh_util.h"
    --- a/mystatusbox/mystatusbox.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/mystatusbox/mystatusbox.c Thu Jul 05 02:35:16 2007 -0400
    @@ -52,7 +52,7 @@
    #include <gtkstatusbox.h>
    /* Pack/Local headers */
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    /* XXX: THIS NEEDS CHANGED WHEN PIDGIN DOES ITS PREFS MIGRATION!!!!! */
    #define PREF_PREFIX "/plugins/gtk/" PLUGIN_ID
    --- a/napster/napster.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/napster/napster.c Thu Jul 05 02:35:16 2007 -0400
    @@ -43,7 +43,7 @@
    #include <string.h>
    #include <unistd.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #define NAP_SERVER "64.124.41.187"
    #define NAP_PORT 8888
    --- a/nicksaid/nicksaid.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/nicksaid/nicksaid.c Thu Jul 05 02:35:16 2007 -0400
    @@ -58,7 +58,7 @@
    #include <gtkutils.h>
    /* Pack/Local headers */
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #define DELIMS " .,;|<>?/\\`~!@#$%^&*()_-+={}[]:'\""
    --- a/oldlogger/oldlogger.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/oldlogger/oldlogger.c Thu Jul 05 02:35:16 2007 -0400
    @@ -38,7 +38,7 @@
    #include <util.h>
    #include <version.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include <glib.h>
    --- a/schedule/schedule.h Thu Jul 05 02:33:18 2007 -0400
    +++ b/schedule/schedule.h Thu Jul 05 02:35:16 2007 -0400
    @@ -25,7 +25,7 @@
    #include <glib.h>
    /* Pack/Local headers */
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include <account.h>
    #include <debug.h>
    --- a/sepandtab/sepandtab.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/sepandtab/sepandtab.c Thu Jul 05 02:35:16 2007 -0400
    @@ -34,7 +34,7 @@
    #include <gtkconv.h>
    #include <gtkconvwin.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #define SEPANDTAB_PREF "/pidgin/conversations/placement"
    --- a/showoffline/showoffline.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/showoffline/showoffline.c Thu Jul 05 02:35:16 2007 -0400
    @@ -29,7 +29,7 @@
    #include <util.h>
    #include <version.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    static void
    showoffline_cb(PurpleBlistNode *node, gpointer data)
    --- a/simfix/simfix.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/simfix/simfix.c Thu Jul 05 02:35:16 2007 -0400
    @@ -30,7 +30,7 @@
    #include <util.h>
    #include <version.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    static gboolean
    receiving_im_msg_cb(PurpleAccount *account, char **sender, char **message,
    --- a/slashexec/slashexec.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/slashexec/slashexec.c Thu Jul 05 02:35:16 2007 -0400
    @@ -30,7 +30,7 @@
    # include "../pp_config.h"
    #endif
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include <glib.h>
    #include <stdarg.h>
    --- a/sslinfo/sslinfo.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/sslinfo/sslinfo.c Thu Jul 05 02:35:16 2007 -0400
    @@ -29,7 +29,7 @@
    #include <plugin.h>
    #include <version.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    static PurplePlugin *my_plugin = NULL;
    --- a/stocker/stocker.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/stocker/stocker.c Thu Jul 05 02:35:16 2007 -0400
    @@ -33,7 +33,7 @@
    #include <prefs.h>
    #include <version.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include "gtkticker.h"
    #include "stocker_prefs.h"
    --- a/stocker/stocker_prefs.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/stocker/stocker_prefs.c Thu Jul 05 02:35:16 2007 -0400
    @@ -22,7 +22,7 @@
    #endif
    #include "stocker_prefs.h"
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include <gtkprefs.h>
    #include <gtkutils.h>
    --- a/switchspell/switchspell.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/switchspell/switchspell.c Thu Jul 05 02:35:16 2007 -0400
    @@ -45,7 +45,7 @@
    #include <gtkplugin.h>
    /* Pack/Local headers */
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include <aspell.h>
    #include <gtkspell/gtkspell.h>
    --- a/talkfilters/talkfilters.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/talkfilters/talkfilters.c Thu Jul 05 02:35:16 2007 -0400
    @@ -42,7 +42,7 @@
    #include <gtkplugin.h>
    #include <gtkutils.h>
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include <talkfilters.h>
    --- a/xchat-chats/gaim-xchat.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/xchat-chats/gaim-xchat.c Thu Jul 05 02:35:16 2007 -0400
    @@ -51,7 +51,7 @@
    #include <version.h>
    /* Pack/Local headers */
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include "xtext.h"
    --- a/xchat-chats/xchat-chats.c Thu Jul 05 02:33:18 2007 -0400
    +++ b/xchat-chats/xchat-chats.c Thu Jul 05 02:35:16 2007 -0400
    @@ -51,7 +51,7 @@
    #include <version.h>
    /* Pack/Local headers */
    -#include "../common/i18n.h"
    +#include "../common/pp_internal.h"
    #include "xtext.h"