Index: data/gconf-editor.schemas.in
===================================================================
RCS file: /cvs/gnome/gconf-editor/data/gconf-editor.schemas.in,v
retrieving revision 1.1
diff -u -r1.1 gconf-editor.schemas.in
--- data/gconf-editor.schemas.in	18 Jun 2004 11:02:03 -0000	1.1
+++ data/gconf-editor.schemas.in	25 Jun 2004 12:22:07 -0000
@@ -12,18 +12,5 @@
 	<long>gconf-editor folder bookmarks</long>
       </locale>
     </schema>
-
-    <schema>
-      <key>/schemas/apps/gconf-editor/dialog-settings/caveat-dialog</key>
-      <applyto>/apps/gconf-editor/dialog-settings/caveat-dialog</applyto>
-      <owner>gconf-editor</owner>
-      <type>bool</type>
-      <default>0</default>
-      <locale name="C">
-	<short>Skip caveat dialog</short>
-	<long>This key defines if gconf-editor should skip the warning dialog</long>
-      </locale>
-    </schema>
-
-  </schemalist>
+ </schemalist>
 </gconfschemafile>
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/gconf-editor/src/Makefile.am,v
retrieving revision 1.15
diff -u -r1.15 Makefile.am
--- src/Makefile.am	23 Apr 2004 07:56:47 -0000	1.15
+++ src/Makefile.am	25 Jun 2004 12:22:07 -0000
@@ -25,8 +25,6 @@
 	gconf-key-editor.h		\
 	gconf-list-model.c		\
 	gconf-list-model.h		\
-	gconf-message-dialog.c		\
-	gconf-message-dialog.h		\
 	gconf-stock-icons.c		\
 	gconf-stock-icons.h		\
 	gconf-tree-model.c		\
Index: src/main.c
===================================================================
RCS file: /cvs/gnome/gconf-editor/src/main.c,v
retrieving revision 1.9
diff -u -r1.9 main.c
--- src/main.c	18 Jun 2004 16:41:32 -0000	1.9
+++ src/main.c	25 Jun 2004 12:22:07 -0000
@@ -23,7 +23,6 @@
 
 #include "gconf-editor-application.h"
 #include "gconf-stock-icons.h"
-#include "gconf-message-dialog.h"
 #include "gconf-editor-window.h"
 
 
@@ -51,7 +50,7 @@
 gint
 main (gint argc, gchar **argv)
 {
-	GtkWidget *window, *dialog;
+	GtkWidget *window;
 
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -79,20 +78,7 @@
 			g_free (reason);
 		}
 	}
-	
-	/* Put up a caveat dialog */
-	if (gconf_message_dialog_should_show ("caveat-dialog")) {
-		dialog = gconf_message_dialog_new (GTK_WINDOW (window), 0,
-						   GTK_MESSAGE_WARNING,
-						   GTK_BUTTONS_OK,
-						   "caveat-dialog",
-						   _("This tool allows you to directly edit your configuration database. "
-						     "This is not the recommended way of setting desktop preferences. "
-						     "Use this tool at your own risk."));
-		gtk_dialog_run (GTK_DIALOG (dialog));
-		gtk_widget_destroy (dialog);
-	}
-	
+
 	gtk_main ();
 	
 	return 0;
