# HG changeset patch # User Tony Vroon # Date 1222462002 -3600 # Node ID c2dc7a3a724006449d46154f38ae2ea5966e731a # Parent 6284337e04fd2289256b1cf7f54abf24eb8d3d37 g_basename is deprecated, replace with g_path_get_basename. diff -r 6284337e04fd -r c2dc7a3a7240 src/audacious/pluginenum.c --- a/src/audacious/pluginenum.c Fri Sep 26 21:38:00 2008 +0100 +++ b/src/audacious/pluginenum.c Fri Sep 26 21:46:42 2008 +0100 @@ -429,9 +429,9 @@ { mowgli_dictionary_elem_t *elem; - elem = mowgli_dictionary_find(pvt_data_dict, g_basename(plugin->filename)); + elem = mowgli_dictionary_find(pvt_data_dict, g_path_get_basename(plugin->filename)); if (elem == NULL) - mowgli_dictionary_add(pvt_data_dict, g_basename(plugin->filename), data); + mowgli_dictionary_add(pvt_data_dict, g_path_get_basename(plugin->filename), data); else elem->data = data; } @@ -440,7 +440,7 @@ { Plugin *cur_p = plugin_get_current(); - return mowgli_dictionary_retrieve(pvt_data_dict, g_basename(cur_p->filename)); + return mowgli_dictionary_retrieve(pvt_data_dict, g_path_get_basename(cur_p->filename)); } static gint @@ -567,7 +567,7 @@ /* XXX: we need something better than p->filename if plugins will eventually provide multiple plugins --nenolod */ - mowgli_dictionary_add(plugin_dict, g_basename(p->filename), p); + mowgli_dictionary_add(plugin_dict, g_path_get_basename(p->filename), p); /* build the extension hash table */ gint i; @@ -593,7 +593,7 @@ OutputPlugin *p = OUTPUT_PLUGIN(plugin); op_data.output_list = g_list_append(op_data.output_list, p); - mowgli_dictionary_add(plugin_dict, g_basename(p->filename), p); + mowgli_dictionary_add(plugin_dict, g_path_get_basename(p->filename), p); } static void @@ -602,7 +602,7 @@ EffectPlugin *p = EFFECT_PLUGIN(plugin); ep_data.effect_list = g_list_append(ep_data.effect_list, p); - mowgli_dictionary_add(plugin_dict, g_basename(p->filename), p); + mowgli_dictionary_add(plugin_dict, g_path_get_basename(p->filename), p); } static void @@ -611,7 +611,7 @@ GeneralPlugin *p = GENERAL_PLUGIN(plugin); gp_data.general_list = g_list_append(gp_data.general_list, p); - mowgli_dictionary_add(plugin_dict, g_basename(p->filename), p); + mowgli_dictionary_add(plugin_dict, g_path_get_basename(p->filename), p); } static void @@ -621,7 +621,7 @@ p->disable_plugin = vis_disable_plugin; vp_data.vis_list = g_list_append(vp_data.vis_list, p); - mowgli_dictionary_add(plugin_dict, g_basename(p->filename), p); + mowgli_dictionary_add(plugin_dict, g_path_get_basename(p->filename), p); } static void @@ -630,7 +630,7 @@ DiscoveryPlugin *p = DISCOVERY_PLUGIN(plugin); dp_data.discovery_list = g_list_append(dp_data.discovery_list, p); - mowgli_dictionary_add(plugin_dict, g_basename(p->filename), p); + mowgli_dictionary_add(plugin_dict, g_path_get_basename(p->filename), p); } /*******************************************************************/ @@ -916,7 +916,7 @@ * prefix. We will only see one plugin with the same * basename, so this is usually what the user want. */ - if (cfg.outputplugin && !strcmp(g_basename(cfg.outputplugin), g_basename(op->filename))) + if (cfg.outputplugin && !strcmp(g_path_get_basename(cfg.outputplugin), g_path_get_basename(op->filename))) op_data.current_output_plugin = op; if (op->init) {