diff options
author | Jeffrey Stedfast <fejj@helixcode.com> | 2000-07-26 05:54:09 +0800 |
---|---|---|
committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2000-07-26 05:54:09 +0800 |
commit | fe4bbe19bf2bd577edbb1e3aa17a4317be55b6ed (patch) | |
tree | d0ff3c18f5fb960090e8523b458491a1298601f2 | |
parent | 35ed08a7654b18590dd850ba7901e725be033394 (diff) | |
download | gsoc2013-evolution-fe4bbe19bf2bd577edbb1e3aa17a4317be55b6ed.tar.gz gsoc2013-evolution-fe4bbe19bf2bd577edbb1e3aa17a4317be55b6ed.tar.zst gsoc2013-evolution-fe4bbe19bf2bd577edbb1e3aa17a4317be55b6ed.zip |
Always prepend a leading "/" to the url->path. (set_service_url): Added
2000-07-25 Jeffrey Stedfast <fejj@helixcode.com>
* mail-config.c (get_service_url): Always prepend a leading "/" to
the url->path.
(set_service_url): Added more error checking and also strip the
leading '/' from the url->path
(create_identity_page): Set the signature file to the one specified in
the identity record, else set the default path to ~/.sugnature
svn path=/trunk/; revision=4333
-rw-r--r-- | mail/ChangeLog | 2 | ||||
-rw-r--r-- | mail/mail-config.c | 23 |
2 files changed, 14 insertions, 11 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index b8b098e807..1f90e5416f 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -4,6 +4,8 @@ the url->path. (set_service_url): Added more error checking and also strip the leading '/' from the url->path + (create_identity_page): Set the signature file to the one specified in + the identity record, else set the default path to ~/.sugnature 2000-07-25 Michael Meeks <michael@helixcode.com> diff --git a/mail/mail-config.c b/mail/mail-config.c index d13b4b3641..f05c526a77 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -343,19 +343,20 @@ create_identity_page (GtkWidget *vbox, struct identity_record *idrec) gtk_misc_set_alignment (GTK_MISC (sig), 1, 0); sig_entry = gnome_file_entry_new (NULL, _("Signature File")); - if (idrec && idrec->sigfile) - gtk_entry_set_text (GTK_ENTRY (sig_entry), idrec->sigfile); + gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (sig_entry), g_get_home_dir ()); + if (idrec && idrec->sigfile) { + gtk_entry_set_text (GTK_ENTRY (gnome_file_entry_gtk_entry ( + GNOME_FILE_ENTRY (sig_entry))), idrec->sigfile); + } else { + default_sig = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S, + ".signature", NULL); + gtk_entry_set_text (GTK_ENTRY ( + gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (sig_entry))), + default_sig); + g_free (default_sig); + } gtk_table_attach (GTK_TABLE (table), sig_entry, 1, 2, 4, 5, GTK_FILL, 0, 0, 0); - gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (sig_entry), - g_get_home_dir ()); - - default_sig = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S, - ".signature", NULL); - gtk_entry_set_text (GTK_ENTRY ( - gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (sig_entry))), - default_sig); - g_free (default_sig); gtk_object_set_data (GTK_OBJECT (vbox), "sig", gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (sig_entry))); |