EMFolderSelector: Remove 'title' argument when creating.

Just call gtk_window_set_title() after creating the dialog.

This makes EMFolderSelector a little more "subclassable".

7 files changed, 25 insertions, 21 deletions

diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 7ffda86799..a35da4d3b4 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -342,8 +342,9 @@ action_mail_copy_cb (GtkAction *action,
 
 	model = em_folder_tree_model_get_default ();
 
-	dialog = em_folder_selector_new (
-		window, model, _("Copy to Folder"));
+	dialog = em_folder_selector_new (window, model);
+
+	gtk_window_set_title (GTK_WINDOW (dialog), _("Copy to Folder"));
 
 	selector = EM_FOLDER_SELECTOR (dialog);
 	em_folder_selector_set_can_create (selector, TRUE);
@@ -843,8 +844,9 @@ action_mail_move_cb (GtkAction *action,
 
 	model = em_folder_tree_model_get_default ();
 
-	dialog = em_folder_selector_new (
-		window, model, _("Move to Folder"));
+	dialog = em_folder_selector_new (window, model);
+
+	gtk_window_set_title (GTK_WINDOW (dialog), _("Move to Folder"));
 
 	selector = EM_FOLDER_SELECTOR (dialog);
 	em_folder_selector_set_can_create (selector, TRUE);
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index c8f57f064a..44fd49c45c 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -3036,8 +3036,9 @@ post_header_clicked_cb (EComposerPostHeader *header,
 	model = em_folder_tree_model_get_default ();
 
 	dialog = em_folder_selector_new (
-		/* FIXME GTK_WINDOW (composer) */ NULL,
-		model, _("Posting destination"));
+		/* FIXME GTK_WINDOW (composer) */ NULL, model);
+
+	gtk_window_set_title (GTK_WINDOW (dialog), _("Posting destination"));
 
 	selector = EM_FOLDER_SELECTOR (dialog);
 	em_folder_selector_set_can_create (selector, TRUE);
diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c
index 7ba1a1d9f9..b43eb3e99d 100644
--- a/mail/em-folder-selection-button.c
+++ b/mail/em-folder-selection-button.c
@@ -269,7 +269,9 @@ folder_selection_button_clicked (GtkButton *button)
 	if (model == NULL)
 		model = g_object_ref (em_folder_tree_model_get_default ());
 
-	dialog = em_folder_selector_new (parent, model, priv->title);
+	dialog = em_folder_selector_new (parent, model);
+
+	gtk_window_set_title (GTK_WINDOW (dialog), priv->title);
 
 	g_object_unref (model);
 
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 7f1274c885..76b5cc5940 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -483,8 +483,7 @@ folder_selector_construct (EMFolderSelector *selector)
 
 GtkWidget *
 em_folder_selector_new (GtkWindow *parent,
-                        EMFolderTreeModel *model,
-                        const gchar *title)
+                        EMFolderTreeModel *model)
 {
 	EMFolderSelector *selector;
 
@@ -493,7 +492,6 @@ em_folder_selector_new (GtkWindow *parent,
 	selector = g_object_new (
 		EM_TYPE_FOLDER_SELECTOR,
 		"transient-for", parent,
-		"title", title,
 		"model", model, NULL);
 	folder_selector_construct (selector);
 
@@ -531,8 +529,7 @@ folder_selector_create_name_activate (GtkEntry *entry,
 
 GtkWidget *
 em_folder_selector_create_new (GtkWindow *parent,
-                               EMFolderTreeModel *model,
-                               const gchar *title)
+                               EMFolderTreeModel *model)
 {
 	EMFolderSelector *selector;
 	EMFolderTree *folder_tree;
@@ -545,7 +542,6 @@ em_folder_selector_create_new (GtkWindow *parent,
 	selector = g_object_new (
 		EM_TYPE_FOLDER_SELECTOR,
 		"transient-for", parent,
-		"title", title,
 		"model", model,
 		"default-button-label", _("C_reate"), NULL);
 
diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h
index a6e78de8bd..6037b2bce3 100644
--- a/mail/em-folder-selector.h
+++ b/mail/em-folder-selector.h
@@ -62,11 +62,9 @@ struct _EMFolderSelectorClass {
 
 GType		em_folder_selector_get_type	(void);
 GtkWidget *	em_folder_selector_new		(GtkWindow *parent,
-						 EMFolderTreeModel *model,
-						 const gchar *title);
+						 EMFolderTreeModel *model);
 GtkWidget *	em_folder_selector_create_new	(GtkWindow *parent,
-						 EMFolderTreeModel *model,
-						 const gchar *title);
+						 EMFolderTreeModel *model);
 gboolean	em_folder_selector_get_can_create
 						(EMFolderSelector *selector);
 void		em_folder_selector_set_can_create
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 15f6919b7f..b3d754369d 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -507,7 +507,9 @@ em_folder_utils_copy_folder (GtkWindow *parent,
 
 	model = em_folder_tree_model_get_default ();
 
-	dialog = em_folder_selector_new (parent, model, title);
+	dialog = em_folder_selector_new (parent, model);
+
+	gtk_window_set_title (GTK_WINDOW (dialog), title);
 
 	selector = EM_FOLDER_SELECTOR (dialog);
 	em_folder_selector_set_can_create (selector, TRUE);
@@ -600,8 +602,9 @@ em_folder_utils_create_folder (GtkWindow *parent,
 		em_folder_tree_model_add_store (model, CAMEL_STORE (service));
 	}
 
-	dialog = em_folder_selector_create_new (
-		parent, model, _("Create Folder"));
+	dialog = em_folder_selector_create_new (parent, model);
+
+	gtk_window_set_title (GTK_WINDOW (dialog), _("Create Folder"));
 
 	g_object_unref (model);
 
diff --git a/mail/em-vfolder-editor-rule.c b/mail/em-vfolder-editor-rule.c
index 7296d368c7..541ec34b10 100644
--- a/mail/em-vfolder-editor-rule.c
+++ b/mail/em-vfolder-editor-rule.c
@@ -387,7 +387,9 @@ source_add (GtkWidget *widget,
 
 	model = em_folder_tree_model_get_default ();
 
-	dialog = em_folder_selector_new (parent, model, _("Add Folder"));
+	dialog = em_folder_selector_new (parent, model);
+
+	gtk_window_set_title (GTK_WINDOW (dialog), _("Add Folder"));
 
 	selector = EM_FOLDER_SELECTOR (dialog);
 	em_folder_selector_set_can_create (selector, TRUE);