pidgin/purple-plugin-pack
Clone
Renaming i18n.h to pp_internal.h to use it for any compatibility stuff we
may need, such as the added G_GNUC_NULL_TERMINATED workaround for the NULL
sentinel that was added to libpurple.
Fixed some indentation issues in pp_internal.h so it's easier to follow
what preproc directives are nested where.
Updated all source files and Makefile.am's to match the header rename.
--- a/album/album.h Sat Jun 30 18:39:20 2007 -0400
+++ b/album/album.h Wed Jul 04 21:05:51 2007 -0400
@@ -24,7 +24,7 @@
-#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 Sat Jun 30 18:39:20 2007 -0400
+++ b/autorejoin/autorejoin.c Wed Jul 04 21:05:51 2007 -0400
@@ -41,7 +41,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" --- a/autoreply/autoreply.c Sat Jun 30 18:39:20 2007 -0400
+++ b/autoreply/autoreply.c Wed Jul 04 21:05:51 2007 -0400
@@ -51,7 +51,7 @@
/* 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 Sat Jun 30 18:39:20 2007 -0400
+++ b/awaynotify/awaynotify.c Wed Jul 04 21:05:51 2007 -0400
@@ -21,7 +21,7 @@
# include "../pp_config.h"
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" --- a/bash/bash.c Sat Jun 30 18:39:20 2007 -0400
+++ b/bash/bash.c Wed Jul 04 21:05:51 2007 -0400
@@ -25,7 +25,7 @@
# include "../pp_config.h"
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" --- a/bit/bit.c Sat Jun 30 18:39:20 2007 -0400
+++ b/bit/bit.c Wed Jul 04 21:05:51 2007 -0400
@@ -29,7 +29,7 @@
-#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 Sat Jun 30 18:39:20 2007 -0400
+++ b/blistops/blistops.c Wed Jul 04 21:05:51 2007 -0400
@@ -34,7 +34,7 @@
-#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 Sat Jun 30 18:39:20 2007 -0400
+++ b/broadcast/broadcast.c Wed Jul 04 21:05:51 2007 -0400
@@ -29,7 +29,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" #define BROADCAST_CATEGORY "plugin pack: broadcast"
--- a/buddytime/buddytime.c Sat Jun 30 18:39:20 2007 -0400
+++ b/buddytime/buddytime.c Wed Jul 04 21:05:51 2007 -0400
@@ -40,7 +40,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" /******************************************************************************
--- a/chronic/chronic.c Sat Jun 30 18:39:20 2007 -0400
+++ b/chronic/chronic.c Wed Jul 04 21:05:51 2007 -0400
@@ -21,7 +21,7 @@
# include "../pp_config.h"
#endif /* HAVE_CONFIG_H */
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" --- a/common/Makefile.am Sat Jun 30 18:39:20 2007 -0400
+++ b/common/Makefile.am Wed Jul 04 21:05:51 2007 -0400
@@ -1,4 +1,4 @@
--- a/common/core-template.c Sat Jun 30 18:39:20 2007 -0400
+++ b/common/core-template.c Wed Jul 04 21:05:51 2007 -0400
@@ -38,7 +38,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" plugin_load(PurplePlugin *plugin) {
--- a/common/gtk-template.c Sat Jun 30 18:39:20 2007 -0400
+++ b/common/gtk-template.c Wed Jul 04 21:05:51 2007 -0400
@@ -40,7 +40,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" plugin_load(PurplePlugin *plugin) {
--- a/common/i18n.h Sat Jun 30 18:39:20 2007 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
- * 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.
-# include "../pp_config.h"
-#if GLIB_CHECK_VERSION(2,4,0)
-#include <glib/gi18n-lib.h>
-#define _(String) dgettext (GETTEXT_PACKAGE, String)
-#define Q_(String) g_strip_context ((String), dgettext (GETTEXT_PACKAGE, String))
-#define N_(String) gettext_noop (String)
-#define N_(String) (String)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/pp_internal.h Wed Jul 04 21:05:51 2007 -0400
@@ -0,0 +1,59 @@
+ * 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. +# include "../pp_config.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> +# define _(String) dgettext (GETTEXT_PACKAGE, String) +# define Q_(String) g_strip_context ((String), dgettext (GETTEXT_PACKAGE, String)) +# define N_(String) gettext_noop (String) +# define N_(String) (String) +/* 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 +# define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) +# define G_GNUC_NULL_TERMINATED +#endif /* PP_INTERNAL_H */ --- a/convbadger/convbadger.c Sat Jun 30 18:39:20 2007 -0400
+++ b/convbadger/convbadger.c Wed Jul 04 21:05:51 2007 -0400
@@ -30,7 +30,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" plugin_load(PurplePlugin *plugin) {
--- a/dice/dice.c Sat Jun 30 18:39:20 2007 -0400
+++ b/dice/dice.c Wed Jul 04 21:05:51 2007 -0400
@@ -33,7 +33,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" static PurpleCmdId dice_cmd_id = 0;
--- a/difftopic/difftopic.c Sat Jun 30 18:39:20 2007 -0400
+++ b/difftopic/difftopic.c Wed Jul 04 21:05:51 2007 -0400
@@ -46,7 +46,7 @@
-#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 Sat Jun 30 18:39:20 2007 -0400
+++ b/eight_ball/eight_ball.c Wed Jul 04 21:05:51 2007 -0400
@@ -24,7 +24,7 @@
# include "../pp_config.h"
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" --- a/flip/flip.c Sat Jun 30 18:39:20 2007 -0400
+++ b/flip/flip.c Wed Jul 04 21:05:51 2007 -0400
@@ -32,7 +32,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" static PurpleCmdId flip_cmd_id = 0;
--- a/gRIM/gRIM.c Sat Jun 30 18:39:20 2007 -0400
+++ b/gRIM/gRIM.c Wed Jul 04 21:05:51 2007 -0400
@@ -47,7 +47,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" #if GLIB_CHECK_VERSION(2,6,0)
--- a/groupmsg/groupmsg.c Sat Jun 30 18:39:20 2007 -0400
+++ b/groupmsg/groupmsg.c Wed Jul 04 21:05:51 2007 -0400
@@ -30,7 +30,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" dont_do_it_cb(GList *list, const char *text)
--- a/hideconv/hideconv.c Sat Jun 30 18:39:20 2007 -0400
+++ b/hideconv/hideconv.c Wed Jul 04 21:05:51 2007 -0400
@@ -40,7 +40,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" --- a/highlight/highlight.c Sat Jun 30 18:39:20 2007 -0400
+++ b/highlight/highlight.c Wed Jul 04 21:05:51 2007 -0400
@@ -38,7 +38,7 @@
-#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 Sat Jun 30 18:39:20 2007 -0400
+++ b/ignorance/ignorance.h Wed Jul 04 21:05:51 2007 -0400
@@ -21,7 +21,7 @@
# include "../pp_config.h"
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" #include "ignorance_level.h"
--- a/ignorance/support.c Sat Jun 30 18:39:20 2007 -0400
+++ b/ignorance/support.c Wed Jul 04 21:05:51 2007 -0400
@@ -18,7 +18,7 @@
# include "../pp_config.h"
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" --- a/ignore/ignore.c Sat Jun 30 18:39:20 2007 -0400
+++ b/ignore/ignore.c Wed Jul 04 21:05:51 2007 -0400
@@ -35,7 +35,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" #define PREF_ROOT "/plugins/ignore"
--- a/irc-more/irc-more.c Sat Jun 30 18:39:20 2007 -0400
+++ b/irc-more/irc-more.c Wed Jul 04 21:05:51 2007 -0400
@@ -32,7 +32,7 @@
-#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 Sat Jun 30 18:39:20 2007 -0400
+++ b/irchelper/irchelper.c Wed Jul 04 21:05:51 2007 -0400
@@ -44,7 +44,7 @@
-#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 Sat Jun 30 18:39:20 2007 -0400
+++ b/irssi/datechange.c Wed Jul 04 21:05:51 2007 -0400
@@ -29,7 +29,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" /******************************************************************************
--- a/irssi/irssi.c Sat Jun 30 18:39:20 2007 -0400
+++ b/irssi/irssi.c Wed Jul 04 21:05:51 2007 -0400
@@ -59,7 +59,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" irssi_load(PurplePlugin *plugin) {
--- a/irssi/lastlog.c Sat Jun 30 18:39:20 2007 -0400
+++ b/irssi/lastlog.c Wed Jul 04 21:05:51 2007 -0400
@@ -33,7 +33,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" /******************************************************************************
--- a/irssi/layout.c Sat Jun 30 18:39:20 2007 -0400
+++ b/irssi/layout.c Wed Jul 04 21:05:51 2007 -0400
@@ -31,7 +31,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" #define IRSSI_LAYOUT_SETTING "irssi::layout"
--- a/irssi/textfmt.c Sat Jun 30 18:39:20 2007 -0400
+++ b/irssi/textfmt.c Wed Jul 04 21:05:51 2007 -0400
@@ -31,7 +31,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" /******************************************************************************
--- a/irssi/window.c Sat Jun 30 18:39:20 2007 -0400
+++ b/irssi/window.c Wed Jul 04 21:05:51 2007 -0400
@@ -32,7 +32,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" /******************************************************************************
--- a/lastseen/lastseen.c Sat Jun 30 18:39:20 2007 -0400
+++ b/lastseen/lastseen.c Wed Jul 04 21:05:51 2007 -0400
@@ -32,7 +32,7 @@
-#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 Sat Jun 30 18:39:20 2007 -0400
+++ b/listhandler/listhandler.h Wed Jul 04 21:05:51 2007 -0400
@@ -40,7 +40,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" --- a/mystatusbox/mystatusbox.c Sat Jun 30 18:39:20 2007 -0400
+++ b/mystatusbox/mystatusbox.c Wed Jul 04 21:05:51 2007 -0400
@@ -52,7 +52,7 @@
#include <gtkstatusbox.h>
-#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 Sat Jun 30 18:39:20 2007 -0400
+++ b/napster/napster.c Wed Jul 04 21:05:51 2007 -0400
@@ -43,7 +43,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" #define NAP_SERVER "64.124.41.187"
--- a/nicksaid/nicksaid.c Sat Jun 30 18:39:20 2007 -0400
+++ b/nicksaid/nicksaid.c Wed Jul 04 21:05:51 2007 -0400
@@ -58,7 +58,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" #define DELIMS " .,;|<>?/\\`~!@#$%^&*()_-+={}[]:'\""
--- a/oldlogger/oldlogger.c Sat Jun 30 18:39:20 2007 -0400
+++ b/oldlogger/oldlogger.c Wed Jul 04 21:05:51 2007 -0400
@@ -38,7 +38,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" --- a/schedule/schedule.h Sat Jun 30 18:39:20 2007 -0400
+++ b/schedule/schedule.h Wed Jul 04 21:05:51 2007 -0400
@@ -25,7 +25,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" --- a/sepandtab/sepandtab.c Sat Jun 30 18:39:20 2007 -0400
+++ b/sepandtab/sepandtab.c Wed Jul 04 21:05:51 2007 -0400
@@ -34,7 +34,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" #define SEPANDTAB_PREF "/pidgin/conversations/placement"
--- a/showoffline/showoffline.c Sat Jun 30 18:39:20 2007 -0400
+++ b/showoffline/showoffline.c Wed Jul 04 21:05:51 2007 -0400
@@ -29,7 +29,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" showoffline_cb(PurpleBlistNode *node, gpointer data)
--- a/simfix/simfix.c Sat Jun 30 18:39:20 2007 -0400
+++ b/simfix/simfix.c Wed Jul 04 21:05:51 2007 -0400
@@ -30,7 +30,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" receiving_im_msg_cb(PurpleAccount *account, char **sender, char **message,
--- a/slashexec/slashexec.c Sat Jun 30 18:39:20 2007 -0400
+++ b/slashexec/slashexec.c Wed Jul 04 21:05:51 2007 -0400
@@ -30,7 +30,7 @@
# include "../pp_config.h"
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" --- a/sslinfo/sslinfo.c Sat Jun 30 18:39:20 2007 -0400
+++ b/sslinfo/sslinfo.c Wed Jul 04 21:05:51 2007 -0400
@@ -29,7 +29,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" static PurplePlugin *my_plugin = NULL;
--- a/stocker/stocker.c Sat Jun 30 18:39:20 2007 -0400
+++ b/stocker/stocker.c Wed Jul 04 21:05:51 2007 -0400
@@ -33,7 +33,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" #include "stocker_prefs.h"
--- a/stocker/stocker_prefs.c Sat Jun 30 18:39:20 2007 -0400
+++ b/stocker/stocker_prefs.c Wed Jul 04 21:05:51 2007 -0400
@@ -22,7 +22,7 @@
#include "stocker_prefs.h"
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" --- a/switchspell/switchspell.c Sat Jun 30 18:39:20 2007 -0400
+++ b/switchspell/switchspell.c Wed Jul 04 21:05:51 2007 -0400
@@ -45,7 +45,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" #include <gtkspell/gtkspell.h>
--- a/talkfilters/talkfilters.c Sat Jun 30 18:39:20 2007 -0400
+++ b/talkfilters/talkfilters.c Wed Jul 04 21:05:51 2007 -0400
@@ -42,7 +42,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" --- a/xchat-chats/gaim-xchat.c Sat Jun 30 18:39:20 2007 -0400
+++ b/xchat-chats/gaim-xchat.c Wed Jul 04 21:05:51 2007 -0400
@@ -51,7 +51,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h" --- a/xchat-chats/xchat-chats.c Sat Jun 30 18:39:20 2007 -0400
+++ b/xchat-chats/xchat-chats.c Wed Jul 04 21:05:51 2007 -0400
@@ -51,7 +51,7 @@
-#include "../common/i18n.h"
+#include "../common/pp_internal.h"