diff options
| author | Chenthill Palanisamy <pchen@src.gnome.org> | 2005-12-19 19:23:11 +0800 |
|---|---|---|
| committer | Chenthill Palanisamy <pchen@src.gnome.org> | 2005-12-19 19:23:11 +0800 |
| commit | ae8d6437906a7ae68c80546c54e1b27b5be3caa5 (patch) | |
| tree | 3033ca208cc77504c1b6d3cf5917211d8203182a /calendar/gui/main.c | |
| parent | 58245bd32da1d2779a802b16a4e04d9fdae3b348 (diff) | |
| download | gsoc2013-evolution-ae8d6437906a7ae68c80546c54e1b27b5be3caa5.tar.gz gsoc2013-evolution-ae8d6437906a7ae68c80546c54e1b27b5be3caa5.tar.zst gsoc2013-evolution-ae8d6437906a7ae68c80546c54e1b27b5be3caa5.zip | |
Committing the calendar publishing patch.
svn path=/trunk/; revision=30876
Diffstat (limited to 'calendar/gui/main.c')
| -rw-r--r-- | calendar/gui/main.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/calendar/gui/main.c b/calendar/gui/main.c index 44a880f120..3d2fcfe26b 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -146,8 +146,6 @@ initialize (void) launch_alarm_daemon (); - /* Initialize Calendar Publishing */ - calendar_component_init_publishing (); /* Initialize plugin system */ e_plugin_hook_register_type (e_cal_popup_hook_get_type()); @@ -187,9 +185,16 @@ factory (BonoboGenericFactory *factory, return object; } else if (strcmp (component_id, ITIP_CONTROL_ID) == 0) return BONOBO_OBJECT (itip_bonobo_control_new ()); - else if (strcmp (component_id, CONFIG_CONTROL_ID) == 0) - return BONOBO_OBJECT (cal_prefs_dialog_new ()); - else if (strcmp (component_id, COMP_EDITOR_FACTORY_ID) == 0) + else if (strcmp (component_id, CONFIG_CONTROL_ID) == 0) { + GtkWidget *prefs; + EvolutionConfigControl *control; + + prefs = calendar_prefs_dialog_new (); + gtk_widget_show_all (prefs); + control = evolution_config_control_new (prefs); + + return BONOBO_OBJECT (control); + } else if (strcmp (component_id, COMP_EDITOR_FACTORY_ID) == 0) return BONOBO_OBJECT (comp_editor_factory_fn ()); g_warning (FACTORY_ID ": Don't know what to do with %s", component_id); |