Revision 9764e45cdc34f5eea027659463336d4bcb81e5c0
faceprint at pidgin.im
faceprint at pidgin.im
Wed Apr 11 01:15:39 EDT 2007
o -----------------------------------------------------------------
| Revision: 9764e45cdc34f5eea027659463336d4bcb81e5c0
| Ancestor: 84ed68a77e223f83d7891347c70e18519423e96b
| Author: faceprint
| Date: 2004-09-03T21:34:21
| Branch: im.pidgin.gaim.oldstatus
|
| Modified files:
| VERSION configure.ac plugins/autorecon.c
| plugins/docklet/docklet.c plugins/extplacement.c
| plugins/gaim-remote/remote.c plugins/gestures/gestures.c
| plugins/history.c plugins/iconaway.c plugins/idle.c
| plugins/notify.c plugins/perl/perl.c plugins/relnot.c
| plugins/spellchk.c plugins/ssl/ssl-gnutls.c
| plugins/ssl/ssl-nss.c plugins/ssl/ssl.c
| plugins/statenotify.c plugins/tcl/tcl.c
| plugins/ticker/ticker.c plugins/timestamp.c src/plugin.c
| src/plugin.h src/protocols/gg/gg.c src/protocols/irc/irc.c
| src/protocols/jabber/jabber.c src/protocols/msn/msn.c
| src/protocols/napster/napster.c
| src/protocols/novell/novell.c src/protocols/oscar/oscar.c
| src/protocols/silc/silc.c src/protocols/yahoo/yahoo.c
| src/protocols/zephyr/zephyr.c src/prpl.h
|
| ChangeLog:
|
| [gaim-migrate @ 10837]
| what's good for the goose...
| ============================================================
| --- VERSION 3a6199eb3e176fc961593773cd3ac3088373fa3c
| +++ VERSION 71a794cd35b024943698c121b7038176e2b458a2
| @@ -1 +1 @@
| -0.83cvs
| +1.0.0cvs
| ============================================================
| --- configure.ac e422367a772cdc586414f890732a649f4d5bba15
| +++ configure.ac 07b2871240de7a5c8616cd5d8d18c94ae6dad28d
| @@ -1,5 +1,5 @@ dnl Process this file with autoconf to p
| dnl Process this file with autoconf to produce a configure script.
| -AC_INIT([gaim], [0.83cvs], [gaim-devel at lists.sourceforge.net])
| +AC_INIT([gaim], [1.0.0cvs], [gaim-devel at lists.sourceforge.net])
| AC_CANONICAL_SYSTEM
| AM_CONFIG_HEADER(config.h)
| AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
| ============================================================
| --- plugins/autorecon.c 691088e918b4b669353ff1ab7997c59237c550fe
| +++ plugins/autorecon.c b9fa6375613064fbff69ff2fc3947e49adc84334
| @@ -5,6 +5,7 @@
| #include "pluginpref.h"
| #include "prpl.h"
| #include "signals.h"
| +#include "version.h"
|
|
| #define AUTORECON_PLUGIN_ID "core-autorecon"
| @@ -256,7 +257,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_STANDARD, /**< type */
| NULL, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- plugins/docklet/docklet.c 29b53260770b80cb867dd47855512acc930af53a
| +++ plugins/docklet/docklet.c a83e86bf495cb24c95b1fc0b6fb694b5b0f22bd3
| @@ -37,6 +37,7 @@
| #include "prefs.h"
| #include "signals.h"
| #include "sound.h"
| +#include "version.h"
|
| #include "away.h"
| #include "gtkaccount.h"
| @@ -533,7 +534,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_STANDARD, /**< type */
| GAIM_GTK_PLUGIN_TYPE, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- plugins/extplacement.c 4bbea6d0266b75c30515d982de820dd7c1325dcc
| +++ plugins/extplacement.c e385fcd2f7e29367e2b78015ae805b976567a1cb
| @@ -23,6 +23,7 @@
| #include "internal.h"
| #include "gtkgaim.h"
| #include "conversation.h"
| +#include "version.h"
| #include "gtkplugin.h"
|
| static void
| @@ -117,7 +118,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_STANDARD, /**< type */
| GAIM_GTK_PLUGIN_TYPE, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- plugins/gaim-remote/remote.c abc2eb99dba02609295d47bc897d76e97d890d17
| +++ plugins/gaim-remote/remote.c 89c35a049b6b26301b3084acdec0045c5cb79566
| @@ -36,6 +36,7 @@
| #include "debug.h"
| #include "prpl.h"
| #include "notify.h"
| +#include "version.h"
|
| /* XXX */
| #include "away.h"
| @@ -728,7 +729,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_STANDARD, /**< type */
| GAIM_GTK_PLUGIN_TYPE, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- plugins/gestures/gestures.c 6493f6ab2c69031738dddcb837cb478db22edb65
| +++ plugins/gestures/gestures.c 254908c0d4446f2462589ef5f1c1aa6d48085aa8
| @@ -24,6 +24,7 @@
| #include "debug.h"
| #include "prefs.h"
| #include "signals.h"
| +#include "version.h"
|
| #include "gtkconv.h"
| #include "gtkplugin.h"
| @@ -260,7 +261,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_STANDARD, /**< type */
| GAIM_GTK_PLUGIN_TYPE, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- plugins/history.c 58e32e7185554910a94f3276e35d97a9e3046331
| +++ plugins/history.c faad43b8de104beba3fab6e26f9a8d032b207585
| @@ -10,6 +10,7 @@
| #include "prefs.h"
| #include "signals.h"
| #include "util.h"
| +#include "version.h"
|
| #include "gtkconv.h"
| #include "gtkimhtml.h"
| @@ -79,7 +80,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION,
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_STANDARD,
| GAIM_GTK_PLUGIN_TYPE,
| 0,
| ============================================================
| --- plugins/iconaway.c 1860d94317ad51f5800ee6548796c6df6f7cd13e
| +++ plugins/iconaway.c babd2ae8a09780224462d595c0ab76a9aae7340a
| @@ -23,6 +23,7 @@
|
| #include "conversation.h"
| #include "signals.h"
| +#include "version.h"
|
| #include "gtkconv.h"
| #include "gtkplugin.h"
| @@ -90,7 +91,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_STANDARD, /**< type */
| GAIM_GTK_PLUGIN_TYPE, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- plugins/idle.c cb67ac148835f2370f0f3522bf7d7219c69177b9
| +++ plugins/idle.c 34a12cb2f0639bac42a6eaa61dbb0cf741255b04
| @@ -10,6 +10,7 @@
| #include "plugin.h"
| #include "request.h"
| #include "server.h"
| +#include "version.h"
|
| #define IDLE_PLUGIN_ID "gtk-idle"
|
| @@ -85,7 +86,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION,
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_STANDARD,
| NULL,
| 0,
| ============================================================
| --- plugins/notify.c 606b1776009df45885c91e6c5ddc9be0d08582a6
| +++ plugins/notify.c 5cebfc5a039a9876e80376bc242c139e3a66b6f5
| @@ -72,6 +72,7 @@
| #include "debug.h"
| #include "prefs.h"
| #include "signals.h"
| +#include "version.h"
|
| #include "gtkplugin.h"
| #include "gtkutils.h"
| @@ -782,7 +783,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_STANDARD, /**< type */
| GAIM_GTK_PLUGIN_TYPE, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- plugins/perl/perl.c be107e38a96bfa346ae3413b4b0d007c3cc7ed04
| +++ plugins/perl/perl.c 8191f5444a98dc20c00dd6c8a5bd19202ead0ff5
| @@ -89,6 +89,7 @@ extern void boot_DynaLoader _((pTHX_ CV
| #include "debug.h"
| #include "plugin.h"
| #include "signals.h"
| +#include "version.h"
|
| #include "perl-common.h"
| #include "perl-handlers.h"
| @@ -289,7 +290,9 @@ probe_perl_plugin(GaimPlugin *plugin)
| info = g_new0(GaimPluginInfo, 1);
| gps = g_new0(GaimPerlScript, 1);
|
| - info->api_version = GAIM_PLUGIN_API_VERSION;
| + info->magic = GAIM_PLUGIN_MAGIC;
| + info->major_version = GAIM_MAJOR_VERSION;
| + info->minor_version = GAIM_MINOR_VERSION;
| info->type = GAIM_PLUGIN_STANDARD;
|
| info->dependencies = g_list_append(info->dependencies,
| @@ -510,9 +513,7 @@ static GaimPluginLoaderInfo loader_info
|
| static GaimPluginLoaderInfo loader_info =
| {
| - GAIM_LOADER_API_VERSION, /**< api_version */
| NULL, /**< exts */
| -
| probe_perl_plugin, /**< probe */
| load_perl_plugin, /**< load */
| unload_perl_plugin, /**< unload */
| @@ -521,7 +522,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_LOADER, /**< type */
| NULL, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- plugins/relnot.c bc6b5ccd2dd640ba860c28b612aa506203cf252b
| +++ plugins/relnot.c a08f26f948b7d5b86f861c45b273f90956b6ccf1
| @@ -36,6 +36,7 @@
| #include "notify.h"
| #include "prefs.h"
| #include "util.h"
| +#include "version.h"
|
| /* 1 day */
| #define MIN_CHECK_INTERVAL 60 * 60 * 24
| @@ -123,7 +124,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_STANDARD, /**< type */
| NULL, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- plugins/spellchk.c f4ae49e1f8944918c5e7e9c9c65e5a4f88ff0148
| +++ plugins/spellchk.c 266e50d9b191736f7716bad1de755cd4f349e772
| @@ -8,6 +8,7 @@
| #include "debug.h"
| #include "signals.h"
| #include "util.h"
| +#include "version.h"
|
| #include "gtkplugin.h"
| #include "gtkutils.h"
| @@ -526,7 +527,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION,
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_STANDARD,
| GAIM_GTK_PLUGIN_TYPE,
| 0,
| ============================================================
| --- plugins/ssl/ssl-gnutls.c eae75f614849f0317bb7183f5b2a847a8013ca66
| +++ plugins/ssl/ssl-gnutls.c 0ada2c33de0425b01b7a184c9b7beeb4a4857083
| @@ -23,6 +23,7 @@
| #include "debug.h"
| #include "plugin.h"
| #include "sslconn.h"
| +#include "version.h"
|
| #define SSL_GNUTLS_PLUGIN_ID "ssl-gnutls"
|
| @@ -212,7 +213,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_STANDARD, /**< type */
| NULL, /**< ui_requirement */
| GAIM_PLUGIN_FLAG_INVISIBLE, /**< flags */
| ============================================================
| --- plugins/ssl/ssl-nss.c 18816cf4bf30f3e55917accc0b74bc6b22cb8dde
| +++ plugins/ssl/ssl-nss.c e8ba24494af22902bfce206ed260104f76594984
| @@ -23,6 +23,7 @@
| #include "debug.h"
| #include "plugin.h"
| #include "sslconn.h"
| +#include "version.h"
|
| #define SSL_NSS_PLUGIN_ID "ssl-nss"
|
| @@ -303,7 +304,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_STANDARD, /**< type */
| NULL, /**< ui_requirement */
| GAIM_PLUGIN_FLAG_INVISIBLE, /**< flags */
| ============================================================
| --- plugins/ssl/ssl.c d115f73e439b8c9526a8e20625a9794f57637737
| +++ plugins/ssl/ssl.c b387216f49a1745e2922965f9b325d895eddbe7f
| @@ -23,6 +23,7 @@
| #include "debug.h"
| #include "plugin.h"
| #include "sslconn.h"
| +#include "version.h"
|
| #define SSL_PLUGIN_ID "core-ssl"
|
| @@ -80,7 +81,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_STANDARD, /**< type */
| NULL, /**< ui_requirement */
| GAIM_PLUGIN_FLAG_INVISIBLE, /**< flags */
| ============================================================
| --- plugins/statenotify.c f644689b1c2b12a9643b5370ab0c5d310611b64b
| +++ plugins/statenotify.c dae41bde2d6597f6c0ddcd5babbb42f445409726
| @@ -1,9 +1,10 @@
| #include "internal.h"
|
| #include "blist.h"
| #include "conversation.h"
| #include "debug.h"
| #include "signals.h"
| +#include "version.h"
|
| #include "plugin.h"
| #include "pluginpref.h"
| @@ -102,7 +103,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_STANDARD, /**< type */
| NULL, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- plugins/tcl/tcl.c 5f19a326e345fbd5d3bc955b56702c524455071a
| +++ plugins/tcl/tcl.c 9779a4e421ce9642c1598fcce2ad1519e4ecf7b0
| @@ -1,10 +1,10 @@
| /**
| * @file tcl.c Gaim Tcl plugin bindings
| *
| * gaim
| *
| * Copyright (C) 2003 Ethan Blanton <eblanton at cs.purdue.edu>
| - *
| + *
| * 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
| @@ -43,6 +43,7 @@
| #include "signals.h"
| #include "debug.h"
| #include "util.h"
| +#include "version.h"
|
| struct tcl_plugin_data {
| GaimPlugin *plugin;
| @@ -69,7 +70,7 @@ static int tcl_init_interp(Tcl_Interp *i
| static int tcl_init_interp(Tcl_Interp *interp)
| {
| char *rcfile;
| - char init[] =
| + char init[] =
| "namespace eval ::gaim {\n"
| " namespace export account buddy connection conversation\n"
| " namespace export core debug notify prefs send_im\n"
| @@ -221,7 +222,9 @@ static gboolean tcl_probe_plugin(GaimPlu
| if (nelems == 6) {
| info = g_new0(GaimPluginInfo, 1);
|
| - info->api_version = GAIM_PLUGIN_API_VERSION;
| + info->magic = GAIM_PLUGIN_MAGIC;
| + info->major_version = GAIM_MAJOR_VERSION;
| + info->minor_version = GAIM_MINOR_VERSION;
| info->type = GAIM_PLUGIN_STANDARD;
| info->dependencies = g_list_append(info->dependencies, "core-tcl");
|
| @@ -339,7 +342,6 @@ static GaimPluginLoaderInfo tcl_loader_i
|
| static GaimPluginLoaderInfo tcl_loader_info =
| {
| - GAIM_LOADER_API_VERSION,
| NULL,
| tcl_probe_plugin,
| tcl_load_plugin,
| @@ -349,7 +351,9 @@ static GaimPluginInfo tcl_info =
|
| static GaimPluginInfo tcl_info =
| {
| - GAIM_PLUGIN_API_VERSION,
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_LOADER,
| NULL,
| 0,
| ============================================================
| --- plugins/ticker/ticker.c e86df1cf96f71d55fb9617c6b70988205c697af2
| +++ plugins/ticker/ticker.c 4d8c07fcf7d40031a3c9c6e5fc6c40f307eca9b4
| @@ -32,6 +32,7 @@
| #include "debug.h"
| #include "prpl.h"
| #include "signals.h"
| +#include "version.h"
|
| #include "gtkblist.h"
| #include "gtkplugin.h"
| @@ -317,7 +318,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_STANDARD, /**< type */
| GAIM_GTK_PLUGIN_TYPE, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- plugins/timestamp.c 0a98cceb02d292320cd14ea6cd6e8682639c9389
| +++ plugins/timestamp.c acdaf4aecb4fb3705b9a9248e6030b70fe5e55f7
| @@ -28,6 +28,7 @@
| #include "debug.h"
| #include "prefs.h"
| #include "signals.h"
| +#include "version.h"
|
| #include "gtkimhtml.h"
| #include "gtkplugin.h"
| @@ -257,7 +258,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_STANDARD, /**< type */
| GAIM_GTK_PLUGIN_TYPE, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- src/plugin.c e8dd720c1a1efe7aab4b22b9c040c33d49543621
| +++ src/plugin.c dc779ce044ea0234490dbd250f275e9a9cc04f1b
| @@ -28,6 +28,7 @@
| #include "prpl.h"
| #include "request.h"
| #include "signals.h"
| +#include "version.h"
|
| #ifdef _WIN32
| # define PLUGIN_EXT ".dll"
| @@ -239,10 +240,12 @@ gaim_plugin_probe(const char *filename)
| return NULL;
| }
|
| - if (plugin->info->api_version != GAIM_PLUGIN_API_VERSION)
| + if (plugin->info->magic != GAIM_PLUGIN_MAGIC ||
| + plugin->info->major_version != GAIM_MAJOR_VERSION ||
| + plugin->info->minor_version > GAIM_MINOR_VERSION)
| {
| - gaim_debug(GAIM_DEBUG_ERROR, "plugins", "%s is unloadable: API version mismatch %d (need %d)\n",
| - plugin->path, plugin->info->api_version, GAIM_PLUGIN_API_VERSION);
| + gaim_debug(GAIM_DEBUG_ERROR, "plugins", "%s is unloadable: API version mismatch %d.%d.x (need %d.%d.x)\n",
| + plugin->path, plugin->info->major_version, plugin->info->minor_version, GAIM_MAJOR_VERSION, GAIM_MINOR_VERSION);
| gaim_plugin_destroy(plugin);
| return NULL;
| }
| @@ -479,6 +482,17 @@ gaim_plugin_destroy(GaimPlugin *plugin)
| if (load_queue != NULL)
| load_queue = g_list_remove(load_queue, plugin);
|
| + /* true, this may leak a little memory if there is a major version
| + * mismatch, but it's a lot better than trying to free something
| + * we shouldn't, and crashing while trying to load an old plugin */
| + if(plugin->info == NULL || plugin->info->magic != GAIM_PLUGIN_MAGIC ||
| + plugin->info->major_version != GAIM_MAJOR_VERSION) {
| + if(plugin->handle)
| + g_module_close(plugin->handle);
| + g_free(plugin);
| + return;
| + }
| +
| if (plugin->info != NULL && plugin->info->dependencies != NULL)
| g_list_free(plugin->info->dependencies);
|
| @@ -492,8 +506,7 @@ gaim_plugin_destroy(GaimPlugin *plugin)
|
| loader_info = GAIM_PLUGIN_LOADER_INFO(plugin);
|
| - if (loader_info != NULL && plugin->info->api_version >= 3 &&
| - loader_info->exts != NULL)
| + if (loader_info != NULL && loader_info->exts != NULL)
| {
| for (exts = GAIM_PLUGIN_LOADER_INFO(plugin)->exts;
| exts != NULL;
| @@ -971,11 +984,10 @@ gaim_plugin_register(GaimPlugin *plugin)
|
| loader_info = GAIM_PLUGIN_LOADER_INFO(plugin);
|
| - if (loader_info == NULL ||
| - loader_info->api_version != GAIM_LOADER_API_VERSION)
| + if (loader_info == NULL)
| {
| - gaim_debug(GAIM_DEBUG_ERROR, "plugins", "%s is unloadable: API version mismatch %d (need %d)\n",
| - plugin->path, loader_info->api_version, GAIM_LOADER_API_VERSION);
| + gaim_debug(GAIM_DEBUG_ERROR, "plugins", "%s is unloadable\n",
| + plugin->path);
| return FALSE;
| }
|
| @@ -987,11 +999,10 @@ gaim_plugin_register(GaimPlugin *plugin)
|
| prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(plugin);
|
| - if (prpl_info == NULL ||
| - prpl_info->api_version != GAIM_PRPL_API_VERSION)
| + if (prpl_info == NULL)
| {
| - gaim_debug(GAIM_DEBUG_ERROR, "plugins", "%s is unloadable: API version mismatch %d (need %d)\n",
| - plugin->path, prpl_info->api_version, GAIM_PRPL_API_VERSION);
| + gaim_debug(GAIM_DEBUG_ERROR, "plugins", "%s is unloadable\n",
| + plugin->path);
| return FALSE;
| }
|
| ============================================================
| --- src/plugin.h a33e3baa7bdc5f7e4b045f5288e35bf7cf658061
| +++ src/plugin.h 0a63e02f840e71e3ceef5a07963fd4fb71fb1898
| @@ -59,8 +59,7 @@ typedef enum
|
| #define GAIM_PLUGIN_FLAG_INVISIBLE 0x01
|
| -#define GAIM_PLUGIN_API_VERSION 4
| -#define GAIM_LOADER_API_VERSION 2
| +#define GAIM_PLUGIN_MAGIC 0xc0cac01a /* this must be greater than 4 */
|
| /**
| * Detailed information about a plugin.
| @@ -69,7 +68,9 @@ struct _GaimPluginInfo
| */
| struct _GaimPluginInfo
| {
| - unsigned int api_version;
| + unsigned int magic;
| + unsigned int major_version;
| + unsigned int minor_version;
| GaimPluginType type;
| char *ui_requirement;
| unsigned long flags;
| @@ -99,8 +100,6 @@ struct _GaimPluginLoaderInfo
| */
| struct _GaimPluginLoaderInfo
| {
| - unsigned int api_version;
| -
| GList *exts;
|
| gboolean (*probe)(GaimPlugin *plugin);
| ============================================================
| --- src/protocols/gg/gg.c 78ecce4dd7d97f7f585ef45209d61265ae59b035
| +++ src/protocols/gg/gg.c 6aa43877ba6c7dc0ebe822b3c75a711ad283cfd3
| @@ -1,6 +1,6 @@
| /*
| * gaim - Gadu-Gadu Protocol Plugin
| - * $Id: gg.c 10819 2004-09-01 01:07:42Z lschiere $
| + * $Id: gg.c 10837 2004-09-03 21:34:21Z faceprint $
| *
| * Copyright (C) 2001 Arkadiusz Mikiewicz <misiek at pld.ORG.PL>
| *
| @@ -33,6 +33,7 @@
| #include "prpl.h"
| #include "server.h"
| #include "util.h"
| +#include "version.h"
|
| #define GG_CONNECT_STEPS 5
|
| @@ -1611,7 +1612,6 @@ static GaimPluginProtocolInfo prpl_info
|
| static GaimPluginProtocolInfo prpl_info =
| {
| - GAIM_PRPL_API_VERSION,
| 0,
| NULL, /* user_splits */
| NULL, /* protocol_options */
| @@ -1674,7 +1674,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_PROTOCOL, /**< type */
| NULL, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- src/protocols/irc/irc.c aa44d7d2f4d1fd72ebf015f5ae397a26afdb0507
| +++ src/protocols/irc/irc.c 73b878cbb66a21a4bb1651f82830ce9bf38e25c0
| @@ -33,6 +33,7 @@
| #include "prpl.h"
| #include "plugin.h"
| #include "util.h"
| +#include "version.h"
|
| #include "irc.h"
|
| @@ -583,7 +584,6 @@ static GaimPluginProtocolInfo prpl_info
|
| static GaimPluginProtocolInfo prpl_info =
| {
| - GAIM_PRPL_API_VERSION,
| OPT_PROTO_CHAT_TOPIC | OPT_PROTO_PASSWORD_OPTIONAL,
| NULL, /* user_splits */
| NULL, /* protocol_options */
| @@ -647,7 +647,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_PROTOCOL, /**< type */
| NULL, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- src/protocols/jabber/jabber.c ebf0f43535938365a6180f3190a5cb0fee40e0e0
| +++ src/protocols/jabber/jabber.c 65acbbf22689f648b35b1fe618d6ee8844c1d3fc
| @@ -32,6 +32,7 @@
| #include "request.h"
| #include "server.h"
| #include "util.h"
| +#include "version.h"
|
| #include "auth.h"
| #include "buddy.h"
| @@ -1479,7 +1480,6 @@ static GaimPluginProtocolInfo prpl_info
|
| static GaimPluginProtocolInfo prpl_info =
| {
| - GAIM_PRPL_API_VERSION,
| OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME,
| NULL, /* user_splits */
| NULL, /* protocol_options */
| @@ -1542,7 +1542,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_PROTOCOL, /**< type */
| NULL, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- src/protocols/msn/msn.c b848222c55363e5aadc2312ed1fff1d9d8713708
| +++ src/protocols/msn/msn.c a1cc68f9f5b75d06f8226fb25c2adb39734b1d7f
| @@ -36,6 +36,7 @@
| #include "utils.h"
| #include "prpl.h"
| #include "util.h"
| +#include "version.h"
|
| #include "switchboard.h"
| #include "notification.h"
| @@ -1639,7 +1640,6 @@ static GaimPluginProtocolInfo prpl_info
|
| static GaimPluginProtocolInfo prpl_info =
| {
| - GAIM_PRPL_API_VERSION,
| OPT_PROTO_MAIL_CHECK,
| NULL, /* user_splits */
| NULL, /* protocol_options */
| @@ -1702,7 +1702,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_PROTOCOL, /**< type */
| NULL, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- src/protocols/napster/napster.c a985dc964d638dd81542bd84543eb3adc7faf5f1
| +++ src/protocols/napster/napster.c 32b964455e607b7b4c657c984a289ede9b96308f
| @@ -28,6 +28,7 @@
| #include "prpl.h"
| #include "proxy.h"
| #include "util.h"
| +#include "version.h"
|
| #define NAP_SERVER "64.124.41.187"
| #define NAP_PORT 8888
| @@ -571,7 +572,6 @@ static GaimPluginProtocolInfo prpl_info
|
| static GaimPluginProtocolInfo prpl_info =
| {
| - GAIM_PRPL_API_VERSION,
| OPT_PROTO_CHAT_TOPIC,
| NULL, /* user_splits */
| NULL, /* protocol_options */
| @@ -634,7 +634,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_PROTOCOL, /**< type */
| NULL, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- src/protocols/novell/novell.c 2b48d775e81be89642f8cc623b1c9b7ffc82d992
| +++ src/protocols/novell/novell.c b4fd7623d8304004006b55c1e1459eed62e02240
| @@ -30,6 +30,7 @@
| #include "request.h"
| #include "network.h"
| #include "privacy.h"
| +#include "version.h"
|
| #define DEFAULT_PORT 8300
| #define NOVELL_CONNECT_STEPS 4
| @@ -3390,7 +3391,6 @@ static GaimPluginProtocolInfo prpl_info
| }
|
| static GaimPluginProtocolInfo prpl_info = {
| - GAIM_PRPL_API_VERSION,
| 0,
| NULL, /* user_splits */
| NULL, /* protocol_options */
| @@ -3452,7 +3452,9 @@ static GaimPluginInfo info = {
| };
|
| static GaimPluginInfo info = {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_PROTOCOL, /**< type */
| NULL, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- src/protocols/oscar/oscar.c 46539efd091a45fae81db080ef487af344b32f7e
| +++ src/protocols/oscar/oscar.c 609e98a0688cbd17477cfba35735ab3a16cddb08
| @@ -41,6 +41,7 @@
| #include "proxy.h"
| #include "request.h"
| #include "util.h"
| +#include "version.h"
|
| #include "aim.h"
| #include "md5.h"
| @@ -7326,7 +7327,6 @@ static GaimPluginProtocolInfo prpl_info
|
| static GaimPluginProtocolInfo prpl_info =
| {
| - GAIM_PRPL_API_VERSION,
| OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE,
| NULL, /* user_splits */
| NULL, /* protocol_options */
| @@ -7399,7 +7399,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_PROTOCOL, /**< type */
| NULL, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- src/protocols/silc/silc.c 6e2db8ee6567f9b6e83f335cc3115fb503b98d60
| +++ src/protocols/silc/silc.c 28ef739643203747677879c0cd7f54d9e2ad797b
| @@ -20,6 +20,7 @@
| #include "silcincludes.h"
| #include "silcclient.h"
| #include "silcgaim.h"
| +#include "version.h"
|
| extern SilcClientOperations ops;
| static GaimPlugin *silc_plugin = NULL;
| @@ -1480,7 +1481,6 @@ static GaimPluginProtocolInfo prpl_info
|
| static GaimPluginProtocolInfo prpl_info =
| {
| - GAIM_PRPL_API_VERSION,
| OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME |
| OPT_PROTO_PASSWORD_OPTIONAL,
| NULL, /* user_splits */
| @@ -1544,7 +1544,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_PROTOCOL, /**< type */
| NULL, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- src/protocols/yahoo/yahoo.c b40b92d1d0ec647198f8ad368448133f6321eff2
| +++ src/protocols/yahoo/yahoo.c 199cf608a391c498a694279a4a1d6f87546bdd76
| @@ -34,6 +34,7 @@
| #include "request.h"
| #include "server.h"
| #include "util.h"
| +#include "version.h"
|
| #include "sha.h"
| #include "yahoo.h"
| @@ -3280,7 +3281,6 @@ static GaimPluginProtocolInfo prpl_info
|
| static GaimPluginProtocolInfo prpl_info =
| {
| - GAIM_PRPL_API_VERSION,
| OPT_PROTO_MAIL_CHECK | OPT_PROTO_CHAT_TOPIC,
| NULL, /* user_splits */
| NULL, /* protocol_options */
| @@ -3343,7 +3343,9 @@ static GaimPluginInfo info =
|
| static GaimPluginInfo info =
| {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_PROTOCOL, /**< type */
| NULL, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- src/protocols/zephyr/zephyr.c 50ae2cb75eada2d2b934d88b87376b0e2bcaee11
| +++ src/protocols/zephyr/zephyr.c 7348b3484cd57c7354a0ae665e05f8d6e5915f25
| @@ -37,6 +37,7 @@
| #include "util.h"
| #include "cmds.h"
| #include "privacy.h"
| +#include "version.h"
|
| #include "zephyr.h"
| #include "internal.h"
| @@ -2646,7 +2647,6 @@ static GaimPluginProtocolInfo prpl_info
| static GaimPlugin *my_protocol = NULL;
|
| static GaimPluginProtocolInfo prpl_info = {
| - GAIM_PRPL_API_VERSION,
| OPT_PROTO_CHAT_TOPIC | OPT_PROTO_NO_PASSWORD,
| NULL, /* ??? user_splits */
| NULL, /* ??? protocol_options */
| @@ -2708,7 +2708,9 @@ static GaimPluginInfo info = {
| };
|
| static GaimPluginInfo info = {
| - GAIM_PLUGIN_API_VERSION, /**< api_version */
| + GAIM_PLUGIN_MAGIC,
| + GAIM_MAJOR_VERSION,
| + GAIM_MINOR_VERSION,
| GAIM_PLUGIN_PROTOCOL, /**< type */
| NULL, /**< ui_requirement */
| 0, /**< flags */
| ============================================================
| --- src/prpl.h 92d014f4ec7e7c05bdbe416ff3a5c1207b922374
| +++ src/prpl.h 59d20b403a573d8bec8a31122f4befd192849f01
| @@ -191,8 +191,6 @@ struct _GaimPluginProtocolInfo
| */
| struct _GaimPluginProtocolInfo
| {
| - unsigned int api_version; /**< API version number. */
| -
| GaimProtocolOptions options; /**< Protocol options. */
|
| GList *user_splits; /* A GList of GaimAccountUserSplit */
| @@ -315,11 +313,6 @@ struct _GaimPluginProtocolInfo
| #define GAIM_PLUGIN_PROTOCOL_INFO(plugin) \
| ((GaimPluginProtocolInfo *)(plugin)->info->extra_info)
|
| -/* It's not like we're going to run out of integers for this version
| - number, but we only want to really change it once per release. */
| -/* GAIM_PRPL_API_VERSION last changed for version: 0.83 */
| -#define GAIM_PRPL_API_VERSION 8
| -
| #ifdef __cplusplus
| extern "C" {
| #endif
To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 9764e45cdc34f5eea027659463336d4bcb81e5c0
More information about the Commits
mailing list