[gnome-panel/wip/3.0-freeze-break] panel: Replace '-' with '_' in applet gconf prefs path

[Vincent Untz <vuntz src gnome org>]

commit ff362e3612c0573672a17a37841ae1083c4ea3a1
Author: Vincent Untz <vuntz gnome org>
Date:   Fri Mar 25 15:30:08 2011 +0100

    panel: Replace '-' with '_' in applet gconf prefs path
    
    The applet ids are from GSettings (with '-'), but applets might store
    prefs in gconf where '_' is used.

 gnome-panel/panel-applet-frame.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/gnome-panel/panel-applet-frame.c b/gnome-panel/panel-applet-frame.c
index 505e539..cb53048 100644
--- a/gnome-panel/panel-applet-frame.c
+++ b/gnome-panel/panel-applet-frame.c
@@ -846,7 +846,13 @@ panel_applet_frame_activating_get_locked_down (PanelAppletFrameActivating *frame
 gchar *
 panel_applet_frame_activating_get_conf_path (PanelAppletFrameActivating *frame_act)
 {
-	return g_strdup_printf (PANEL_APPLET_PREFS_KEY, frame_act->id);
+	char *ret;
+
+	ret = g_strdup_printf (PANEL_APPLET_PREFS_KEY, frame_act->id);
+	/* gconf uses '_' and not '-' */
+	g_strdelimit (ret, "-", '_');
+
+	return ret;
 }
 
 static void