From 67278125a241019ad434042578de1795525b7ee7 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Fri, 30 Apr 2004 16:20:43 +0000
Subject: [PATCH] 2004-04-30  Mike Kestner  <mkestner@ximian.com>

	* sample/gconf/* : break System.Drawing dependency.

svn path=/trunk/gtk-sharp/; revision=26427
---
 ChangeLog                  | 4 ++++
 sample/gconf/Makefile.am   | 2 +-
 sample/gconf/main.cs       | 2 --
 sample/gconf/sample.schema | 9 ---------
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 281043593..9ca517bdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-30  Mike Kestner  <mkestner@ximian.com>
+
+	* sample/gconf/* : break System.Drawing dependency.
+
 2004-04-30  Owen Fraser-Green  <owen@discobabe.net>
 
 	* gconf/tools/gconfsharp-schemagen.in : fixed variables
diff --git a/sample/gconf/Makefile.am b/sample/gconf/Makefile.am
index 0a4229c5e..31a7735ab 100644
--- a/sample/gconf/Makefile.am
+++ b/sample/gconf/Makefile.am
@@ -4,7 +4,7 @@ FILES = 		\
 
 SCHEMA = $(srcdir)/sample.schema
 RESOURCES = /resource:$(srcdir)/sample.glade
-REFERENCES = /r:../../glib/glib-sharp.dll /r:../../pango/pango-sharp.dll /r:../../atk/atk-sharp.dll /r:../../art/art-sharp.dll /r:../../gdk/gdk-sharp.dll /r:$(GCONFDIR)/GConf/gconf-sharp.dll /r:../../gtk/gtk-sharp.dll /r:../../gnome/gnome-sharp.dll /r:../../glade/glade-sharp.dll /r:$(GCONFDIR)/GConf.PropertyEditors/gconf-sharp-peditors.dll /r:System.Drawing
+REFERENCES = /r:../../glib/glib-sharp.dll /r:../../pango/pango-sharp.dll /r:../../atk/atk-sharp.dll /r:../../art/art-sharp.dll /r:../../gdk/gdk-sharp.dll /r:$(GCONFDIR)/GConf/gconf-sharp.dll /r:../../gtk/gtk-sharp.dll /r:../../gnome/gnome-sharp.dll /r:../../glade/glade-sharp.dll /r:$(GCONFDIR)/GConf.PropertyEditors/gconf-sharp-peditors.dll
 
 top_builddir=../..
 GCONFDIR=$(top_builddir)/gconf
diff --git a/sample/gconf/main.cs b/sample/gconf/main.cs
index 4ea6f623e..6ac097ef1 100644
--- a/sample/gconf/main.cs
+++ b/sample/gconf/main.cs
@@ -55,11 +55,9 @@ namespace Sample
 			gxml.Autoconnect (new X ());
 
 			Settings.Changed += new NotifyEventHandler (Changed);
-			Settings.TheColorChanged += new NotifyEventHandler (ColorChanged);
 
 			EditorShell shell = new EditorShell (gxml);
 			shell.Add (SettingKeys.Enable, "enable");
-			shell.Add (SettingKeys.TheColor, "colorpicker");
 			shell.Add (SettingKeys.TheFilename, "fileentry");
 			shell.Add (SettingKeys.TheInteger, "spinbutton_int");
 			shell.Add (SettingKeys.TheFloat, "spinbutton_float");
diff --git a/sample/gconf/sample.schema b/sample/gconf/sample.schema
index 54d02409e..2eb5194c8 100644
--- a/sample/gconf/sample.schema
+++ b/sample/gconf/sample.schema
@@ -9,15 +9,6 @@
 	<default>true</default>
 	<locale name="C"></locale>
       </schema>
-      <schema>
-        <key>/schemas/apps/gconfsharp/sample_app/the_color</key>
-        <applyto>/apps/gconfsharp/sample_app/the_color</applyto>
-        <owner>sample_app</owner>
-        <type>string</type>
-        <cstype>color</cstype>
-	<locale name="C"></locale>
-	<default>#0000ff</default>
-      </schema>
       <schema>
         <key>/schemas/apps/gconfsharp/sample_app/the_filename</key>
         <applyto>/apps/gconfsharp/sample_app/the_filename</applyto>