[patch] xfce-utils/xfrun/xfcombo.i

[edscott]

Oops. I should have waited for the patch ;-)
The changes I committed are about the same as those included in the
patch (plus corrections for the memory leak spotted by Jasper. I have to
leave my computer now so I will not be able to modify xffm/src/modules.c
for the rest of today, and today is just beginning on this side of the
world (hint...)
 

regards,

Edscott

El jue, 16-09-2004 a las 09:15, Maarten Boekhold escribió:
> Hi,
> 
> In the spirit of my long explanation on the naming of loadable modules 
> under cygwin, here's a patch that makes xfrun correctly load the 
> xfce4_combo library. There is no cygwin specific if/then/else stuff 
> going on, as the chance should still do the correct thing on other 
> platforms. Please consider applying.
> 
> Maarten
> 
> Index: xfce-utils/xfrun/xfcombo.i
> ===================================================================
> RCS file: /cvsroot/xfce/xfce4/xfce-utils/xfrun/xfcombo.i,v
> retrieving revision 1.7
> diff -u -r1.7 xfcombo.i
> --- xfce-utils/xfrun/xfcombo.i  21 Jul 2004 16:10:28 -0000      1.7
> +++ xfce-utils/xfrun/xfcombo.i  16 Sep 2004 14:12:45 -0000
> @@ -80,12 +80,12 @@
> 
>   xfc_combo_functions *load_xfc(void){
>       xfc_combo_functions *(*module_init)(void) ;
> -    gchar *library, *module;
> +    gchar *module_dir, *module;
> 
>       if (xfc_fun) return xfc_fun;
> 
> -    library=g_strconcat("libxfce4_combo.",G_MODULE_SUFFIX, NULL);
> -    module = g_build_filename (LIBDIR, "xfce4", "modules",library, NULL);
> +    module_dir = g_build_filename(LIBDIR, "xfce4", "modules", NULL);
> +    module = g_module_build_path(module_dir, "xfce4_combo");
> 
>       xfc_cm=g_module_open (module, 0);
>       if (!xfc_cm) {
> @@ -104,7 +104,7 @@
>   #ifdef DEBUG
>       g_message ("module %s successfully loaded", library);
>   #endif
> -    g_free(library);
> +    g_free(module_dir);
>       g_free(module);
>       return xfc_fun;
>   }
> 
> 
> _______________________________________________
> Xfce4-dev mailing list
> Xfce4-dev at xfce.org
> http://lunar-linux.org/mailman/listinfo/xfce4-dev
>