Index: eel/eel-alert-dialog.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-alert-dialog.c,v
retrieving revision 1.4
diff -u -r1.4 eel-alert-dialog.c
--- eel/eel-alert-dialog.c	14 Nov 2005 15:32:51 -0000	1.4
+++ eel/eel-alert-dialog.c	3 Dec 2005 18:32:30 -0000
@@ -342,8 +342,7 @@
                       GtkMessageType type,
                       GtkButtonsType buttons,
                       const gchar   *primary_message,
-                      const gchar   *secondary_message,
-		      const gchar   *title)
+                      const gchar   *secondary_message)
 {
 	GtkWidget *widget;
 	GtkDialog *dialog;
@@ -362,10 +361,12 @@
 	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14);
 	gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 	gtk_dialog_set_has_separator (dialog, FALSE);
-  
-	gtk_window_set_title (GTK_WINDOW (dialog),
-	                      (title != NULL) ? title : "");
-	
+
+	/* Make sure we don't get a window title. 
+         * HIG says that alert dialogs should not have window title
+         */
+	gtk_window_set_title (GTK_WINDOW (dialog), "");
+  	
 	eel_alert_dialog_set_primary_label (EEL_ALERT_DIALOG (dialog),
 	                                    primary_message);
 		       
Index: eel/eel-alert-dialog.h
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-alert-dialog.h,v
retrieving revision 1.1
diff -u -r1.1 eel-alert-dialog.h
--- eel/eel-alert-dialog.h	11 Dec 2003 10:24:18 -0000	1.1
+++ eel/eel-alert-dialog.h	3 Dec 2005 18:32:30 -0000
@@ -49,8 +49,7 @@
                                                  GtkMessageType  type,
                                                  GtkButtonsType  buttons,
                                                  const gchar    *primary_message,
-                                                 const gchar    *secondary_message,
-                                                 const gchar    *title);
+                                                 const gchar    *secondary_message);
 void       eel_alert_dialog_set_primary_label   (EelAlertDialog *dialog,
 		                                 const gchar    *message);
 void       eel_alert_dialog_set_secondary_label (EelAlertDialog *dialog,
Index: eel/eel-gconf-extensions.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-gconf-extensions.c,v
retrieving revision 1.14
diff -u -r1.14 eel-gconf-extensions.c
--- eel/eel-gconf-extensions.c	27 Oct 2005 15:03:37 -0000	1.14
+++ eel/eel-gconf-extensions.c	3 Dec 2005 18:32:31 -0000
@@ -89,7 +89,6 @@
 			eel_show_error_dialog (message, 
 			                       _("All further errors shown "
 			                       "only on terminal."),
-					       _("GConf Error"), 
 			                       NULL);
 			g_free (message);
 		}
Index: eel/eel-gnome-extensions.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-gnome-extensions.c,v
retrieving revision 1.48
diff -u -r1.48 eel-gnome-extensions.c
--- eel/eel-gnome-extensions.c	2 Mar 2004 15:35:07 -0000	1.48
+++ eel/eel-gnome-extensions.c	3 Dec 2005 18:32:31 -0000
@@ -283,7 +283,6 @@
 	if (S_ISDIR (buf.st_mode)) {
 		eel_show_error_dialog (_("No image was selected."),
 		                       _("You must click on an image to select it."),
-				       _("No Selection Made"),
 				       selection_data->owning_window);
 	} else {	 
 		/* invoke the callback to inform it of the file path */
Index: eel/eel-open-with-dialog.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-open-with-dialog.c,v
retrieving revision 1.17
diff -u -r1.17 eel-open-with-dialog.c
--- eel/eel-open-with-dialog.c	27 Oct 2005 15:03:37 -0000	1.17
+++ eel/eel-open-with-dialog.c	3 Dec 2005 18:32:31 -0000
@@ -174,7 +174,6 @@
 	if (error) {
 		eel_show_error_dialog (_("Could not run application"),
 				       error->message,
-				       _("Could not run application"),
 				       GTK_WINDOW (dialog));
 		g_error_free (error);
 		retval = FALSE;
@@ -190,7 +189,6 @@
 
 		eel_show_error_dialog (_("Could not find application"),
 				       error_message,
-				       _("Could not find application"),
 				       GTK_WINDOW (dialog));
 		g_free (error_message);
 		retval = FALSE;
@@ -221,7 +219,6 @@
 	if (error) {
 		eel_show_error_dialog (_("Could not run application"),
 				       error->message,
-				       _("Could not run application"),
 				       GTK_WINDOW (dialog));
 		g_error_free (error);
 
@@ -289,7 +286,6 @@
 	if (!app) {
 		eel_show_error_dialog (_("Could not add application"),
 				       _("Could not add application to the application database"),
-				       _("Could not add application"),
 				       GTK_WINDOW (dialog));
 	}
 
Index: eel/eel-stock-dialogs.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-stock-dialogs.c,v
retrieving revision 1.29
diff -u -r1.29 eel-stock-dialogs.c
--- eel/eel-stock-dialogs.c	27 Oct 2005 15:03:37 -0000	1.29
+++ eel/eel-stock-dialogs.c	3 Dec 2005 18:32:32 -0000
@@ -51,7 +51,6 @@
 	gpointer callback_data;
 
 	/* Parameters for creation of the window. */
-	char *window_title;
 	char *wait_message;
 	GtkWindow *parent_window;
 
@@ -126,7 +125,6 @@
 
 	g_hash_table_remove (timed_wait_hash_table, wait);
 
-	g_free (wait->window_title);
 	g_free (wait->wait_message);
 	if (wait->parent_window != NULL) {
 		gtk_widget_unref (GTK_WIDGET (wait->parent_window));
@@ -213,8 +211,7 @@
 		                                   GTK_MESSAGE_INFO,
 		                                   GTK_BUTTONS_NONE,
 		                                   wait->wait_message,
-		                                   _("You can stop this operation by clicking cancel."),
-		                                   wait->window_title));
+		                                   _("You can stop this operation by clicking cancel.")));
 							
 	gtk_dialog_add_button (GTK_DIALOG (dialog), button, GTK_RESPONSE_OK);
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -257,20 +254,17 @@
 eel_timed_wait_start_with_duration (int duration,
 					 EelCancelCallback cancel_callback,
 					 gpointer callback_data,
-					 const char *window_title,
 					 const char *wait_message,
 					 GtkWindow *parent_window)
 {
 	TimedWait *wait;
 	
 	g_return_if_fail (callback_data != NULL);
-	g_return_if_fail (window_title != NULL);
 	g_return_if_fail (wait_message != NULL);
 	g_return_if_fail (parent_window == NULL || GTK_IS_WINDOW (parent_window));
 
 	/* Create the timed wait record. */
 	wait = g_new0 (TimedWait, 1);
-	wait->window_title = g_strdup (window_title);
 	wait->wait_message = g_strdup (wait_message);
 	wait->cancel_callback = cancel_callback;
 	wait->callback_data = callback_data;
@@ -296,14 +290,13 @@
 void
 eel_timed_wait_start (EelCancelCallback cancel_callback,
 			   gpointer callback_data,
-			   const char *window_title,
 			   const char *wait_message,
 			   GtkWindow *parent_window)
 {
 	eel_timed_wait_start_with_duration
 		(TIMED_WAIT_STANDARD_DURATION,
 		 cancel_callback, callback_data,
-		 window_title, wait_message, parent_window);
+		 wait_message, parent_window);
 }
 
 void
@@ -327,7 +320,7 @@
 int
 eel_run_simple_dialog (GtkWidget *parent, gboolean ignore_close_box,
 		       GtkMessageType message_type, const char *primary_text,
-		       const char *secondary_text, const char *title, ...)
+		       const char *secondary_text, ...)
 {
 	va_list button_title_args;
 	const char *button_title;
@@ -351,10 +344,9 @@
 	                               message_type,
 	                               GTK_BUTTONS_NONE,
 	                               primary_text,
-	                               secondary_text,
-	                               title);
+	                               secondary_text);
 	
-	va_start (button_title_args, title);
+	va_start (button_title_args, secondary_text);
 	response_id = 0;
 	while (1) {
 		button_title = va_arg (button_title_args, const char *);
@@ -382,7 +374,6 @@
 static GtkDialog *
 create_message_dialog (const char *primary_text,
 		       const char *secondary_text,
-		       const char *dialog_title,
 		       GtkMessageType type,
 		       GtkButtonsType buttons_type,
 		       GtkWindow *parent)
@@ -394,15 +385,13 @@
 	                               type,
 	                               buttons_type,
 	                               primary_text,
-	                               secondary_text,
-	                               dialog_title);
+	                               secondary_text);
 	return GTK_DIALOG (dialog);
 }
 
 static GtkDialog *
 show_message_dialog (const char *primary_text,
 		     const char *secondary_text,
-		     const char *dialog_title,
 		     GtkMessageType type,
 		     GtkButtonsType buttons_type,
 		     const char *details_text,
@@ -410,7 +399,7 @@
 {
 	GtkDialog *dialog;
 
-	dialog = create_message_dialog (primary_text, secondary_text, dialog_title, type, 
+	dialog = create_message_dialog (primary_text, secondary_text, type, 
 					buttons_type, parent);
 	if (details_text != NULL) {
 		eel_alert_dialog_set_details_label (EEL_ALERT_DIALOG (dialog), details_text);
@@ -426,13 +415,12 @@
 static GtkDialog *
 show_ok_dialog (const char *primary_text,
 		const char *secondary_text,
-		const char *dialog_title,
 		GtkMessageType type,
 		GtkWindow *parent)
 {  
 	GtkDialog *dialog;
 
-	dialog = show_message_dialog (primary_text, secondary_text, dialog_title, type,
+	dialog = show_message_dialog (primary_text, secondary_text, type,
 				      GTK_BUTTONS_OK, NULL, parent);
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 	
@@ -442,10 +430,9 @@
 GtkDialog *
 eel_create_info_dialog (const char *primary_text,
 			const char *secondary_text,
-			const char *dialog_title,
 			GtkWindow *parent)
 {
-	return create_message_dialog (primary_text, secondary_text, dialog_title,
+	return create_message_dialog (primary_text, secondary_text,
 				      GTK_MESSAGE_INFO,
 				      GTK_BUTTONS_OK,
 				      parent);
@@ -454,19 +441,16 @@
 GtkDialog *
 eel_show_info_dialog (const char *primary_text,
 		      const char *secondary_text,
-		      const char *dialog_title,
 		      GtkWindow *parent)
 {
 	return show_ok_dialog (primary_text, 
 			    secondary_text,
-			    dialog_title == NULL ? _("Info") : dialog_title, 
 			    GTK_MESSAGE_INFO, parent);
 }
 
 GtkDialog *
 eel_show_info_dialog_with_details (const char *primary_text,
 				   const char *secondary_text,
-				   const char *dialog_title,
 				   const char *detailed_info,
 				   GtkWindow *parent)
 {
@@ -474,12 +458,11 @@
 
 	if (detailed_info == NULL
 	    || strcmp (primary_text, detailed_info) == 0) {
-		return eel_show_info_dialog (primary_text, secondary_text, dialog_title, parent);
+		return eel_show_info_dialog (primary_text, secondary_text, parent);
 	}
 
 	dialog = show_message_dialog (primary_text,
 				      secondary_text,
-				      dialog_title == NULL ? _("Info") : dialog_title, 
 				      GTK_MESSAGE_INFO, 
 				      GTK_BUTTONS_OK,
 				      detailed_info,
@@ -493,12 +476,10 @@
 GtkDialog *
 eel_show_warning_dialog (const char *primary_text,
 			 const char *secondary_text,
-			 const char *dialog_title,
 			 GtkWindow *parent)
 {
 	return show_ok_dialog (primary_text, 
 			       secondary_text,
-			       dialog_title == NULL ? _("Warning") : dialog_title, 
 			       GTK_MESSAGE_WARNING, parent);
 }
 
@@ -506,19 +487,16 @@
 GtkDialog *
 eel_show_error_dialog (const char *primary_text,
 		       const char *secondary_text,
-		       const char *dialog_title,
 		       GtkWindow *parent)
 {
 	return show_ok_dialog (primary_text,
 			       secondary_text,
-			       dialog_title == NULL ? _("Error") : dialog_title, 
 			       GTK_MESSAGE_ERROR, parent);
 }
 
 GtkDialog *
 eel_show_error_dialog_with_details (const char *primary_text,
 				    const char *secondary_text,
-				    const char *dialog_title,
 				    const char *detailed_error_message,
 				    GtkWindow *parent)
 {
@@ -529,12 +507,11 @@
 
 	if (detailed_error_message == NULL
 	    || strcmp (primary_text, detailed_error_message) == 0) {
-		return eel_show_error_dialog (primary_text, secondary_text, dialog_title, parent);
+		return eel_show_error_dialog (primary_text, secondary_text, parent);
 	}
 	
 	dialog = show_message_dialog (primary_text, 
 				      secondary_text,
-				      dialog_title == NULL ? _("Error") : dialog_title,
 				      GTK_MESSAGE_ERROR,
 				      GTK_BUTTONS_OK, detailed_error_message,
 				      parent);
@@ -556,7 +533,6 @@
 GtkDialog *
 eel_show_yes_no_dialog (const char *primary_text, 
 			const char *secondary_text,
-			const char *dialog_title,
 			const char *yes_label,
 			const char *no_label,
 			GtkWindow *parent)
@@ -564,7 +540,6 @@
 	GtkDialog *dialog = NULL;
 	dialog = eel_create_question_dialog (primary_text,
 					     secondary_text,
-					     dialog_title == NULL ? _("Question") : dialog_title,
 					     no_label, GTK_RESPONSE_CANCEL,
 					     yes_label, GTK_RESPONSE_YES,
 					     GTK_WINDOW (parent));
@@ -588,7 +563,6 @@
 GtkDialog *
 eel_create_question_dialog (const char *primary_text,
 			    const char *secondary_text,
-			    const char *dialog_title,
 			    const char *answer_1,
 			    int response_1,
 			    const char *answer_2,
@@ -599,7 +573,6 @@
 	
 	dialog = create_message_dialog (primary_text,
 					secondary_text,
-					dialog_title == NULL ? _("Question") : dialog_title, 
 					GTK_MESSAGE_QUESTION,
 					GTK_BUTTONS_NONE,
 					parent);
Index: eel/eel-stock-dialogs.h
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-stock-dialogs.h,v
retrieving revision 1.8
diff -u -r1.8 eel-stock-dialogs.h
--- eel/eel-stock-dialogs.h	11 Dec 2003 10:24:18 -0000	1.8
+++ eel/eel-stock-dialogs.h	3 Dec 2005 18:32:32 -0000
@@ -33,13 +33,11 @@
 /* Dialog for cancelling something that normally is fast enough not to need a dialog. */
 void       eel_timed_wait_start               (EelCancelCallback  cancel_callback,
 					       gpointer           callback_data,
-					       const char        *window_title,
 					       const char        *wait_message,
 					       GtkWindow         *parent_window);
 void       eel_timed_wait_start_with_duration (int                duration,
 					       EelCancelCallback  cancel_callback,
 					       gpointer           callback_data,
-					       const char        *window_title,
 					       const char        *wait_message,
 					       GtkWindow         *parent_window);
 void       eel_timed_wait_stop                (EelCancelCallback  cancel_callback,
@@ -51,7 +49,6 @@
 					       GtkMessageType     message_type,
 					       const char        *primary_text,
 					       const char        *secondary_text,
-					       const char        *title,
 					       ...);
 
 /* Variations on gnome stock dialogs; these do line wrapping, we don't
@@ -61,35 +58,28 @@
  */
 GtkDialog *eel_show_info_dialog               (const char        *primary_text,
 					       const char        *secondary_text,
-					       const char        *dialog_title,
 					       GtkWindow         *parent);
 GtkDialog *eel_show_info_dialog_with_details  (const char        *primary_text,
 					       const char        *secondary_text,
-					       const char        *dialog_title,
 					       const char        *detailed_informative_message,
 					       GtkWindow         *parent);
 GtkDialog *eel_show_warning_dialog            (const char        *primary_text,
 					       const char        *secondary_text,
-					       const char        *dialog_title,
 					       GtkWindow         *parent);
 GtkDialog *eel_show_error_dialog              (const char        *primary_text,
 					       const char        *secondary_text,
-					       const char        *dialog_title,
 					       GtkWindow         *parent);
 GtkDialog *eel_show_error_dialog_with_details (const char        *primary_text,
 					       const char        *secondary_text,
-					       const char        *dialog_title,
 					       const char        *detailed_error_message,
 					       GtkWindow         *parent);
 GtkDialog *eel_show_yes_no_dialog             (const char        *primary_text,
 					       const char        *secondary_text,
-					       const char        *dialog_title,
 					       const char        *yes_label,
 					       const char        *no_label,
 					       GtkWindow         *parent);
 GtkDialog *eel_create_question_dialog         (const char        *primary_text,
 					       const char        *secondary_text,
-					       const char        *dialog_title,
 					       const char        *answer_one,
 					       int                response_one,
 					       const char        *answer_two,
@@ -97,7 +87,6 @@
 					       GtkWindow         *parent);
 GtkDialog *eel_create_info_dialog             (const char        *primary_text,
 					       const char        *secondary_text,
-					       const char        *dialog_title,
 					       GtkWindow         *parent);
 
 #endif /* EEL_STOCK_DIALOGS_H */
