libpurple/plugin.c

changeset 22867
ba95299d6ed4
parent 22533
7e1e39d5db7e
child 22875
50a1371d084c
equal deleted inserted replaced
22866:f767c7656ed7 22867:ba95299d6ed4
1292 if (basename != NULL) 1292 if (basename != NULL)
1293 basename++; 1293 basename++;
1294 1294
1295 /* Strip the extension */ 1295 /* Strip the extension */
1296 if (basename) 1296 if (basename)
1297 basename = purple_plugin_get_basename(filename); 1297 basename = purple_plugin_get_basename(basename);
1298 1298
1299 if (((plugin = purple_plugins_find_with_filename(filename)) != NULL) || 1299 if (((plugin = purple_plugins_find_with_filename(filename)) != NULL) ||
1300 (basename && (plugin = purple_plugins_find_with_basename(basename)) != NULL) || 1300 (basename && (plugin = purple_plugins_find_with_basename(basename)) != NULL) ||
1301 ((plugin = purple_plugin_probe(filename)) != NULL)) 1301 ((plugin = purple_plugin_probe(filename)) != NULL))
1302 { 1302 {

mercurial