aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@ximian.com>2003-12-18 19:06:25 +0800
committerRodrigo Moya <rodrigo@src.gnome.org>2003-12-18 19:06:25 +0800
commita4f32723bbeaf3ebcc5939b1f39a1f7daf26fe90 (patch)
tree53ffc949b853e82f9b198c5485bd76768fff69d0 /calendar
parent1c64a013bdc72029486ffee96d3420375804aefe (diff)
downloadgsoc2013-evolution-a4f32723bbeaf3ebcc5939b1f39a1f7daf26fe90.tar.gz
gsoc2013-evolution-a4f32723bbeaf3ebcc5939b1f39a1f7daf26fe90.tar.zst
gsoc2013-evolution-a4f32723bbeaf3ebcc5939b1f39a1f7daf26fe90.zip
make sure we connect to the "changed" signals after setting the initial
2003-12-18 Rodrigo Moya <rodrigo@ximian.com> * gui/calendar-component.c (impl_createControls): make sure we connect to the "changed" signals after setting the initial selections on the ESourceSelector. Fixes some nasty warnings because of calendar_control_sensitize_calendar_commands being called with no container yet for the control. svn path=/trunk/; revision=23979
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/calendar-component.c20
2 files changed, 19 insertions, 9 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a6ad38d047..247451008a 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-18 Rodrigo Moya <rodrigo@ximian.com>
+
+ * gui/calendar-component.c (impl_createControls): make sure we
+ connect to the "changed" signals after setting the initial selections
+ on the ESourceSelector. Fixes some nasty warnings because of
+ calendar_control_sensitize_calendar_commands being called with
+ no container yet for the control.
+
2003-12-17 Hans Petter Jansson <hpj@ximian.com>
* gui/dialogs/comp-editor.c: Add the concept of a source client, where
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index dc2937eb2e..ee1cd283a9 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -566,6 +566,17 @@ impl_createControls (PortableServer_Servant servant,
priv->calendar = (GnomeCalendar *) bonobo_control_get_widget (priv->view_control);
+ statusbar_widget = e_task_bar_new ();
+ gtk_widget_show (statusbar_widget);
+ e_activity_handler_attach_task_bar (priv->activity_handler, E_TASK_BAR (statusbar_widget));
+ statusbar_control = bonobo_control_new (statusbar_widget);
+
+ /* Load the selection from the last run */
+ update_selection (calendar_component);
+ update_primary_selection (calendar_component);
+
+ /* connect after setting the initial selections, or we'll get unwanted calls
+ to calendar_control_sensitize_calendar_commands */
g_signal_connect_object (priv->source_selector, "selection_changed",
G_CALLBACK (source_selection_changed_cb),
G_OBJECT (calendar_component), 0);
@@ -576,15 +587,6 @@ impl_createControls (PortableServer_Servant servant,
G_CALLBACK (fill_popup_menu_cb),
G_OBJECT (calendar_component), 0);
- statusbar_widget = e_task_bar_new ();
- gtk_widget_show (statusbar_widget);
- e_activity_handler_attach_task_bar (priv->activity_handler, E_TASK_BAR (statusbar_widget));
- statusbar_control = bonobo_control_new (statusbar_widget);
-
- /* Load the selection from the last run */
- update_selection (calendar_component);
- update_primary_selection (calendar_component);
-
/* If it gets fiddled with update */
not = calendar_config_add_notification_calendars_selected (config_selection_changed_cb,
calendar_component);