aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-composer-prefs.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/em-composer-prefs.c')
-rw-r--r--mail/em-composer-prefs.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c
index 1f90b6ee3b..8545e26fa6 100644
--- a/mail/em-composer-prefs.c
+++ b/mail/em-composer-prefs.c
@@ -298,16 +298,24 @@ sig_edit_cb (GtkWidget *widget, EMComposerPrefs *prefs)
gtk_tree_model_get (model, &iter, 1, &sig, -1);
if (!sig->script) {
+ GtkWidget *editor;
+
/* normal signature */
if (!sig->filename || *sig->filename == '\0') {
g_free (sig->filename);
sig->filename = g_strdup (_("Unnamed"));
}
+ editor = e_signature_editor_new ();
+ e_signature_editor_set_signature (
+ E_SIGNATURE_EDITOR (editor), sig);
+
parent = gtk_widget_get_toplevel ((GtkWidget *) prefs);
- parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+ if (GTK_WIDGET_TOPLEVEL (parent))
+ gtk_window_set_transient_for (
+ GTK_WINDOW (editor), GTK_WINDOW (parent));
- mail_signature_editor (sig, (GtkWindow *) parent, FALSE);
+ gtk_widget_show (editor);
} else {
/* signature script */
GtkWidget *entry;
@@ -327,10 +335,11 @@ sig_edit_cb (GtkWidget *widget, EMComposerPrefs *prefs)
void
em_composer_prefs_new_signature (GtkWindow *parent, gboolean html)
{
- ESignature *sig;
+ GtkWidget *editor;
- sig = mail_config_signature_new (NULL, FALSE, html);
- mail_signature_editor (sig, parent, TRUE);
+ editor = e_signature_editor_new ();
+ gtk_window_set_transient_for (GTK_WINDOW (editor), parent);
+ gtk_widget_show (editor);
}
static void