Index: plugins/docinfo/docinfo.c
===================================================================
RCS file: /cvs/gnome/gedit/plugins/docinfo/docinfo.c,v
retrieving revision 1.21
diff -u -p -r1.21 docinfo.c
--- plugins/docinfo/docinfo.c	4 Jun 2003 10:20:05 -0000	1.21
+++ plugins/docinfo/docinfo.c	5 Jan 2004 15:03:03 -0000
@@ -102,7 +102,6 @@ dialog_response_handler (GtkDialog *dlg,
 	}
 }
 
-
 static DocInfoDialog*
 get_dialog ()
 {
@@ -120,9 +119,7 @@ get_dialog ()
 	{
 		gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog),
 				window);
-
 		gtk_window_present (GTK_WINDOW (dialog->dialog));
-		
 		gtk_widget_grab_focus (dialog->dialog);
 
 		return dialog;
@@ -130,10 +127,11 @@ get_dialog ()
 
 	gui = glade_xml_new (GEDIT_GLADEDIR "docinfo.glade2",
 			     "docinfo_dialog_content", NULL);
-
-	if (!gui) {
-		g_warning
-		    ("Could not find %s, reinstall gedit.\n", "docinfo.glade2");
+	if (!gui)
+	{
+		gedit_warning (window,
+			       MISSING_FILE,	
+			       GEDIT_GLADEDIR "docinfo.glade2");
 		return NULL;
 	}
 
@@ -148,14 +146,14 @@ get_dialog ()
 
 	g_return_val_if_fail (dialog->dialog != NULL, NULL);
 
+	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog->dialog), FALSE);
+
 	/* Add the update button */
 	gedit_dialog_add_button (GTK_DIALOG (dialog->dialog), 
 				 _("_Update"), GTK_STOCK_REFRESH, GTK_RESPONSE_OK);
 
-	content			= glade_xml_get_widget (gui, "docinfo_dialog_content");
-
-	g_return_val_if_fail (content != NULL, NULL);
-
+	content	= glade_xml_get_widget (gui, "docinfo_dialog_content");
 	dialog->file_name_label	= glade_xml_get_widget (gui, "file_name_label");
 	dialog->words_label	= glade_xml_get_widget (gui, "words_label");
 	dialog->bytes_label	= glade_xml_get_widget (gui, "bytes_label");
@@ -163,12 +161,19 @@ get_dialog ()
 	dialog->chars_label	= glade_xml_get_widget (gui, "chars_label");
 	dialog->chars_ns_label	= glade_xml_get_widget (gui, "chars_ns_label");
 
-	g_return_val_if_fail (dialog->file_name_label    != NULL, NULL);
-	g_return_val_if_fail (dialog->words_label        != NULL, NULL);
-	g_return_val_if_fail (dialog->bytes_label        != NULL, NULL);
-	g_return_val_if_fail (dialog->lines_label        != NULL, NULL);
-	g_return_val_if_fail (dialog->chars_label        != NULL, NULL);
-	g_return_val_if_fail (dialog->chars_ns_label     != NULL, NULL);
+	if (!content ||
+	    !dialog->file_name_label ||
+	    !dialog->words_label     ||
+	    !dialog->bytes_label     ||
+	    !dialog->lines_label     ||
+	    !dialog->chars_label     ||
+	    !dialog->chars_ns_label)
+	{
+		gedit_warning (window,
+			       MISSING_WIDGETS,
+			       GEDIT_GLADEDIR "docinfo.glade2");
+		return NULL;
+	}
 
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog->dialog)->vbox),
 			    content, FALSE, FALSE, 0);
@@ -177,15 +182,13 @@ get_dialog ()
 					 GTK_RESPONSE_OK);
 
 	g_signal_connect (G_OBJECT (dialog->dialog), "destroy",
-			   G_CALLBACK (dialog_destroyed), &dialog);
+			  G_CALLBACK (dialog_destroyed), &dialog);
 
 	g_signal_connect (G_OBJECT (dialog->dialog), "response",
-			   G_CALLBACK (dialog_response_handler), dialog);
+			  G_CALLBACK (dialog_response_handler), dialog);
 
 	g_object_unref (gui);
 
-	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
-
 	gtk_widget_show (dialog->dialog);
 
 	return dialog;
@@ -220,10 +223,8 @@ word_count_real (void)
 	gedit_debug (DEBUG_PLUGINS, "");
 
 	dialog = get_dialog ();
-	if (dialog == NULL) {
-		g_warning ("Could not create the Word Count dialog");
+	if (!dialog)
 		return;
-	}
 
 	doc = gedit_get_active_document ();
 
@@ -248,17 +249,13 @@ word_count_real (void)
                        attrs,
                        chars + 1);
 
-	i = 0;
-	
-	while (i < chars)
+	for (i = 0; i < chars; i++)
 	{
 		if (attrs [i].is_white)
 			++white_chars;
 
 		if (attrs [i].is_word_start)
 			++words;
-
-		++i;
 	}
 
 	if (chars == 0)
@@ -298,9 +295,6 @@ word_count_real (void)
 	tmp_str = g_strdup_printf("%d", bytes);
 	gtk_label_set_text (GTK_LABEL (dialog->bytes_label), tmp_str);
 	g_free (tmp_str);
-
-
-		
 }
 
 G_MODULE_EXPORT GeditPluginState
@@ -367,6 +361,3 @@ init (GeditPlugin *pd)
 	return PLUGIN_OK;
 }
 
-
-
-
Index: plugins/shell_output/shell_output.c
===================================================================
RCS file: /cvs/gnome/gedit/plugins/shell_output/shell_output.c,v
retrieving revision 1.40
diff -u -p -r1.40 shell_output.c
--- plugins/shell_output/shell_output.c	21 Oct 2003 16:04:13 -0000	1.40
+++ plugins/shell_output/shell_output.c	5 Jan 2004 15:03:05 -0000
@@ -229,29 +229,9 @@ dialog_response_handler (GtkDialog *dlg,
 			gtk_widget_destroy (dialog->dialog);
 
 			break;
-
 		}
 }
 
-static void
-display_error_dialog (GtkWindow *parent)
-{
-	GtkWidget *err_dialog;
-	
-	err_dialog = gtk_message_dialog_new (
-			parent,
-			GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-		   	GTK_MESSAGE_ERROR,
-		   	GTK_BUTTONS_OK,
-			_("An error occured while running the selected command."));
-			
-	gtk_dialog_set_default_response (GTK_DIALOG (err_dialog), GTK_RESPONSE_OK);
-	gtk_window_set_resizable (GTK_WINDOW (err_dialog), FALSE);
-
-	gtk_dialog_run (GTK_DIALOG (err_dialog));
-	gtk_widget_destroy (err_dialog);
-}
-
 static ShellOutputDialog*
 get_dialog (void)
 {
@@ -284,10 +264,11 @@ get_dialog (void)
 
 	gui = glade_xml_new (GEDIT_GLADEDIR "shell_output.glade2",
 			     "shell_output_dialog_content", NULL);
-
-	if (!gui) {
-		g_warning
-		    ("Could not find shell_output.glade2, reinstall gedit.\n");
+	if (!gui)
+	{
+		gedit_warning (window,
+			       MISSING_FILE,	
+			       GEDIT_GLADEDIR "shell_output.glade2");
 		return NULL;
 	}
 
@@ -298,7 +279,6 @@ get_dialog (void)
 
 	dialog->toplevel_window = window;
 
-
 	dialog->dialog = gtk_dialog_new_with_buttons (_("Run Command"),
 						      window,
 						      GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -308,6 +288,9 @@ get_dialog (void)
 
 	g_return_val_if_fail (dialog->dialog != NULL, NULL);
 
+	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog->dialog), FALSE);
+
 	/* Add the run button */
 	dialog->close_button = gtk_dialog_add_button (GTK_DIALOG (dialog->dialog), 
 					GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
@@ -317,27 +300,29 @@ get_dialog (void)
 	dialog->run_button =  gedit_dialog_add_button (GTK_DIALOG (dialog->dialog), 
 				 _("_Run"), GTK_STOCK_EXECUTE, GTK_RESPONSE_OK);
 
-	content			= glade_xml_get_widget (gui, "shell_output_dialog_content");
-
-	g_return_val_if_fail (content != NULL, NULL);
-
+	content	= glade_xml_get_widget (gui, "shell_output_dialog_content");
 	dialog->command    	= glade_xml_get_widget (gui, "command_entry");
 	dialog->command_list   	= glade_xml_get_widget (gui, "command_entry_list");
-
 	dialog->directory  	= glade_xml_get_widget (gui, "directory_entry");
 	dialog->directory_fileentry = glade_xml_get_widget (gui, "directory_fileentry");
 	dialog->capture_output  = glade_xml_get_widget (gui, "capture_ouput_checkbutton");
-
 	dialog->command_label  	= glade_xml_get_widget (gui, "command_label");
 	dialog->directory_label	= glade_xml_get_widget (gui, "directory_label");
 
-	g_return_val_if_fail (dialog->command != NULL, NULL);
-	g_return_val_if_fail (dialog->command_label != NULL, NULL);
-	g_return_val_if_fail (dialog->command_list != NULL, NULL);
-	g_return_val_if_fail (dialog->directory != NULL, NULL);
-	g_return_val_if_fail (dialog->directory_fileentry != NULL, NULL);
-	g_return_val_if_fail (dialog->directory_label != NULL, NULL);
-	g_return_val_if_fail (dialog->capture_output != NULL, NULL);
+	if (!content ||
+	    !dialog->command             ||
+	    !dialog->command_label       ||
+	    !dialog->command_list        ||
+	    !dialog->directory           ||
+	    !dialog->directory_fileentry ||
+	    !dialog->directory_label     ||
+	    !dialog->capture_output)
+	{
+		gedit_warning (window,
+			       MISSING_WIDGETS,
+			       GEDIT_GLADEDIR "docinfo.glade2");
+		return NULL;
+	}
 
 	gtk_entry_set_text (GTK_ENTRY (dialog->directory), current_directory);
 
@@ -348,21 +333,18 @@ get_dialog (void)
 					 GTK_RESPONSE_OK);
 
 	g_signal_connect (G_OBJECT (dialog->dialog), "destroy",
-			   G_CALLBACK (dialog_destroyed), &dialog);
+			  G_CALLBACK (dialog_destroyed), &dialog);
 
 	g_signal_connect (G_OBJECT (dialog->dialog), "response",
-			   G_CALLBACK (dialog_response_handler), dialog);
+			  G_CALLBACK (dialog_response_handler), dialog);
 
 	g_object_unref (gui);
 
-	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
-
 	gtk_widget_grab_focus (dialog->command);
 
 	gtk_widget_show (dialog->dialog);
 
 	return dialog;
-
 }
 
 static void
@@ -373,13 +355,10 @@ run_command_cb (BonoboUIComponent *uic, 
 	gedit_debug (DEBUG_PLUGINS, "");
 
 	dialog = get_dialog ();
-	if (dialog == NULL) {
-		g_warning ("Could not create the Shell Output dialog");
+	if (!dialog)
 		return;
-	}
 }
 
-
 static gboolean
 handle_command_output (GIOChannel *ioc, GIOCondition condition, gpointer data) 
 {
@@ -693,23 +672,9 @@ run_command_real (ShellOutputDialog *dia
 
 	if (command_string == NULL || (strlen (command_string) == 0))
 	{
-		GtkWidget *err_dialog;
-		
-		err_dialog = gtk_message_dialog_new (
-				GTK_WINDOW (dialog->dialog),
-				GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-			   	GTK_MESSAGE_ERROR,
-			   	GTK_BUTTONS_OK,
+		gedit_warning (GTK_WINDOW (dialog->dialog),
 				_("The shell command entry is empty.\n\n"
 				  "Please, insert a valid shell command."));
-			
-		gtk_dialog_set_default_response (GTK_DIALOG (err_dialog), GTK_RESPONSE_OK);
-
-		gtk_window_set_resizable (GTK_WINDOW (err_dialog), FALSE);
-
-		gtk_dialog_run (GTK_DIALOG (err_dialog));
-  		gtk_widget_destroy (err_dialog);
-
 		return FALSE;
 	}
 
@@ -726,23 +691,9 @@ run_command_real (ShellOutputDialog *dia
                            NULL, &argv,
                            NULL))
 	{
-		GtkWidget *err_dialog;
-		
-		err_dialog = gtk_message_dialog_new (
-				GTK_WINDOW (dialog->dialog),
-				GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-			   	GTK_MESSAGE_ERROR,
-			   	GTK_BUTTONS_OK,
+		gedit_warning (GTK_WINDOW (dialog->dialog),
 				_("Error parsing the shell command.\n\n"
 				  "Please, insert a valid shell command."));
-			
-		gtk_dialog_set_default_response (GTK_DIALOG (err_dialog), GTK_RESPONSE_OK);
-
-		gtk_window_set_resizable (GTK_WINDOW (err_dialog), FALSE);
-
-		gtk_dialog_run (GTK_DIALOG (err_dialog));
-  		gtk_widget_destroy (err_dialog);
-
 		g_free (unescaped_command_string);
 		
 		return FALSE;
@@ -886,10 +837,10 @@ run_command_real (ShellOutputDialog *dia
 	{
 		running = NOT_RUNNING;
 
-		display_error_dialog (GTK_WINDOW (dialog->dialog));
-		
-		g_free (unescaped_command_string);
+		gedit_warning (GTK_WINDOW (dialog->dialog),
+			       _("An error occured while running the selected command."));
 
+		g_free (unescaped_command_string);
 		gtk_widget_destroy (dialog->dialog);
 
 		return FALSE;
Index: plugins/sort/sort.c
===================================================================
RCS file: /cvs/gnome/gedit/plugins/sort/sort.c,v
retrieving revision 1.9
diff -u -p -r1.9 sort.c
--- plugins/sort/sort.c	30 Jun 2003 14:14:08 -0000	1.9
+++ plugins/sort/sort.c	5 Jan 2004 15:03:05 -0000
@@ -17,6 +17,7 @@
 #include <gedit/gedit-menus.h>
 #include <gedit/gedit-document.h>
 #include <gedit/gedit-debug.h>
+#include <gedit/gedit-utils.h>
 #include <gedit/gedit-view.h>
 #include <gedit/gedit-plugin.h>
 
@@ -104,7 +105,6 @@ dialog_response_handler (GtkDialog * dlg
 	}
 }
 
-
 static SortDialog *
 get_dialog ()
 {
@@ -117,7 +117,8 @@ get_dialog ()
 
 	window = GTK_WINDOW (gedit_get_active_window ());
 
-	if (dialog != NULL) {
+	if (dialog != NULL)
+	{
 		gtk_widget_grab_focus (dialog->dialog);
 
 		gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog),
@@ -130,16 +131,16 @@ get_dialog ()
 
 	gui = glade_xml_new (GEDIT_GLADEDIR "sort.glade2",
 			     "sort_dialog", NULL);
-
-	if (!gui) {
-		g_warning
-		    ("Could not find sort.glade2, reinstall gedit.\n");
+	if (!gui)
+	{
+		gedit_warning (window,
+			       MISSING_FILE,
+		    	       GEDIT_GLADEDIR "sort.glade2");
 		return NULL;
 	}
 
 	dialog = g_new0 (SortDialog, 1);
 
-	/* Save some references to the main dialog widgets */
 	dialog->dialog = glade_xml_get_widget (gui, "sort_dialog");
 	dialog->reverse_order_checkbutton =
 	    glade_xml_get_widget (gui, "reverse_order_checkbutton");
@@ -150,11 +151,17 @@ get_dialog ()
 	dialog->remove_dups_checkbutton =
 	    glade_xml_get_widget (gui, "remove_dups_checkbutton");
 
-	g_return_val_if_fail (dialog->dialog, NULL);
-	g_return_val_if_fail (dialog->reverse_order_checkbutton, NULL);
-	g_return_val_if_fail (dialog->col_num_spinbutton, NULL);
-	g_return_val_if_fail (dialog->ignore_case_checkbutton, NULL);
-	g_return_val_if_fail (dialog->remove_dups_checkbutton, NULL);
+	if (!dialog->dialog ||
+	    !dialog->reverse_order_checkbutton ||
+	    !dialog->col_num_spinbutton        ||
+	    !dialog->ignore_case_checkbutton   ||
+	    !dialog->remove_dups_checkbutton)
+	{
+		gedit_warning (window,
+			       MISSING_WIDGETS,
+			       GEDIT_GLADEDIR "sort.glade2");
+		return NULL;
+	}
 
 	g_signal_connect (G_OBJECT (dialog->dialog), "destroy",
 			  G_CALLBACK (dialog_destroyed), &dialog);
@@ -175,20 +182,16 @@ get_dialog ()
 	return dialog;
 }
 
-
 static void
-sort_cb (BonoboUIComponent * uic, gpointer user_data,
-	 const gchar * verbname)
+sort_cb (BonoboUIComponent * uic, gpointer user_data, const gchar *verbname)
 {
 	SortDialog *dialog = NULL;
 
 	gedit_debug (DEBUG_PLUGINS, "");
 
 	dialog = get_dialog ();
-
-	if (dialog == NULL)
-		g_warning ("Could not create the Word Count dialog");
-
+	if (!dialog)
+		return;
 }
 
 /*
@@ -284,7 +287,6 @@ my_compare (const void *s1, const void *
 }
 
 /* The function that actually does the work */
-
 static void
 sort_document (SortDialog * dlg)
 {
@@ -406,9 +408,7 @@ sort_document (SortDialog * dlg)
 	gedit_document_end_not_undoable_action (doc);
 
 	g_free (lines);
-
 	g_free (buffer);
-
 	g_free (sort_info);
 
 	gedit_debug (DEBUG_PLUGINS, "Done.");
@@ -481,8 +481,6 @@ update_ui (GeditPlugin * plugin, BonoboW
 	return PLUGIN_OK;
 }
 
-
-
 /*
  * Initialise basic plugin information
  */
@@ -496,3 +494,4 @@ init (GeditPlugin * pd)
 
 	return PLUGIN_OK;
 }
+
Index: plugins/sort/sort.glade2
===================================================================
RCS file: /cvs/gnome/gedit/plugins/sort/sort.glade2,v
retrieving revision 1.4
diff -u -p -r1.4 sort.glade2
--- plugins/sort/sort.glade2	11 Jun 2003 21:06:51 -0000	1.4
+++ plugins/sort/sort.glade2	5 Jan 2004 15:03:06 -0000
@@ -11,7 +11,7 @@
   <property name="modal">True</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
+  <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
Index: plugins/spell/languages-dialog.glade2
===================================================================
RCS file: /cvs/gnome/gedit/plugins/spell/languages-dialog.glade2,v
retrieving revision 1.1
diff -u -p -r1.1 languages-dialog.glade2
--- plugins/spell/languages-dialog.glade2	13 Sep 2002 16:58:20 -0000	1.1
+++ plugins/spell/languages-dialog.glade2	5 Jan 2004 15:03:06 -0000
@@ -10,7 +10,7 @@
   <property name="modal">True</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">True</property>
-  <property name="has_separator">True</property>
+  <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
Index: plugins/time/time.c
===================================================================
RCS file: /cvs/gnome/gedit/plugins/time/time.c,v
retrieving revision 1.41
diff -u -p -r1.41 time.c
--- plugins/time/time.c	2 Jan 2004 13:31:45 -0000	1.41
+++ plugins/time/time.c	5 Jan 2004 15:03:08 -0000
@@ -285,7 +285,6 @@ set_custom_format (const gchar *format)
 		       		 format, NULL);
 }
 
-
 static char *
 get_time (const gchar* format)
 {
@@ -543,9 +542,10 @@ get_configure_dialog (GtkWindow* parent)
 	gui = glade_xml_new (GEDIT_GLADEDIR "time.glade2",
 			     "time_dialog_content", NULL);   
 	if (!gui) 
-        {
-		g_warning
-		    ("Could not find time.glade2, reinstall gedit.\n");
+	{
+		gedit_warning (parent,
+			       MISSING_FILE,	
+			       GEDIT_GLADEDIR "time.glade2");
 		return NULL;
 	}
 
@@ -565,6 +565,9 @@ get_configure_dialog (GtkWindow* parent)
 
 	g_return_val_if_fail (dialog->dialog != NULL, NULL);
 
+	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog->dialog), FALSE);
+
 	content		= glade_xml_get_widget (gui, "time_dialog_content");
 	viewport 	= glade_xml_get_widget (gui, "formats_viewport");
 	dialog->list 	= glade_xml_get_widget (gui, "formats_tree");
@@ -574,19 +577,25 @@ get_configure_dialog (GtkWindow* parent)
         dialog->custom_entry = glade_xml_get_widget (gui, "custom_entry");
 	dialog->custom_format_example = glade_xml_get_widget (gui, "custom_format_example");
 
-	g_return_val_if_fail (content != NULL, NULL);
-	g_return_val_if_fail (viewport != NULL, NULL);
-	g_return_val_if_fail (dialog->list != NULL, NULL);
-	g_return_val_if_fail (dialog->prompt != NULL, NULL);
-	g_return_val_if_fail (dialog->use_list != NULL, NULL);
-	g_return_val_if_fail (dialog->custom != NULL, NULL);
-	g_return_val_if_fail (dialog->custom_entry != NULL, NULL);
-	g_return_val_if_fail (dialog->custom_format_example != NULL, NULL);
+	if (!content              ||
+	    !viewport             ||
+	    !dialog->list         ||
+	    !dialog->prompt       ||
+	    !dialog->use_list     ||
+	    !dialog->custom       ||
+	    !dialog->custom_entry ||
+	    !dialog->custom_format_example)
+	{
+		gedit_warning (parent,
+			       MISSING_WIDGETS,
+			       GEDIT_GLADEDIR "time.glade2");
+		return NULL;
+	}
 
 	sf = get_selected_format ();
 	create_formats_list (dialog->list, sf);
 	g_free (sf);
-	
+
 	prompt_type = get_prompt_type ();
 
 	cf = get_custom_format ();
@@ -651,8 +660,6 @@ get_configure_dialog (GtkWindow* parent)
 
 	g_object_unref (gui);
 
-	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
-
 	gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog),
 				parent);
 
@@ -694,9 +701,10 @@ get_chose_format_dialog (GtkWindow *pare
 	gui = glade_xml_new (GEDIT_GLADEDIR "time.glade2",
 			     "chose_format_dialog", NULL);
 	if (!gui) 
-        {
-		g_warning
-		    ("Could not find time.glade2, reinstall gedit.\n");
+	{
+		gedit_warning (parent,
+			       MISSING_FILE,	
+			       GEDIT_GLADEDIR "time.glade2");
 		return NULL;
 	}
 
@@ -709,12 +717,18 @@ get_chose_format_dialog (GtkWindow *pare
 	dialog->custom_entry	= glade_xml_get_widget (gui, "custom_entry");
 	dialog->custom_format_example = glade_xml_get_widget (gui, "custom_format_example");
 
-	g_return_val_if_fail (dialog->dialog != NULL, NULL);
-	g_return_val_if_fail (dialog->list != NULL, NULL);
-	g_return_val_if_fail (dialog->use_list != NULL, NULL);
-	g_return_val_if_fail (dialog->custom != NULL, NULL);
-	g_return_val_if_fail (dialog->custom_entry != NULL, NULL);
-	g_return_val_if_fail (dialog->custom_format_example != NULL, NULL);
+	if (!dialog->dialog       ||
+	    !dialog->list         ||
+	    !dialog->use_list     ||
+	    !dialog->custom       ||
+	    !dialog->custom_entry ||
+	    !dialog->custom_format_example)
+	{
+		gedit_warning (parent,
+			       MISSING_WIDGETS,
+			       GEDIT_GLADEDIR "time.glade2");
+		return NULL;
+	}
 
 	if (dialog_selected_format == NULL)
 		dialog_selected_format = get_selected_format ();
@@ -905,7 +919,6 @@ gint get_format_from_list(GtkWidget *lis
         return selected_value;
 }
 
-
 static void
 ok_button_pressed (TimeConfigureDialog *dialog)
 {
@@ -939,7 +952,6 @@ ok_button_pressed (TimeConfigureDialog *
 	gedit_debug (DEBUG_PLUGINS, "Sel: %d", sel_format);
 }
 
-
 static void
 help_button_pressed (TimeConfigureDialog *dialog)
 {
@@ -957,7 +969,6 @@ help_button_pressed (TimeConfigureDialog
 	}
 }
 
-
 G_MODULE_EXPORT GeditPluginState
 configure (GeditPlugin *p, GtkWidget *parent)
 {
@@ -967,13 +978,8 @@ configure (GeditPlugin *p, GtkWidget *pa
 	gedit_debug (DEBUG_PLUGINS, "");
 	
 	dialog = get_configure_dialog (GTK_WINDOW (parent));
-
-	if (dialog == NULL) 
-	{
-		g_warning
-		    ("Could not create the configure dialog.\n");
+	if (!dialog) 
 		return PLUGIN_ERROR;
-	}
 
 	do
 	{
@@ -1105,6 +1111,3 @@ init (GeditPlugin *pd)
 	return PLUGIN_OK;
 }
 
-
-
-
Index: plugins/time/time.glade2
===================================================================
RCS file: /cvs/gnome/gedit/plugins/time/time.glade2,v
retrieving revision 1.6
diff -u -p -r1.6 time.glade2
--- plugins/time/time.glade2	9 Dec 2002 14:40:51 -0000	1.6
+++ plugins/time/time.glade2	5 Jan 2004 15:03:10 -0000
@@ -10,7 +10,7 @@
   <property name="modal">False</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
+  <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
@@ -353,7 +353,7 @@
   <property name="modal">True</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">True</property>
-  <property name="has_separator">True</property>
+  <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox2">
