[gnome-panel] panel: Port addition of menubar and separator to GSettings

[Vincent Untz <vuntz src gnome org>]

commit 06e0724f2f9f8958472ba44f144bcbcc0fd6d7b9
Author: Vincent Untz <vuntz gnome org>
Date:   Fri Mar 25 19:32:51 2011 +0100

    panel: Port addition of menubar and separator to GSettings

 gnome-panel/panel-menu-bar.c  |   10 ++++------
 gnome-panel/panel-separator.c |   14 ++++++--------
 2 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/gnome-panel/panel-menu-bar.c b/gnome-panel/panel-menu-bar.c
index 315e671..43fa8a1 100644
--- a/gnome-panel/panel-menu-bar.c
+++ b/gnome-panel/panel-menu-bar.c
@@ -42,7 +42,7 @@
 #include "menu.h"
 #include "panel-menu-items.h"
 #include "panel-globals.h"
-#include "panel-profile.h"
+#include "panel-layout.h"
 #include "panel-lockdown.h"
 #include "panel-stock-icons.h"
 #include "panel-typebuiltins.h"
@@ -434,11 +434,9 @@ void
 panel_menu_bar_create (PanelToplevel *toplevel,
 		       int            position)
 {
-	char *id;
-
-	id = panel_profile_prepare_object (PANEL_OBJECT_MENU_BAR, toplevel, position, FALSE);
-	panel_profile_add_to_list (PANEL_GCONF_OBJECTS, id);
-	g_free (id);
+	panel_layout_object_create (PANEL_OBJECT_MENU_BAR, NULL,
+				    panel_toplevel_get_toplevel_id (toplevel),
+				    position, FALSE);
 }
 
 void
diff --git a/gnome-panel/panel-separator.c b/gnome-panel/panel-separator.c
index 1e5908a..3f1f57e 100644
--- a/gnome-panel/panel-separator.c
+++ b/gnome-panel/panel-separator.c
@@ -24,9 +24,10 @@
 
 #include <config.h>
 
-#include "panel-separator.h"
 #include "panel-background.h"
-#include "panel-profile.h"
+#include "panel-layout.h"
+
+#include "panel-separator.h"
 
 #define SEPARATOR_SIZE 10
 
@@ -258,12 +259,9 @@ void
 panel_separator_create (PanelToplevel *toplevel,
 			int            position)
 {
-	char *id;
-
-	id = panel_profile_prepare_object (PANEL_OBJECT_SEPARATOR,
-					   toplevel, position, FALSE);
-	panel_profile_add_to_list (PANEL_GCONF_OBJECTS, id);
-	g_free (id);
+	panel_layout_object_create (PANEL_OBJECT_SEPARATOR, NULL,
+				    panel_toplevel_get_toplevel_id (toplevel),
+				    position, FALSE);
 }
 
 void