New function; stops further notification from happening. This is needed

2001-08-03  Federico Mena Quintero  <federico@ximian.com>

	* cal-client/query-listener.c (query_listener_stop_notification):
	New function; stops further notification from happening.  This is
	needed since the listener is destroyed asynchronously from the
	Wombat and the corresponding CalQuery may already have died.
	(impl_notifyObjUpdated): Do not notify if requested.
	(impl_notifyObjRemoved): Likewise.
	(impl_notifyQueryDone): Likewise.
	(impl_notifyEvalError): Likewise.

	* cal-client/cal-query.c (cal_query_destroy): Use
	query_listener_stop_notification().

	* cal-client/cal-listener.c (cal_listener_destroy): Nullify the
	pointers to the callback functions.

	* gui/e-day-view.c (update_query): Commit our state of no longer
	having a query before unrefing it.  We may reenter from the ORBit
	main loop and we *really* want this information to be committed.

	* gui/e-week-view.c (update_query): Likewise.

	* gui/calendar-model.c (update_query): Likewise.

	* gui/tag-calendar.c (tag_calendar_by_comp): Added a "clear_first"
	argument that indicates whether the ECalendar should be cleared of
	any marks first.

	* gui/calendar-commands.c (calendar_control_activate): Removed
	ifdefed-out view buttons code from the Gnomecal days.

	* gui/gnome-cal.c (client_categories_changed_cb): Merge the
	categories of the calendar and tasks clients so that we can
	display the categories in both sets.
	(gnome_calendar_construct): Connect to "categories_changed" on
	both clients.
	(gnome_calendar_on_date_navigator_selection_changed): Removed call
	to gnome_calendar_update_view_buttons().
	(gnome_calendar_update_view_buttons): Removed.  We cannot have
	this until Bonobo supports radio toolbar items.
	(gnome_calendar_set_view_buttons): Removed.
	(gnome_calendar_dayjump): Do not use priv->day_button.
	(GnomeCalendarPrivate): Removed the {day,work_week,week,month}_button
	fields.
	(gnome_calendar_set_query): Start a retagging process of the date
	navigator so that it reflects the current query.
	(update_query): New function to restart a query for the date navigator.
	(initial_load): Use update_query() instead of tagging the date
	navigator directly.
	(gnome_calendar_on_date_navigator_date_range_changed): Likewise.
	(client_cal_opened_cb): Use update_query() instead of initial_load().
	(initial_load): Removed.
	(client_obj_updated_cb): Removed.
	(client_obj_removed_cb): Removed.
	(gnome_calendar_new_appointment_for): Set the default category of
	the new component.
	(search_bar_category_changed_cb): Set the default category for the
	calendar views.

	* gui/cal-search-bar.c (cal_search_bar_set_categories): Sort the
	categories before creating the menu.

	* gui/e-day-view.c (adjust_query_sexp): Return NULL instead of
	"#f" if the time range is not set yet.
	(update_query): Do not start a query if the time range is not set.
	(e_day_view_set_default_category): New function.
	(e_day_view_key_press): Set the default category on the new
	component.

	* gui/e-week-view.c (adjust_query_sexp): Analogous to the above.
	(update_query): Analogous to the above.
	(e_week_view_set_default_category): Analogous to the above.
	(e_week_view_key_press): Analogous to the above.

svn path=/trunk/; revision=11646

1 files changed, 43 insertions, 5 deletions

diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index daff360ab6..e1b5a7b444 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -565,6 +565,8 @@ e_day_view_init (EDayView *day_view)
 
 	day_view->auto_scroll_timeout_id = 0;
 
+	day_view->default_category = NULL;
+
 	/* Create the large font. */
 	day_view->large_font = gdk_font_load (E_DAY_VIEW_LARGE_FONT);
 	if (!day_view->large_font)
@@ -896,8 +898,15 @@ e_day_view_destroy (GtkObject *object)
 		day_view->query = NULL;
 	}
 
-	if (day_view->large_font)
+	if (day_view->large_font) {
 		gdk_font_unref (day_view->large_font);
+		day_view->large_font = NULL;
+	}
+
+	if (day_view->default_category) {
+		g_free (day_view->default_category);
+		day_view->default_category = NULL;
+	}
 
 	gdk_cursor_destroy (day_view->normal_cursor);
 	gdk_cursor_destroy (day_view->move_cursor);
@@ -1562,7 +1571,7 @@ adjust_query_sexp (EDayView *day_view, const char *sexp)
 
 	/* If the dates have not been set yet, we just want an empty query. */
 	if (day_view->lower == 0 || day_view->upper == 0)
-		return g_strdup ("#f");
+		return NULL;
 
 	start = isodate_from_time_t (day_view->lower);
 	end = isodate_from_time_t (day_view->upper);
@@ -1585,6 +1594,7 @@ adjust_query_sexp (EDayView *day_view, const char *sexp)
 static void
 update_query (EDayView *day_view)
 {
+	CalQuery *old_query;
 	char *real_sexp;
 
 	e_day_view_free_events (day_view);
@@ -1595,13 +1605,19 @@ update_query (EDayView *day_view)
 	      && cal_client_get_load_state (day_view->client) == CAL_CLIENT_LOAD_LOADED))
 		return;
 
-	if (day_view->query) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (day_view->query), day_view);
-		gtk_object_unref (GTK_OBJECT (day_view->query));
+	old_query = day_view->query;
+	day_view->query = NULL;
+
+	if (old_query) {
+		gtk_signal_disconnect_by_data (GTK_OBJECT (old_query), day_view);
+		gtk_object_unref (GTK_OBJECT (old_query));
 	}
 
 	g_assert (day_view->sexp != NULL);
+
 	real_sexp = adjust_query_sexp (day_view, day_view->sexp);
+	if (!real_sexp)
+		return; /* No time range is set, so don't start a query */
 
 	day_view->query = cal_client_get_query (day_view->client, real_sexp);
 	g_free (real_sexp);
@@ -1698,6 +1714,26 @@ e_day_view_set_query (EDayView *day_view, const char *sexp)
 }
 
 
+/**
+ * e_day_view_set_default_category:
+ * @day_view: A day view.
+ * @category: Default category name or NULL for no category.
+ * 
+ * Sets the default category that will be used when creating new calendar
+ * components from the day view.
+ **/
+void
+e_day_view_set_default_category (EDayView *day_view, const char *category)
+{
+	g_return_if_fail (day_view != NULL);
+	g_return_if_fail (E_IS_DAY_VIEW (day_view));
+
+	if (day_view->default_category)
+		g_free (day_view->default_category);
+
+	day_view->default_category = g_strdup (category);
+}
+
 static gboolean
 e_day_view_update_event_cb (EDayView *day_view,
 			    gint day,
@@ -4933,6 +4969,8 @@ e_day_view_key_press (GtkWidget *widget, GdkEventKey *event)
 						   day_view->zone);
 	cal_component_set_dtend (comp, &dt);
 
+	cal_component_set_categories (comp, day_view->default_category);
+
 	/* We add the event locally and start editing it. When we get the
 	   "update_event" callback from the server, we basically ignore it.
 	   If we were to wait for the "update_event" callback it wouldn't be