aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-config-druid.c
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2003-01-09 20:17:19 +0800
committerMichael Zucci <zucchi@src.gnome.org>2003-01-09 20:17:19 +0800
commit6e9cb1e2bf29610e0d111572e72244b11542cc8d (patch)
tree21db40dbfab1d71cd0316457ed3679f362bef96f /mail/mail-config-druid.c
parent45d0c39700d2d6ee12f45c17778d69f3119ba078 (diff)
downloadgsoc2013-evolution-6e9cb1e2bf29610e0d111572e72244b11542cc8d.tar.gz
gsoc2013-evolution-6e9cb1e2bf29610e0d111572e72244b11542cc8d.tar.zst
gsoc2013-evolution-6e9cb1e2bf29610e0d111572e72244b11542cc8d.zip
Added druidpagestart1 to the pages list. (construct): Change the limits on
2003-01-09 Not Zed <NotZed@Ximian.com> * mail-config-druid.c: Added druidpagestart1 to the pages list. (construct): Change the limits on the page initialisation, and widget_show_all on the page rather than the content. * GNOME_Evolution_Mail.server.in.in: Make Mail a shlib component. * folder-info.c (evolution_folder_info_factory_init): Removed. (evolution_folder_info_factory_fn): renamed to evolution_folder_info_new(). * mail-config-druid.c (evolution_mail_config_wizard_factory_fn): Renamed to evolution_mail_config_wizard_new(). (evolution_mail_config_wizard_init): Removed. * mail-config-factory.c (mail_config_register_factory): Remove. (config_control_factory_cb): make this public. * Makefile.am: setup evolution-mail as a shared library. * component-factory.c (make_factory): implement the bonobo-plugin factory for shlib operation. Also, preliminary work to setup mailer-specific (factory): Implement the factory which starts various components. * mail-config.c (xml_get_prop): g_free->xmlFree (account_to_xml): copy xml memory to glib memory when adding the 0 on the end of the string. (accounts_save): Use slightly different logic with appending to the tail of the list, we can't use the &node trick with gslists. (accounts_changed): Same here. svn path=/trunk/; revision=19362
Diffstat (limited to 'mail/mail-config-druid.c')
-rw-r--r--mail/mail-config-druid.c28
1 files changed, 6 insertions, 22 deletions
diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c
index a529b47220..c7e2f498f6 100644
--- a/mail/mail-config-druid.c
+++ b/mail/mail-config-druid.c
@@ -491,6 +491,7 @@ static const char *pages[] = {
"transport_page",
"management_page",
"finish_page",
+ "druidpagestart1",
NULL
};
@@ -678,7 +679,7 @@ construct (MailConfigDruid *druid)
g_signal_connect(page, "back", G_CALLBACK (back_func), druid);
g_signal_connect(page, "finish", G_CALLBACK (finish_func), druid);
- if (i != 5) {
+ if (i < 5) {
Bonobo_Control control;
GtkWidget *w;
CORBA_Environment ev;
@@ -695,8 +696,9 @@ construct (MailConfigDruid *druid)
w = bonobo_widget_new_control_from_objref (control, CORBA_OBJECT_NIL);
gtk_box_pack_start (GTK_BOX (dpage->vbox), w, TRUE, TRUE, 0);
- gtk_widget_show_all (w);
}
+ gtk_widget_show_all (page);
+
}
g_signal_connect(druid->druid, "cancel", G_CALLBACK(druid_cancel), druid);
@@ -984,10 +986,8 @@ wizard_free (MailConfigWizard *wizard)
g_free (wizard);
}
-static BonoboObject *
-evolution_mail_config_wizard_factory_fn (BonoboGenericFactory *factory,
- const char *id,
- void *closure)
+BonoboObject *
+evolution_mail_config_wizard_new(void)
{
EvolutionWizard *wizard;
MailConfigAccount *account;
@@ -1017,19 +1017,3 @@ evolution_mail_config_wizard_factory_fn (BonoboGenericFactory *factory,
return BONOBO_OBJECT (wizard);
}
-
-void
-evolution_mail_config_wizard_init (void)
-{
- BonoboGenericFactory *factory;
-
- factory = bonobo_generic_factory_new (WIZARD_IID,
- evolution_mail_config_wizard_factory_fn, NULL);
-
- if (factory == NULL) {
- g_warning ("Error starting factory");
- return;
- }
-
- bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));
-}