7 files changed, 26 insertions, 31 deletions
diff --git a/data/default.layout b/data/default.layout
index c7aef160..77923b42 100644
--- a/data/default.layout
+++ b/data/default.layout
@@ -19,7 +19,7 @@ object-type=applet
 applet-iid=NotificationAreaAppletFactory::NotificationArea
 toplevel-id=top
 position=10
-relative-to-edge=end
+panel-right-stick=true
 locked=true
 
 [Object clock]
@@ -27,7 +27,7 @@ object-type=applet
 applet-iid=ClockAppletFactory::ClockApplet
 toplevel-id=top
 position=0
-relative-to-edge=end
+panel-right-stick=true
 locked=true
 
 [Object show-desktop]
@@ -49,5 +49,5 @@ object-type=applet
 applet-iid=WnckletFactory::WorkspaceSwitcherApplet
 toplevel-id=bottom
 position=0
-relative-to-edge=end
+panel-right-stick=true
 locked=true
diff --git a/data/fedora.layout b/data/fedora.layout
index c368c81b..ed55eca0 100644
--- a/data/fedora.layout
+++ b/data/fedora.layout
@@ -40,7 +40,7 @@ object-type=applet
 applet-iid=GvcAppletFactory::GvcApplet
 toplevel-id=top
 position=20
-relative-to-edge=end
+panel-right-stick=true
 locked=true
 
 [Object notification-area]
@@ -48,7 +48,7 @@ object-type=applet
 applet-iid=NotificationAreaAppletFactory::NotificationArea
 toplevel-id=top
 position=10
-relative-to-edge=end
+panel-right-stick=true
 locked=true
 
 [Object clock]
@@ -56,7 +56,7 @@ object-type=applet
 applet-iid=ClockAppletFactory::ClockApplet
 toplevel-id=top
 position=0
-relative-to-edge=end
+panel-right-stick=true
 locked=true
 
 [Object show-desktop]
@@ -78,5 +78,5 @@ object-type=applet
 applet-iid=WnckletFactory::WorkspaceSwitcherApplet
 toplevel-id=bottom
 position=0
-relative-to-edge=end
+panel-right-stick=true
 locked=true
diff --git a/data/linuxmint.layout b/data/linuxmint.layout
index 57ed5823..43d1b908 100644
--- a/data/linuxmint.layout
+++ b/data/linuxmint.layout
@@ -29,7 +29,7 @@ object-type=applet
 applet-iid=NotificationAreaAppletFactory::NotificationArea
 toplevel-id=bottom
 position=10
-relative-to-edge=end
+panel-right-stick=true
 locked=true
 
 [Object clock]
@@ -37,5 +37,5 @@ object-type=applet
 applet-iid=ClockAppletFactory::ClockApplet
 toplevel-id=bottom
 position=0
-relative-to-edge=end
+panel-right-stick=true
 locked=true
diff --git a/data/mageia.layout b/data/mageia.layout
index d0118a87..504a3377 100644
--- a/data/mageia.layout
+++ b/data/mageia.layout
@@ -40,7 +40,7 @@ object-type=applet
 applet-iid=NotificationAreaAppletFactory::NotificationArea
 toplevel-id=top
 position=10
-relative-to-edge=end
+panel-right-stick=true
 locked=true
 
 [Object clock]
@@ -48,7 +48,7 @@ object-type=applet
 applet-iid=ClockAppletFactory::ClockApplet
 toplevel-id=top
 position=0
-relative-to-edge=end
+panel-right-stick=true
 locked=true
 
 [Object show-desktop]
@@ -70,6 +70,6 @@ object-type=applet
 applet-iid=WnckletFactory::WorkspaceSwitcherApplet
 toplevel-id=bottom
 position=0
-relative-to-edge=end
+panel-right-stick=true
 locked=true
 
diff --git a/data/opensuse.layout b/data/opensuse.layout
index 8dd8a3d7..d0f96927 100644
--- a/data/opensuse.layout
+++ b/data/opensuse.layout
@@ -29,7 +29,7 @@ object-type=applet
 applet-iid=NotificationAreaAppletFactory::NotificationArea
 toplevel-id=bottom
 position=30
-relative-to-edge=end
+panel-right-stick=true
 locked=true
 
 [Object workspace-switcher]
@@ -37,7 +37,7 @@ object-type=applet
 applet-iid=WnckletFactory::WorkspaceSwitcherApplet
 toplevel-id=bottom
 position=20
-relative-to-edge=end
+panel-right-stick=true
 locked=true
 
 [Object clock]
@@ -45,7 +45,7 @@ object-type=applet
 applet-iid=ClockAppletFactory::ClockApplet
 toplevel-id=bottom
 position=10
-relative-to-edge=end
+panel-right-stick=true
 locked=true
 
 [Object show-desktop]
@@ -53,5 +53,5 @@ object-type=applet
 applet-iid=WnckletFactory::ShowDesktopApplet
 toplevel-id=bottom
 position=0
-relative-to-edge=end
+panel-right-stick=true
 locked=true
diff --git a/data/org.mate.panel.object.gschema.xml.in b/data/org.mate.panel.object.gschema.xml.in
index 441215ad..73656bc5 100644
--- a/data/org.mate.panel.object.gschema.xml.in
+++ b/data/org.mate.panel.object.gschema.xml.in
@@ -17,13 +17,8 @@
 </key>
 <key name="panel-right-stick" type="b">
 <default>false</default>
- <summary>Interpret position relative to bottom/right edge (DEPRECATED)</summary>
- <description>If true, the position of the object is interpreted relative to the right (or bottom if vertical) edge of the panel. This key is provided only for backward compatibility with old panel layouts; please set the "relative-to-edge" property instead.</description>
- </key>
- <key name="relative-to-edge" enum="org.mate.panel.PanelObjectEdgeRelativity">
- <default>'start'</default>
- <summary>Whether to interpret the value of the "position" key relative to the start, center or end of the panel</summary>
- <description>The position of the object is interpreted relative to one edge of the panel. The value of this key determines whether the object is positioned relative to the start (left/top edge), center, or end (right/bottom edge) of the panel. Valid values for this key are 'start', 'center', and 'end'.</description>
+ <summary>Interpret position relative to bottom/right edge</summary>
+ <description>If true, the position of the object is interpreted relative to the right (or bottom if vertical) edge of the panel.</description>
 </key>
 <key name="locked" type="b">
 <default>false</default>
diff --git a/data/ubuntu.layout b/data/ubuntu.layout
index 99317ae4..bab5164f 100644
--- a/data/ubuntu.layout
+++ b/data/ubuntu.layout
@@ -26,23 +26,23 @@ menu-path=applications:/
 object-type=applet
 applet-iid=NotificationAreaAppletFactory::NotificationArea
 toplevel-id=top
-position=20
-relative-to-edge=end
+position=30
+panel-right-stick=true
 locked=true
 
 [Object clock]
 object-type=applet
 applet-iid=ClockAppletFactory::ClockApplet
 toplevel-id=top
-position=10
-relative-to-edge=end
+position=20
+panel-right-stick=true
 locked=true
 
 [Object shutdown]
 action-type=shutdown
 object-type=action
-position=0
-relative-to-edge=end
+position=10
+panel-right-stick=true
 toplevel-id=top
 locked=true
 
@@ -65,7 +65,7 @@ object-type=applet
 applet-iid=WnckletFactory::WorkspaceSwitcherApplet
 toplevel-id=bottom
 position=10
-relative-to-edge=end
+panel-right-stick=true
 locked=true
 
 [Object trashapplet]
@@ -74,4 +74,4 @@ position=0
 toplevel-id=bottom
 applet-iid=TrashAppletFactory::TrashApplet
 object-type=applet
-relative-to-edge=end
+panel-right-stick=true