debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Check for libnotify.so.1 and libenchant.so.1 explicitly

Browse source 
Some distributions only install versioned libraries by default
while the generic files reside in development packages. This is
because later versions may break ABI, so we explicitly use
the supported version.
This commit is contained in:
Christian Dywan 2009-12-14 18:54:32 +01:00
parent c9da1beb1c
commit e04a078de4
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
midori/midori-app.c
View file

@ -1150,13 +1150,7 @@ static void
midori_app_init_libnotify (MidoriApp* app) midori_app_init_libnotify (MidoriApp* app)
{ {
#if !HAVE_HILDON #if !HAVE_HILDON
gint i; app->libnotify_module = g_module_open ("libnotify.so.1", G_MODULE_BIND_LOCAL);
const gchar* sonames[] = { "libnotify.so", "libnotify.so.1", NULL };
for (i = 0; sonames[i] != NULL && app->libnotify_module == NULL; i++ )
{
app->libnotify_module = g_module_open (sonames[i], G_MODULE_BIND_LOCAL);
}
if (app->libnotify_module != NULL) if (app->libnotify_module != NULL)
{ {

2
midori/midori-preferences.c
View file

@ -242,7 +242,7 @@ midori_preferences_get_spell_languages (void)
if (!enchant_broker_list_dicts && g_module_supported ()) if (!enchant_broker_list_dicts && g_module_supported ())
{ {
GModule* module; GModule* module;
if (!(module = g_module_open ("libenchant.so", G_MODULE_BIND_LOCAL))) if (!(module = g_module_open ("libenchant.so.1", G_MODULE_BIND_LOCAL)))
return NULL; return NULL;
if (!g_module_symbol (module, "enchant_broker_init", if (!g_module_symbol (module, "enchant_broker_init",
(void*) &enchant_broker_init)) (void*) &enchant_broker_init))