[Xfce4-commits] <midori:master> Avoid pre- and suffix with extension default configs

[Christian Dywan]

Updating branch refs/heads/master
         to 3f77b9f300a918a598536e22987128f8458ab054 (commit)
       from b29ee13da66591fa3129015855f8957e30daa78a (commit)

commit 3f77b9f300a918a598536e22987128f8458ab054
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Oct 20 23:39:28 2011 +0200

    Avoid pre- and suffix with extension default configs
    
    So this mainly matters to package maintainers, as the
    configuration files for extensions have pre- and suffix
    according to library naming of the platform. Basically
    this only ever worked on Linux and Windows.
    Now default configs are always installed with plain names.

 midori/midori-extension.c |   11 ++++++++++-
 wscript                   |   14 ++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/midori/midori-extension.c b/midori/midori-extension.c
index 4eb83ef..634462c 100644
--- a/midori/midori-extension.c
+++ b/midori/midori-extension.c
@@ -294,7 +294,16 @@ midori_extension_activate_cb (MidoriExtension* extension,
             if (error->code == G_FILE_ERROR_NOENT)
             {
                 gchar* filename = g_object_get_data (G_OBJECT (extension), "filename");
-                gchar* folder = g_strconcat ("extensions/", filename, NULL);
+                gchar* folder;
+                if (g_str_has_prefix (filename, "lib"))
+                    filename = &filename[strlen ("len")];
+                if (g_str_has_suffix (filename, G_MODULE_SUFFIX))
+                    filename = g_strndup (filename,
+                        strlen (filename) - strlen ("." G_MODULE_SUFFIX));
+                else
+                    filename = g_strdup (filename);
+                folder = g_strconcat ("extensions/", filename, NULL);
+                g_free (filename);
                 katze_assign (config_file,
                     sokoke_find_config_filename (folder, "config"));
                 g_free (folder);
diff --git a/wscript b/wscript
index d8abd15..36051a8 100644
--- a/wscript
+++ b/wscript
@@ -476,23 +476,13 @@ def build (bld):
         bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.js')
         bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.css')
 
-        # FIXME: Determine the library naming for other platforms
-        if bld.env['platform'] == 'win32':
+        if 1:
             extensions = os.listdir ('data/extensions')
             for extension in extensions:
-                folder = 'lib' + extension + '.dll'
                 source = 'data/extensions/' + extension +  '/config'
                 if os.path.exists (source):
                     bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + \
-                                       '/extensions/' + folder, source)
-        elif Options.platform == 'linux':
-            extensions = os.listdir ('data/extensions')
-            for extension in extensions:
-                folder = 'lib' + extension + '.so'
-                source = 'data/extensions/' + extension +  '/config'
-                if os.path.exists (source):
-                    bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + \
-                                       '/extensions/' + folder, source)
+                                       '/extensions/' + extension, source)
 
     if Options.commands['check'] or bld.env['tests']:
         bld.add_subdirs ('tests')