From 17d13191decae2957d0b24f4d014de46828f5157 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 25 Feb 2003 14:49:58 +0000 Subject: Redo this to not use the CORBA interfaces in the local case (in * mail-config-druid.c: Redo this to not use the CORBA interfaces in the local case (in preparation for redoing the CORBA interfaces). (mail_config_druid_new): Remove unused "shell" arg * mail-account-gui.c (mail_account_gui_transport_complete): Don't crash if there's no transport selected at all. (mail_account_gui_new): Don't try to set cc_addrs/bcc_addrs if they're NULL. * mail-accounts.c (account_add_clicked): Don't need to pass shell to mail_config_druid_new. * mail-callbacks.c (configure_mail): Don't need to pass shell to mail_config_druid_new. svn path=/trunk/; revision=20051 --- mail/mail-config-druid.h | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) (limited to 'mail/mail-config-druid.h') diff --git a/mail/mail-config-druid.h b/mail/mail-config-druid.h index f7bc37a2d9..f429e98acf 100644 --- a/mail/mail-config-druid.h +++ b/mail/mail-config-druid.h @@ -40,37 +40,9 @@ extern "C" { #include "shell/Evolution.h" #include "mail-account-gui.h" -#define MAIL_CONFIG_DRUID_TYPE (mail_config_druid_get_type ()) -#define MAIL_CONFIG_DRUID(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MAIL_CONFIG_DRUID_TYPE, MailConfigDruid)) -#define MAIL_CONFIG_DRUID_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), MAIL_CONFIG_DRUID_TYPE, MailConfigDruidClass)) -#define MAIL_IS_CONFIG_DRUID(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MAIL_CONFIG_DRUID_TYPE)) -#define MAIL_IS_CONFIG_DRUID_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MAIL_CONFIG_DRUID_TYPE)) +typedef GtkWindow MailConfigDruid; -typedef struct { - GtkWindow parent; - - GnomeDruid *druid; - MailAccountGui *gui; - GladeXML *xml; - - GNOME_Evolution_Shell shell; - gboolean identity_copied; - CamelProvider *last_source; - - BonoboListener *listener; - Bonobo_EventSource event_source; -} MailConfigDruid; - -typedef struct { - GtkWindowClass parent_class; - - /* signals */ - -} MailConfigDruidClass; - -GtkType mail_config_druid_get_type (void); - -MailConfigDruid *mail_config_druid_new (GNOME_Evolution_Shell shell); +MailConfigDruid *mail_config_druid_new (void); char *mail_config_druid_get_account_name (MailConfigDruid *druid); gboolean mail_config_druid_get_default_account (MailConfigDruid *druid); -- cgit v1.2.3