Before releasing xfce 4.0.6...

[edscott]

El dom, 11-07-2004 a las 10:52, Aurelien Foret escribió:
> Would you mind taking these small fixes into account?
> 
> To sum-up, xffm, xfwm4 and xfce4-iconbox mcs-plugins are using hardcoded 
> paths instead of using XFCE4HOME env parm.

I think the first patch you sent for xffm has already been applied. I
will double check on that.

> 
> Thanks,
> Aurelien
> 
> -------- Original Message --------
> Subject: Re: [patch] XFCE4HOME fix for panel and xffm mcs-plugins
> Date: Mon, 21 Jun 2004 20:37:36 +0200
> From: Aurelien Foret <orelien at chez.com>
> Reply-To: XFCE4 development list <xfce4-dev at xfce.org>
> To: XFCE4 development list <xfce4-dev at xfce.org>
> References: <40D21665.3060404 at chez.com> <40D34758.9040803 at xfce.org>
> 
> Jasper Huijsmans wrote:
> > Aurelien Foret wrote:
> > 
> >> Hi Xfce folks,
> >>
> >> I've found a small bug with 2 mcs-plugins that don't take into account 
> >> XFCE4HOME env param properly when saving settings.
> >> The patches were build against xfce 4.0.5.
> >>
> > 
> > I've updated the panel, thanks!
> 
> Here are some more patches: I've played a little more with XFCE4HOME env
> parm, and I found the issue impacts also xfce4-iconbox and xfwm4
> mcs-plugins (in both 4.0.5 and CVS).
> I'm resending also the one for xffm plugin (issue present in both 4.0.5
> and CVS too).
> -
> Aurelien
> 
> 
> ______________________________________________________________________
> diff -Nur xfce4-iconbox-4.0.5/settings/ls_iconboxconf.c xfce4-iconbox-4.0.5-new/settings/ls_iconboxconf.c
> --- xfce4-iconbox-4.0.5/settings/ls_iconboxconf.c	2003-11-03 22:48:25.000000000 +0100
> +++ xfce4-iconbox-4.0.5-new/settings/ls_iconboxconf.c	2004-06-21 19:55:23.000000000 +0200
> @@ -318,14 +318,10 @@
>  
>  gboolean ls_iconboxconf_write(LSIconBoxConf *plsibwcw, McsManager *pmcsm)
>  {
> -  const gchar 	*szHome;
>    gchar		*szRcFile;
>    gboolean	bErr;
>  
> -  szHome 	= g_get_home_dir(); 
> -  szRcFile	= g_strconcat(szHome, G_DIR_SEPARATOR_S, ".xfce4", 
> -      		    G_DIR_SEPARATOR_S, "settings", G_DIR_SEPARATOR_S, 
> -		    "ls-iconbox.xml", NULL);
> +  szRcFile	= xfce_get_userfile("settings", "ls-iconbox.xml", NULL);
>  
>    if(plsibwcw == NULL) 
>    {
> @@ -353,13 +349,9 @@
>  
>  gboolean ls_iconboxconf_read(LSIconBoxConf *plsibwcw, McsManager *pmcsm)
>  {
> -  const gchar 	*szHome;
>    gchar		*szRcFile;
>  
> -  szHome 	= g_get_home_dir(); 
> -  szRcFile	= g_strconcat(szHome, G_DIR_SEPARATOR_S, ".xfce4", 
> -      		    G_DIR_SEPARATOR_S, "settings", G_DIR_SEPARATOR_S,
> -		    "ls-iconbox.xml", NULL);
> +  szRcFile	= xfce_get_userfile("settings", "ls-iconbox.xml", NULL);
>  
>    if(plsibwcw == NULL) 
>    {
> 
> ______________________________________________________________________
> diff -Nur xffm-4.0.5/plugin-mcs/xffm_settings_dialog.c xffm-4.0.5-new/plugin-mcs/xffm_settings_dialog.c
> --- xffm-4.0.5/plugin-mcs/xffm_settings_dialog.c	2003-09-05 05:24:13.000000000 +0200
> +++ xffm-4.0.5-new/plugin-mcs/xffm_settings_dialog.c	2004-06-21 19:50:47.000000000 +0200
> @@ -168,11 +168,10 @@
>  {
>      McsSetting *setting;
>  
> -    const gchar *home = g_get_home_dir();
>      gchar *rcfile;
>      gint i;
>  
> -    rcfile = g_strconcat(home, G_DIR_SEPARATOR_S, ".xfce4", G_DIR_SEPARATOR_S, RCDIR, G_DIR_SEPARATOR_S, RCFILE, NULL);
> +    rcfile = xfce_get_userfile(RCDIR, RCFILE, NULL);
>      mcs_manager_add_channel_from_file(mcs_manager, CHANNEL, rcfile);
>      g_free(rcfile);rcfile=NULL;
>  
> @@ -198,11 +197,10 @@
>  
>  static gboolean write_options(void)
>  {
> -    const gchar *home = g_get_home_dir();
>      gchar *rcfile;
>      gboolean result;
>  
> -    rcfile = g_strconcat(home, G_DIR_SEPARATOR_S, ".xfce4", G_DIR_SEPARATOR_S, RCDIR, G_DIR_SEPARATOR_S, RCFILE, NULL);
> +    rcfile = xfce_get_userfile(RCDIR, RCFILE, NULL);
>      result = mcs_manager_save_channel_to_file(mcs_manager, CHANNEL, rcfile);
>      g_free(rcfile);
>      rcfile=NULL;
> 
> ______________________________________________________________________
> diff -Nur xfwm4-4.0.5/mcs-plugin/xfwm4_plugin.c xfwm4-4.0.5-new/mcs-plugin/xfwm4_plugin.c
> --- xfwm4-4.0.5/mcs-plugin/xfwm4_plugin.c	2003-07-14 14:46:44.000000000 +0200
> +++ xfwm4-4.0.5-new/mcs-plugin/xfwm4_plugin.c	2004-06-21 19:49:37.000000000 +0200
> @@ -1857,12 +1857,9 @@
>  {
>      McsSetting *setting;
>  
> -    const gchar *home = g_get_home_dir ();
>      gchar *rcfile;
>  
> -    rcfile =
> -        g_strconcat (home, G_DIR_SEPARATOR_S, ".xfce4", G_DIR_SEPARATOR_S,
> -                     RCDIR, G_DIR_SEPARATOR_S, RCFILE, NULL);
> +    rcfile = xfce_get_userfile (RCDIR, RCFILE, NULL);
>      mcs_manager_add_channel_from_file (mcs_plugin->manager, CHANNEL, rcfile);
>      g_free (rcfile);
>  
> 
> ______________________________________________________________________
> _______________________________________________
> Xfce4-dev mailing list
> Xfce4-dev at xfce.org
> http://lunar-linux.org/mailman/listinfo/xfce4-dev