aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-account-gui.c2
-rw-r--r--mail/mail-accounts.c4
3 files changed, 8 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 036307d884..39d1ea7918 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,8 +1,12 @@
2001-12-19 Jeffrey Stedfast <fejj@ximian.com>
+ * mail-account-gui.c (setup_service): If the provider is NULL,
+ don't do anything.
+
* mail-accounts.c (construct): Oops, no wonder the exec command
thing never stuck around... I wasn't getting the right widget from
- libglade.
+ libglade. Also connect to the GtkEntry's changed event since a
+ GnomeFileEntry doesn't have that signal in its ancestry.
2001-12-18 Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index 4f42b960a1..856d72984f 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -857,7 +857,7 @@ setup_service (MailAccountGuiService *gsvc, MailConfigService *service)
CamelURL *url = camel_url_new (service->url, NULL);
gboolean has_auth = FALSE;
- if (url == NULL)
+ if (url == NULL || gsvc->provider == NULL)
return FALSE;
if (url->user && CAMEL_PROVIDER_ALLOWS (gsvc->provider, CAMEL_URL_PART_USER))
diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c
index 282cc6ba6b..0d3eb4bc63 100644
--- a/mail/mail-accounts.c
+++ b/mail/mail-accounts.c
@@ -999,8 +999,8 @@ construct (MailAccountsDialog *dialog)
dialog->command_line = GNOME_FILE_ENTRY (glade_xml_get_widget (gui, "fileNotifyExecCommandLine"));
gtk_entry_set_text (GTK_ENTRY (gnome_file_entry_gtk_entry (dialog->command_line)),
mail_config_get_new_mail_notify_command ());
- gtk_signal_connect (GTK_OBJECT (dialog->command_line), "changed",
- GTK_SIGNAL_FUNC (notify_command_changed), dialog);
+ gtk_signal_connect (GTK_OBJECT (gnome_file_entry_gtk_entry (dialog->command_line)),
+ "changed", GTK_SIGNAL_FUNC (notify_command_changed), dialog);
/* now to fill in the clists */
dialog->accounts_row = -1;