aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@helixcode.com>2001-01-09 04:37:44 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-01-09 04:37:44 +0800
commitdeb9cf435980c48539c5612ebf1533b6f853608c (patch)
tree6673b44e7e776f1879eb479980a212efb3745fad /mail
parent51bd9ba1bb27bf599c373c77248f97eba3c5dd74 (diff)
downloadgsoc2013-evolution-deb9cf435980c48539c5612ebf1533b6f853608c.tar.gz
gsoc2013-evolution-deb9cf435980c48539c5612ebf1533b6f853608c.tar.zst
gsoc2013-evolution-deb9cf435980c48539c5612ebf1533b6f853608c.zip
More lovely fixes...
2001-01-08 Jeffrey Stedfast <fejj@helixcode.com> * mail-config-druid.c: More lovely fixes... * mail-callbacks.c: Don't segfault if a default account doesn't exist. svn path=/trunk/; revision=7302
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-callbacks.c2
-rw-r--r--mail/mail-config-druid.c11
3 files changed, 14 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 36e766c5ac..581d25fe92 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,12 @@
2001-01-08 Jeffrey Stedfast <fejj@helixcode.com>
+ * mail-config-druid.c: More lovely fixes...
+
+ * mail-callbacks.c: Don't segfault if a default account doesn't
+ exist.
+
+2001-01-08 Jeffrey Stedfast <fejj@helixcode.com>
+
* mail-config-druid.c: A bunch of fixes.
* mail-accounts.c: More fixes...
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 3f59d474e5..ee9de6d195 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -115,7 +115,7 @@ check_send_configuration (FolderBrowser *fb)
account = mail_config_get_default_account ();
/* Check for an identity */
- if (!account->id) {
+ if (!account) {
GtkWidget *message;
message = gnome_warning_dialog_parented (_("You need to configure an identity\n"
diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c
index f1af22136a..82503ca542 100644
--- a/mail/mail-config-druid.c
+++ b/mail/mail-config-druid.c
@@ -491,7 +491,7 @@ transport_check (MailConfigDruid *druid)
const CamelProvider *prov = druid->transport_provider;
gboolean next_sensitive = TRUE;
- if (prov->url_flags & CAMEL_URL_NEED_HOST)
+ if (prov && prov->url_flags & CAMEL_URL_NEED_HOST)
next_sensitive = gtk_entry_get_text (druid->outgoing_hostname) != NULL;
gnome_druid_set_buttons_sensitive (druid->druid, TRUE, next_sensitive, TRUE);
@@ -631,7 +631,7 @@ set_defaults (MailConfigDruid *druid)
/* construct incoming/outgoing option menus */
stores = gtk_menu_new ();
transports = gtk_menu_new ();
- druid->providers = camel_session_list_providers (session, FALSE);
+ druid->providers = camel_session_list_providers (session, TRUE);
l = druid->providers;
while (l) {
CamelProvider *provider = l->data;
@@ -674,14 +674,14 @@ set_defaults (MailConfigDruid *druid)
l = l->next;
}
+ gtk_option_menu_set_menu (druid->incoming_type, stores);
+ gtk_option_menu_set_menu (druid->outgoing_type, transports);
+
if (fstore)
gtk_signal_emit_by_name (GTK_OBJECT (fstore), "activate", druid);
if (ftransport)
gtk_signal_emit_by_name (GTK_OBJECT (ftransport), "activate", druid);
-
- gtk_option_menu_set_menu (druid->incoming_type, stores);
- gtk_option_menu_set_menu (druid->outgoing_type, transports);
}
static gboolean
@@ -760,6 +760,7 @@ construct (MailConfigDruid *druid)
/* set window title */
gtk_window_set_title (GTK_WINDOW (druid), _("Evolution Account Wizard"));
gtk_window_set_policy (GTK_WINDOW (druid), FALSE, TRUE, TRUE);
+ gtk_window_set_modal (GTK_WINDOW (druid), TRUE);
/* attach to druid page signals */
i = 0;