From bbde4b542d9bff0493777362b80726945edb6df0 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Sat, 16 Jul 2005 12:56:37 +0000
Subject: [PATCH] r4013: Removed the option for choosing panel side for -S,
 since we can use the new method of choosing the panel side indead (Thomas
 Leonard).

---
 ROX-Filer/Help/Changes |  2 ++
 ROX-Filer/Options.xml  |  6 ------
 ROX-Filer/src/main.c   | 31 +++++++------------------------
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/ROX-Filer/Help/Changes b/ROX-Filer/Help/Changes
index 4dc8e098..b38b9acd 100644
--- a/ROX-Filer/Help/Changes
+++ b/ROX-Filer/Help/Changes
@@ -7,6 +7,8 @@
 Detect GCC 4 and disable pointer signedness warnings (Thomas Leonard).
 Mark files as executable if their MIME type is a subclass of
 application/x-executable (Thomas Leonard).
+Removed the option for choosing panel side for -S, since we can use the new
+method of choosing the panel side indead (Thomas Leonard).
 
 15-Jul-2005
 ~~~~~~~~~~~
diff --git a/ROX-Filer/Options.xml b/ROX-Filer/Options.xml
index 784bc527..21b2a862 100644
--- a/ROX-Filer/Options.xml
+++ b/ROX-Filer/Options.xml
@@ -236,12 +236,6 @@
     </radio-group>
 
     <frame label='Panel'>
-      <radio-group name='session_panel_position'>
-        <radio label='Top panel' value='0'>The panel is shown at the top of the screen</radio>
-        <radio label='Bottom panel' value='1'>The panel is shown at the bottom of the screen</radio>
-        <radio label='Left panel' value='2'>The panel is shown at the left hand side of the screen</radio>
-        <radio label='Right panel' value='3'>The panel is shown at the right hand side of the screen</radio>
-      </radio-group>
       <entry name='session_panel_name'>Enter the name of the panel to show here.</entry>
     </frame>
 
diff --git a/ROX-Filer/src/main.c b/ROX-Filer/src/main.c
index a10d153e..ffb056f9 100644
--- a/ROX-Filer/src/main.c
+++ b/ROX-Filer/src/main.c
@@ -175,7 +175,6 @@ enum {
 	SESSION_BOTH,
 };
 Option o_session_panel_or_pin;
-Option o_session_panel_position;
 Option o_session_panel_name;
 Option o_session_pinboard_name;
 
@@ -332,8 +331,6 @@ int main(int argc, char **argv)
 
 	option_add_int(&o_session_panel_or_pin, "session_panel_or_pin",
 		       SESSION_BOTH);
-	option_add_int(&o_session_panel_position, "session_panel_position",
-		       PANEL_BOTTOM);
 	option_add_string(&o_session_panel_name, "session_panel_name",
 			  "Default");
 	option_add_string(&o_session_pinboard_name, "session_pinboard_name",
@@ -796,36 +793,22 @@ static void xrandr_size_change(GdkScreen *screen, gpointer user_data)
 
 static void add_default_panel_and_pinboard(xmlNodePtr body)
 {
-	char *name, *side;
+	char *name;
 
-
-	if(o_session_panel_or_pin.int_value != SESSION_PANEL_ONLY)
+	if (o_session_panel_or_pin.int_value != SESSION_PANEL_ONLY)
 	{
 		name=o_session_pinboard_name.value;
-		if(!name[0])
+		if (!name[0])
 			name="Default";
 		soap_add(body, "Pinboard","Name", name, NULL, NULL);
 	}
 					
-	if(o_session_panel_or_pin.int_value != SESSION_PINBOARD_ONLY)
+	if (o_session_panel_or_pin.int_value != SESSION_PINBOARD_ONLY)
 	{
-		name=o_session_panel_name.value;
-		if(!name[0])
+		name = o_session_panel_name.value;
+		if (!name[0])
 			name="Default";
 		
-		switch(o_session_panel_position.int_value) {
-		case PANEL_TOP: side="Top"; break;
-		case PANEL_BOTTOM: side="Bottom"; break;
-		case PANEL_LEFT: side="Left"; break;
-		case PANEL_RIGHT: side="Right"; break;
-
-		default:
-			side="Unknown";
-			break;
-		}
-		
-		soap_add(body, "Panel", "Name", name, "Side", side);
+		soap_add(body, "Panel", "Name", name, NULL, NULL);
 	}
-
 }
-
-- 
2.11.4.GIT