From cc8ed9bf53023f7d0e422eceb8a8a4de656d4493 Mon Sep 17 00:00:00 2001
From: Tony Houghton <h@realh.co.uk>
Date: Mon, 3 Sep 2007 23:46:54 +0100
Subject: [PATCH] Got rid of panel options from main Options dialog.

No longer warn about options without widgets.
---
 ROX-Filer/Options.xml   | 21 ---------------------
 ROX-Filer/src/options.c |  6 +-----
 ROX-Filer/src/panel.c   | 38 --------------------------------------
 3 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/ROX-Filer/Options.xml b/ROX-Filer/Options.xml
index 6bc90d8d..b36497e1 100644
--- a/ROX-Filer/Options.xml
+++ b/ROX-Filer/Options.xml
@@ -219,27 +219,6 @@ indicator'>If this is on then files which have one or more extended attributes s
     </section>
   </section>
 
-  <section title='Panels'>
-    <label help='1'>Panels are bars of icons that run along the side of the screen. See the manual for information about using panels.</label>
-    <frame label='Panel style'>
-      <radio-group name='panel_style'>
-        <radio label='Image and text' value='0'>Every panel icon is shown with an image and some text.</radio>
-        <radio label='Image only for applications' value='1'>Applications have just an image, everything else has both an image and text.</radio>
-        <radio label='Image only' value='2'>Only the image is shown.</radio>
-      </radio-group>
-      <spacer/>
-      <slider name='panel_width' label='Panel width (thin)' min='16' max='96' end='(thick)'>The size of the panels.</slider>
-      <spacer/>
-      <toggle name='panel_avoid' label='Do not cover panel'>Ask the window manager not to cover panels at all when you maximise windows. Some window managers may not honour this. If unset, the filer asks for just a couple of pixels at the edge of the screen to remain uncovered, so that auto-raising works.</toggle>
-    </frame>
-    <frame label='Xinerama'>
-      <hbox>
-	<toggle name='panel_xinerama' label='Confine to Xinerama monitor'>If you have an Xinerama multi-monitor setup, use this option to confine the panels to one monitor instead of spanning them.</toggle>
-	<monitor-number name='panel_monitor' label='' min='0' max='1' width='1'>The monitor the panels are confined to in Xinerama mode (numbered from 0).</monitor-number>
-      </hbox>
-    </frame>
-  </section>
-
   <section title='Desktop'>
     <label help='1'>When run by a session manager program (such as ROX-Session) the filer can open up a panel and/or the pinboard.  Here you configure which.</label>
 
diff --git a/ROX-Filer/src/options.c b/ROX-Filer/src/options.c
index b17da736..4d0fe375 100644
--- a/ROX-Filer/src/options.c
+++ b/ROX-Filer/src/options.c
@@ -837,8 +837,6 @@ static void null_widget(gpointer key, gpointer value, gpointer data)
 {
 	Option	*option = (Option *) value;
 
-	g_return_if_fail(option->widget != NULL);
-
 	option->widget = NULL;
 }
 
@@ -1183,10 +1181,8 @@ static void update_cb(gpointer key, gpointer value, gpointer data)
 	Option *option = (Option *) value;
 
 	g_return_if_fail(option != NULL);
-	if (option->widget == NULL) {
-		g_warning("No widget for option %s", (char *) key);
+	if (option->widget == NULL)
 		return;
-	}
 
 	updating_widgets++;
 	
diff --git a/ROX-Filer/src/panel.c b/ROX-Filer/src/panel.c
index 537f78b0..c33da740 100644
--- a/ROX-Filer/src/panel.c
+++ b/ROX-Filer/src/panel.c
@@ -2116,44 +2116,6 @@ static void panel_style_changed(void)
 
 		g_idle_add((GtkFunction) recreate_panels, names);
 	}
-	
-	if (o_panel_style.has_changed)
-	{
-		for (i = 0; i < PANEL_NUMBER_OF_SIDES; i++)
-		{
-			if (current_panel[i])
-				panel_set_style(current_panel[i]);
-		}
-	}
-	if (o_panel_width.has_changed)
-	{
-		for (i = 0; i < PANEL_NUMBER_OF_SIDES; i++)
-		{
-			if (current_panel[i])
-				panel_update(current_panel[i]);
-		}
-	}
-
-	if (o_panel_xinerama.has_changed || o_panel_monitor.has_changed ||
-	    o_panel_avoid.has_changed)
-	{
-		//if (panel_check_xinerama() || o_panel_avoid.has_changed)
-		{
-			for (i = 0; i < PANEL_NUMBER_OF_SIDES; i++)
-			{
-				if (current_panel[i])
-				{
-					reposition_panel(
-						current_panel[i]->window,
-						&current_panel[i]->
-						    window->allocation,
-						current_panel[i]);
-					gtk_widget_queue_resize(
-						current_panel[i]->window);
-				}
-			}
-		}
-	}
 }
 
 static gboolean draw_panel_edge(GtkWidget *widget, GdkEventExpose *event,
-- 
2.11.4.GIT