pidgin/purple-plugin-pack

This should fix compiling on Win32 and other systems without GCC 4.x.
org.guifications.plugins
2007-07-30, rekkanoryo
cf259019f376
Parents fe538da50053
Children c738bd81d450
This should fix compiling on Win32 and other systems without GCC 4.x.
This also will turn off a feature I forgot I started but never finished
in the sepandtab plugin.
22 files changed, 57 insertions(+), 50 deletions(-)
  • +3 -3
    hideconv/hideconv.c
  • +3 -3
    highlight/highlight.c
  • +3 -3
    ignore/ignore.c
  • +3 -3
    irc-more/irc-more.c
  • +2 -2
    irchelper/irchelper.c
  • +3 -3
    irssi/irssi.c
  • +2 -2
    lastseen/lastseen.c
  • +2 -2
    listhandler/listhandler.h
  • +3 -3
    mystatusbox/mystatusbox.c
  • +2 -2
    napster/napster.c
  • +3 -3
    nicksaid/nicksaid.c
  • +2 -2
    oldlogger/oldlogger.c
  • +2 -0
    schedule/pidgin-schedule.c
  • +6 -2
    sepandtab/sepandtab.c
  • +2 -2
    showoffline/showoffline.c
  • +2 -2
    simfix/simfix.c
  • +2 -2
    sslinfo/sslinfo.c
  • +2 -2
    stocker/stocker.c
  • +3 -3
    switchspell/switchspell.c
  • +2 -2
    talkfilters/talkfilters.c
  • +3 -4
    xchat-chats/xchat-chats.c
  • +2 -0
    xmmsremote/xmmsremote.c
    • --- a/hideconv/hideconv.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/hideconv/hideconv.c Mon Jul 30 05:02:05 2007 -0400
    @@ -35,13 +35,13 @@
    #include <glib.h>
    #include <gtk/gtk.h>
    +/* Pack/Local headers */
    +#include "../common/pp_internal.h"
    +
    /* Purple headers */
    #include <gtkplugin.h>
    #include <version.h>
    -/* Pack/Local headers */
    -#include "../common/pp_internal.h"
    -
    #include <gtkconv.h>
    #include <gtkconvwin.h>
    #include <gtkutils.h>
    --- a/highlight/highlight.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/highlight/highlight.c Mon Jul 30 05:02:05 2007 -0400
    @@ -24,6 +24,9 @@
    #define PURPLE_PLUGINS
    +/* Pack/Local headers */
    +#include "../common/pp_internal.h"
    +
    #include <plugin.h>
    #include <account.h>
    @@ -37,9 +40,6 @@
    #include <string.h>
    -/* Pack/Local headers */
    -#include "../common/pp_internal.h"
    -
    #define PREF_PREFIX "/plugins/core/highlight"
    #define PREF_WORDS PREF_PREFIX "/words"
    --- a/ignore/ignore.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/ignore/ignore.c Mon Jul 30 05:02:05 2007 -0400
    @@ -24,6 +24,9 @@
    #define PURPLE_PLUGINS
    +/* Pack/Local headers */
    +#include "../common/pp_internal.h"
    +
    #include <plugin.h>
    #include <account.h>
    @@ -34,9 +37,6 @@
    #include <version.h>
    #include <string.h>
    -/* Pack/Local headers */
    -#include "../common/pp_internal.h"
    -
    #define PREF_ROOT "/plugins/ignore"
    static PurpleCmdId cmd;
    --- a/irc-more/irc-more.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/irc-more/irc-more.c Mon Jul 30 05:02:05 2007 -0400
    @@ -24,6 +24,9 @@
    #define PURPLE_PLUGINS
    +/* Pack/Local headers */
    +#include "../common/pp_internal.h"
    +
    #include <cmds.h>
    #include <plugin.h>
    #include <accountopt.h>
    @@ -32,9 +35,6 @@
    #include <string.h>
    -/* Pack/Local headers */
    -#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.")
    #define QUIT_MESSAGE purple_account_get_string(account, "quit-message", "Leaving.")
    --- a/irchelper/irchelper.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/irchelper/irchelper.c Mon Jul 30 05:02:05 2007 -0400
    @@ -31,6 +31,8 @@
    #define PURPLE_PLUGINS
    #endif
    +#include "../common/pp_internal.h"
    +
    #include <account.h>
    #include <accountopt.h>
    #include <cmds.h>
    @@ -44,8 +46,6 @@
    #include <util.h>
    #include <version.h>
    -#include "../common/pp_internal.h"
    -
    #define PLUGIN_STATIC_NAME "irchelper"
    #define PLUGIN_ID "core-rlaager-" PLUGIN_STATIC_NAME
    --- a/irssi/irssi.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/irssi/irssi.c Mon Jul 30 05:02:05 2007 -0400
    @@ -46,6 +46,9 @@
    /* System headers */
    #include <glib.h>
    +/* Pack/Local headers */
    +#include "../common/pp_internal.h"
    +
    /* Purple headers */
    #include <gtkplugin.h>
    #include <plugin.h>
    @@ -58,9 +61,6 @@
    #include "textfmt.h"
    #include "window.h"
    -/* Pack/Local headers */
    -#include "../common/pp_internal.h"
    -
    static gboolean
    irssi_load(PurplePlugin *plugin) {
    irssi_datechange_init(plugin);
    --- a/lastseen/lastseen.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/lastseen/lastseen.c Mon Jul 30 05:02:05 2007 -0400
    @@ -22,6 +22,8 @@
    #define PURPLE_PLUGINS
    +#include "../common/pp_internal.h"
    +
    #include <plugin.h>
    #include <debug.h>
    #include <blist.h>
    @@ -32,8 +34,6 @@
    #include <gtkplugin.h>
    #include <gtkblist.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 Mon Jul 30 04:23:03 2007 -0400
    +++ b/listhandler/listhandler.h Mon Jul 30 05:02:05 2007 -0400
    @@ -31,6 +31,8 @@
    /* this has to be defined for the plugin to work properly */
    #define PURPLE_PLUGINS
    +#include "../common/pp_internal.h"
    +
    /* Purple headers */
    #include <account.h>
    #include <blist.h>
    @@ -40,8 +42,6 @@
    #include <version.h>
    #include <xmlnode.h>
    -#include "../common/pp_internal.h"
    -
    #include "lh_util.h"
    /* we send this to the request API so it is probably a good idea to make sure
    --- a/mystatusbox/mystatusbox.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/mystatusbox/mystatusbox.c Mon Jul 30 05:02:05 2007 -0400
    @@ -39,6 +39,9 @@
    #include <glib.h>
    #include <gtk/gtk.h>
    +/* Pack/Local headers */
    +#include "../common/pp_internal.h"
    +
    /* Purple headers */
    #include <version.h>
    @@ -51,9 +54,6 @@
    #include <gtkplugin.h>
    #include <gtkstatusbox.h>
    -/* Pack/Local headers */
    -#include "../common/pp_internal.h"
    -
    /* XXX: THIS NEEDS CHANGED WHEN PIDGIN DOES ITS PREFS MIGRATION!!!!! */
    #define PREF_PREFIX "/plugins/gtk/" PLUGIN_ID
    #define PREF_PANE PREF_PREFIX "/pane"
    --- a/napster/napster.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/napster/napster.c Mon Jul 30 05:02:05 2007 -0400
    @@ -27,6 +27,8 @@
    #define PURPLE_PLUGINS
    +#include "../common/pp_internal.h"
    +
    #include "account.h"
    #include "accountopt.h"
    #include "blist.h"
    @@ -43,8 +45,6 @@
    #include <string.h>
    #include <unistd.h>
    -#include "../common/pp_internal.h"
    -
    #define NAP_SERVER "64.124.41.187"
    #define NAP_PORT 8888
    --- a/nicksaid/nicksaid.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/nicksaid/nicksaid.c Mon Jul 30 05:02:05 2007 -0400
    @@ -44,6 +44,9 @@
    #include <glib.h>
    #include <gtk/gtk.h>
    +/* Pack/Local headers */
    +#include "../common/pp_internal.h"
    +
    /* Purple headers */
    #include <gtkplugin.h>
    #include <version.h>
    @@ -57,9 +60,6 @@
    #include <pidginstock.h>
    #include <gtkutils.h>
    -/* Pack/Local headers */
    -#include "../common/pp_internal.h"
    -
    #define DELIMS " .,;|<>?/\\`~!@#$%^&*()_-+={}[]:'\""
    static GList *hlwords = NULL; /* Words to highlight on */
    --- a/oldlogger/oldlogger.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/oldlogger/oldlogger.c Mon Jul 30 05:02:05 2007 -0400
    @@ -29,6 +29,8 @@
    #include <sys/stat.h>
    #include <unistd.h>
    +#include "../common/pp_internal.h"
    +
    #include <account.h>
    #include <debug.h>
    #include <log.h>
    @@ -38,8 +40,6 @@
    #include <util.h>
    #include <version.h>
    -#include "../common/pp_internal.h"
    -
    #include <glib.h>
    /* We want to use the gstdio functions when possible so that non-ASCII
    --- a/schedule/pidgin-schedule.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/schedule/pidgin-schedule.c Mon Jul 30 05:02:05 2007 -0400
    @@ -23,6 +23,8 @@
    #define PURPLE_PLUGINS
    +#include "../common/pp_internal.h"
    +
    #define PLUGIN_ID "gtk-schedule"
    #define PLUGIN_NAME "Purple Schedule"
    #define PLUGIN_STATIC_NAME "Purple Schedule"
    --- a/sepandtab/sepandtab.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/sepandtab/sepandtab.c Mon Jul 30 05:02:05 2007 -0400
    @@ -26,6 +26,8 @@
    #define PURPLE_PLUGINS
    +#include "../common/pp_internal.h"
    +
    #include <conversation.h>
    #include <plugin.h>
    #include <pidgin.h>
    @@ -34,8 +36,6 @@
    #include <gtkconv.h>
    #include <gtkconvwin.h>
    -#include "../common/pp_internal.h"
    -
    #define SEPANDTAB_PREF "/pidgin/conversations/placement"
    @@ -83,9 +83,11 @@
    }
    }
    +#if 0
    static void
    conv_placement_grp_type_sep_prpl(PidginConversation *conv) {
    }
    +#endif
    static gboolean
    plugin_load(PurplePlugin *plugin) {
    @@ -93,8 +95,10 @@
    &conv_placement_sep_ims_tab_chats);
    pidgin_conv_placement_add_fnc("sep-chats-tab-ims", _("Separate Chats, group IMs"),
    &conv_placement_sep_chats_tab_ims);
    +#if 0
    pidgin_conv_placement_add_fnc("grp-type-sep-prpl", _("Group by Type, Separate by Protocol"),
    &conv_placement_grp_type_sep_prpl);
    +#endif
    purple_prefs_trigger_callback(SEPANDTAB_PREF);
    return TRUE;
    --- a/showoffline/showoffline.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/showoffline/showoffline.c Mon Jul 30 05:02:05 2007 -0400
    @@ -22,6 +22,8 @@
    #define PURPLE_PLUGINS
    +#include "../common/pp_internal.h"
    +
    #include <debug.h>
    #include <notify.h>
    #include <request.h>
    @@ -29,8 +31,6 @@
    #include <util.h>
    #include <version.h>
    -#include "../common/pp_internal.h"
    -
    static void
    showoffline_cb(PurpleBlistNode *node, gpointer data)
    {
    --- a/simfix/simfix.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/simfix/simfix.c Mon Jul 30 05:02:05 2007 -0400
    @@ -23,6 +23,8 @@
    #define PURPLE_PLUGINS
    +#include "../common/pp_internal.h"
    +
    #include <plugin.h>
    #include <debug.h>
    #include <blist.h>
    @@ -30,8 +32,6 @@
    #include <util.h>
    #include <version.h>
    -#include "../common/pp_internal.h"
    -
    static gboolean
    receiving_im_msg_cb(PurpleAccount *account, char **sender, char **message,
    PurpleConversation *conv, int *flags, void *data)
    --- a/sslinfo/sslinfo.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/sslinfo/sslinfo.c Mon Jul 30 05:02:05 2007 -0400
    @@ -22,6 +22,8 @@
    #define PURPLE_PLUGINS
    +#include "../common/pp_internal.h"
    +
    #include <glib.h>
    #include <string.h>
    @@ -29,8 +31,6 @@
    #include <plugin.h>
    #include <version.h>
    -#include "../common/pp_internal.h"
    -
    static PurplePlugin *my_plugin = NULL;
    static PurplePlugin *
    --- a/stocker/stocker.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/stocker/stocker.c Mon Jul 30 05:02:05 2007 -0400
    @@ -26,6 +26,8 @@
    #define PURPLE_PLUGINS
    +#include "../common/pp_internal.h"
    +
    #include <gtkplugin.h>
    #include <gtkprefs.h>
    #include <gtkblist.h>
    @@ -33,8 +35,6 @@
    #include <prefs.h>
    #include <version.h>
    -#include "../common/pp_internal.h"
    -
    #include "gtkticker.h"
    #include "stocker_prefs.h"
    --- a/switchspell/switchspell.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/switchspell/switchspell.c Mon Jul 30 05:02:05 2007 -0400
    @@ -34,6 +34,9 @@
    /* System headers */
    #include <glib.h>
    +/* Pack/Local headers */
    +#include "../common/pp_internal.h"
    +
    /* Purple headers */
    #include <plugin.h>
    #include <version.h>
    @@ -44,9 +47,6 @@
    #include <gtkconv.h>
    #include <gtkplugin.h>
    -/* Pack/Local headers */
    -#include "../common/pp_internal.h"
    -
    #include <aspell.h>
    #include <gtkspell/gtkspell.h>
    #include <string.h>
    --- a/talkfilters/talkfilters.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/talkfilters/talkfilters.c Mon Jul 30 05:02:05 2007 -0400
    @@ -34,6 +34,8 @@
    #include <sys/types.h>
    #include <sys/stat.h>
    +#include "../common/pp_internal.h"
    +
    #include <debug.h>
    #include <signals.h>
    #include <util.h>
    @@ -42,8 +44,6 @@
    #include <gtkplugin.h>
    #include <gtkutils.h>
    -#include "../common/pp_internal.h"
    -
    #include <talkfilters.h>
    #define PREF_PREFIX "/plugins/gtk/bleeter/talkfilters"
    --- a/xchat-chats/xchat-chats.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/xchat-chats/xchat-chats.c Mon Jul 30 05:02:05 2007 -0400
    @@ -40,8 +40,10 @@
    #include <glib.h>
    #include <gtk/gtk.h>
    +/* Pack/Local headers */
    +#include "../common/pp_internal.h"
    +
    /* Purple headers */
    -
    #include <conversation.h>
    #include <gtkconv.h>
    @@ -50,9 +52,6 @@
    #include <gtkplugin.h>
    #include <version.h>
    -/* Pack/Local headers */
    -#include "../common/pp_internal.h"
    -
    #include "xtext.h"
    static PurpleConversationUiOps *uiops = NULL;
    --- a/xmmsremote/xmmsremote.c Mon Jul 30 04:23:03 2007 -0400
    +++ b/xmmsremote/xmmsremote.c Mon Jul 30 05:02:05 2007 -0400
    @@ -30,6 +30,8 @@
    #define PURPLE_PLUGINS
    +#include "../common/pp_internal.h"
    +
    #include <cmds.h>
    #include <conversation.h>
    #include <debug.h>