# HG changeset patch # User Mark Doliner # Date 1131845551 0 # Node ID ee8312c764b1e0b54b60523c64129c007b12bbaa # Parent ff985a2d88b99ddaae4e8a5eff756d46cd5e64be [gaim-migrate @ 14361] You learn something new every day! committer: Tailor Script diff -r ff985a2d88b9 -r ee8312c764b1 src/core.c --- a/src/core.c Sun Nov 13 01:24:07 2005 +0000 +++ b/src/core.c Sun Nov 13 01:32:31 2005 +0000 @@ -104,7 +104,7 @@ * subsystem right away too. */ gaim_plugins_init(); - gaim_plugins_probe(GAIM_PLUGIN_EXT); + gaim_plugins_probe(G_MODULE_SUFFIX); gaim_savedstatuses_init(); gaim_status_init(); diff -r ff985a2d88b9 -r ee8312c764b1 src/gtkplugin.c --- a/src/gtkplugin.c Sun Nov 13 01:24:07 2005 +0000 +++ b/src/gtkplugin.c Sun Nov 13 01:32:31 2005 +0000 @@ -105,7 +105,7 @@ GaimPlugin *plug; gtk_list_store_clear(ls); - gaim_plugins_probe(GAIM_PLUGIN_EXT); + gaim_plugins_probe(G_MODULE_SUFFIX); for (probes = gaim_plugins_get_all(); probes != NULL; diff -r ff985a2d88b9 -r ee8312c764b1 src/plugin.c --- a/src/plugin.c Sun Nov 13 01:24:07 2005 +0000 +++ b/src/plugin.c Sun Nov 13 01:32:31 2005 +0000 @@ -97,9 +97,7 @@ if (last_period == NULL) return FALSE; - return !(strcmp(last_period, GAIM_PLUGIN_EXT_WIN32) & - strcmp(last_period, GAIM_PLUGIN_EXT_HPUX) & - strcmp(last_period, GAIM_PLUGIN_EXT_UNIX)); + return !(strcmp(last_period + 1, G_MODULE_SUFFIX)); } static char * @@ -213,7 +211,7 @@ if (plugin != NULL) return plugin; - plugin = gaim_plugin_new(has_file_extension(filename, GAIM_PLUGIN_EXT), filename); + plugin = gaim_plugin_new(has_file_extension(filename, G_MODULE_SUFFIX), filename); if (plugin->native_plugin) { const char *error; diff -r ff985a2d88b9 -r ee8312c764b1 src/plugin.h --- a/src/plugin.h Sun Nov 13 01:24:07 2005 +0000 +++ b/src/plugin.h Sun Nov 13 01:32:31 2005 +0000 @@ -30,18 +30,6 @@ #include "signals.h" #include "value.h" -#define GAIM_PLUGIN_EXT_WIN32 ".dll" -#define GAIM_PLUGIN_EXT_HPUX ".sl" -#define GAIM_PLUGIN_EXT_UNIX ".so" - -#ifdef _WIN32 -# define GAIM_PLUGIN_EXT GAIM_PLUGIN_EXT_WIN32 -#elif __hpux -# define GAIM_PLUGIN_EXT GAIM_PLUGIN_EXT_HPUX -#else -# define GAIM_PLUGIN_EXT GAIM_PLUGIN_EXT_UNIX -#endif - typedef struct _GaimPlugin GaimPlugin; typedef struct _GaimPluginInfo GaimPluginInfo; typedef struct _GaimPluginUiInfo GaimPluginUiInfo;