Add these two callbacks so that we can update the selection in the

2004-06-22  Rodney Dawes  <dobey@novell.com>

	* gui/calendar-component.c (config_calendars_selection_changed_cb):
	(config_primary_calendar_selection_changed_cb):
	Add these two callbacks so that we can update the selection in the
	calendar when the gconf key changes, like we do for tasks

	(create_component_view): Register the two callbacks that we created
	for updating the selection in the view, and their notification IDs

svn path=/trunk/; revision=26470

2 files changed, 57 insertions, 4 deletions

diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 8769016978..74852b18a3 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -571,6 +571,12 @@ config_primary_selection_changed_cb (GConfClient *client, guint id, GConfEntry *
 }
 
 static void
+config_calendars_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
+{
+	update_selection (data);
+}
+
+static void
 config_tasks_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
 {
 	update_task_selection (data);
@@ -578,6 +584,12 @@ config_tasks_selection_changed_cb (GConfClient *client, guint id, GConfEntry *en
 
 
 static void
+config_primary_calendar_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
+{
+	update_primary_selection (data);
+}
+
+static void
 config_primary_tasks_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
 {
 	update_primary_task_selection (data);
@@ -1114,6 +1126,15 @@ create_component_view (CalendarComponent *calendar_component)
 	update_task_selection (component_view);
 	update_primary_task_selection (component_view);
 
+	/* If the calendar selection changes elsewhere, update it */
+	not = calendar_config_add_notification_calendars_selected (config_calendars_selection_changed_cb, 
+							       component_view);
+	component_view->notifications = g_list_prepend (component_view->notifications, GUINT_TO_POINTER (not));
+
+	not = calendar_config_add_notification_primary_calendar (config_primary_calendar_selection_changed_cb, 
+							      component_view);
+	component_view->notifications = g_list_prepend (component_view->notifications, GUINT_TO_POINTER (not));
+
 	/* If the task selection changes elsewhere, update it */
 	not = calendar_config_add_notification_tasks_selected (config_tasks_selection_changed_cb, 
 							       component_view);
diff --git a/calendar/gui/dialogs/calendar-setup.glade b/calendar/gui/dialogs/calendar-setup.glade
index d001544ba7..a625828157 100644
--- a/calendar/gui/dialogs/calendar-setup.glade
+++ b/calendar/gui/dialogs/calendar-setup.glade
@@ -5,14 +5,19 @@
 <requires lib="gnome"/>
 
 <widget class="GtkWindow" id="add-calendar-window">
-  <property name="width_request">450</property>
-  <property name="height_request">300</property>
   <property name="title" translatable="yes">Add Calendar</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
+  <property name="default_width">320</property>
+  <property name="default_height">240</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
 
   <child>
     <widget class="GtkVBox" id="vbox1">
@@ -106,6 +111,10 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xscale">0</property>
 	      <property name="yscale">1</property>
+	      <property name="top_padding">0</property>
+	      <property name="bottom_padding">0</property>
+	      <property name="left_padding">0</property>
+	      <property name="right_padding">0</property>
 
 	      <child>
 		<widget class="GtkHBox" id="hbox2">
@@ -335,6 +344,7 @@
 	      <property name="dither">True</property>
 	      <property name="use_alpha">False</property>
 	      <property name="title" translatable="yes">Pick a color</property>
+	      <property name="focus_on_click">True</property>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
@@ -367,6 +377,7 @@
 	      <property name="label">gtk-cancel</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	    </widget>
 	  </child>
 
@@ -376,6 +387,7 @@
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 
 	      <child>
 		<widget class="GtkAlignment" id="alignment1">
@@ -384,6 +396,10 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xscale">0</property>
 		  <property name="yscale">0</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">0</property>
+		  <property name="right_padding">0</property>
 
 		  <child>
 		    <widget class="GtkHBox" id="hbox1">
@@ -446,14 +462,19 @@
 </widget>
 
 <widget class="GtkWindow" id="add-task-list-window">
-  <property name="width_request">450</property>
-  <property name="height_request">300</property>
   <property name="title" translatable="yes">Add Tasks Group</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
+  <property name="default_width">320</property>
+  <property name="default_height">240</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
 
   <child>
     <widget class="GtkVBox" id="vbox87">
@@ -572,6 +593,7 @@
 	      <property name="dither">True</property>
 	      <property name="use_alpha">False</property>
 	      <property name="title" translatable="yes">Pick a color</property>
+	      <property name="focus_on_click">True</property>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
@@ -696,6 +718,10 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xscale">0</property>
 	      <property name="yscale">1</property>
+	      <property name="top_padding">0</property>
+	      <property name="bottom_padding">0</property>
+	      <property name="left_padding">0</property>
+	      <property name="right_padding">0</property>
 
 	      <child>
 		<widget class="GtkHBox" id="hbox130">
@@ -809,6 +835,7 @@
 	      <property name="label">gtk-cancel</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	    </widget>
 	  </child>
 
@@ -818,6 +845,7 @@
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 
 	      <child>
 		<widget class="GtkAlignment" id="alignment48">
@@ -826,6 +854,10 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xscale">0</property>
 		  <property name="yscale">0</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">0</property>
+		  <property name="right_padding">0</property>
 
 		  <child>
 		    <widget class="GtkHBox" id="hbox129">