diff options
| author | Gary Ekker <gekker@novell.com> | 2004-04-15 22:44:20 +0800 |
|---|---|---|
| committer | Gary Ekker <gekker@src.gnome.org> | 2004-04-15 22:44:20 +0800 |
| commit | 1877cabfd1747e10a1aa38bc30f05ed521f86345 (patch) | |
| tree | fdb8eef1d9c5389fc7fda664e48c43e939d513b9 /calendar/gui/calendar-component.c | |
| parent | 4369b1128233d445950f1e44351006888262b029 (diff) | |
| download | gsoc2013-evolution-1877cabfd1747e10a1aa38bc30f05ed521f86345.tar.gz gsoc2013-evolution-1877cabfd1747e10a1aa38bc30f05ed521f86345.tar.zst gsoc2013-evolution-1877cabfd1747e10a1aa38bc30f05ed521f86345.zip | |
move the calendar publishing initialization from createControls to main.c
2004-04-15 Gary Ekker <gekker@novell.com>
* gui/calendar-component.h: move the calendar publishing initialization
from createControls to main.c
* gui/calendar-component.c: (create_controls): Ditto
* gui/main.c: (initialize): Ditto
* gui/dialogs/cal-prefs-dialog.c: (url_list_changed): remove a gfree
that was freeing a before it should have been. Also removed cruft from
a previous attempt to fix the crash.
svn path=/trunk/; revision=25480
Diffstat (limited to 'calendar/gui/calendar-component.c')
| -rw-r--r-- | calendar/gui/calendar-component.c | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 50eadcc55a..9b66753dc3 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -575,24 +575,6 @@ impl_upgradeFromVersion (PortableServer_Servant servant, return CORBA_TRUE; } -static void -init_calendar_publishing (CalendarComponent *calendar_component) -{ - guint idle_id = 0; - CalendarComponentPrivate *priv; - - priv = calendar_component->priv; - - gconf_client_add_dir (priv->gconf_client, CALENDAR_CONFIG_PUBLISH, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); - - priv->gconf_notify_id - = gconf_client_notify_add (priv->gconf_client, CALENDAR_CONFIG_PUBLISH, - (GConfClientNotifyFunc) conf_changed_callback, NULL, - NULL, NULL); - - idle_id = g_idle_add ((GSourceFunc) init_calendar_publishing_cb, GINT_TO_POINTER (idle_id)); -} - static gboolean selector_tree_drag_drop (GtkWidget *widget, GdkDragContext *context, @@ -874,9 +856,6 @@ impl_createControls (PortableServer_Servant servant, e_activity_handler_attach_task_bar (priv->activity_handler, E_TASK_BAR (statusbar_widget)); gtk_widget_show (statusbar_widget); statusbar_control = bonobo_control_new (statusbar_widget); - - /* Initialize Calendar Publishing */ - init_calendar_publishing (calendar_component); /* connect after setting the initial selections, or we'll get unwanted calls to calendar_control_sensitize_calendar_commands */ @@ -1215,5 +1194,25 @@ calendar_component_peek_activity_handler (CalendarComponent *component) return component->priv->activity_handler; } +void +calendar_component_init_publishing (void) +{ + guint idle_id = 0; + CalendarComponent *calendar_component; + CalendarComponentPrivate *priv; + + calendar_component = calendar_component_peek (); + + priv = calendar_component->priv; + + gconf_client_add_dir (priv->gconf_client, CALENDAR_CONFIG_PUBLISH, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); + + priv->gconf_notify_id + = gconf_client_notify_add (priv->gconf_client, CALENDAR_CONFIG_PUBLISH, + (GConfClientNotifyFunc) conf_changed_callback, NULL, + NULL, NULL); + + idle_id = g_idle_add ((GSourceFunc) init_calendar_publishing_cb, GINT_TO_POINTER (idle_id)); +} BONOBO_TYPE_FUNC_FULL (CalendarComponent, GNOME_Evolution_Component, PARENT_TYPE, calendar_component) |