Merge commit 'origin/kill-bonobo'

1 files changed, 0 insertions, 106 deletions

diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index 53d636faf5..ff018abeca 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -66,174 +66,73 @@ GSList   *calendar_config_get_calendars_selected (void);
 void	  calendar_config_set_calendars_selected (GSList *selected);
 guint	  calendar_config_add_notification_calendars_selected (GConfClientNotifyFunc func, gpointer data);
 
-/* The primary calendar */
-gchar     *calendar_config_get_primary_calendar (void);
-void	  calendar_config_set_primary_calendar (const gchar *primary_uid);
-guint	  calendar_config_add_notification_primary_calendar (GConfClientNotifyFunc func, gpointer data);
-
-/* Use system timezone; if TRUE, then influences also the current timezone functions. */
-gboolean calendar_config_get_use_system_timezone (void);
-void     calendar_config_set_use_system_timezone (gboolean use);
-guint    calendar_config_add_notification_use_system_timezone (GConfClientNotifyFunc func, gpointer data);
-
 /* The current timezone, e.g. "Europe/London". */
-gchar *	  calendar_config_get_timezone		(void);
-gchar *	  calendar_config_get_timezone_stored	(void);
 icaltimezone *calendar_config_get_icaltimezone (void);
-void	  calendar_config_set_timezone		(const gchar	     *timezone);
-guint calendar_config_add_notification_timezone (GConfClientNotifyFunc func, gpointer data);
 
 /* The working days of the week, a bit-wise combination of flags. */
 CalWeekdays calendar_config_get_working_days	(void);
-void	  calendar_config_set_working_days	(CalWeekdays  days);
 guint calendar_config_add_notification_working_days (GConfClientNotifyFunc func, gpointer data);
 
 /* The start day of the week (0 = Sun to 6 = Sat). */
 gint	  calendar_config_get_week_start_day	(void);
-void	  calendar_config_set_week_start_day	(gint	      week_start_day);
-guint calendar_config_add_notification_week_start_day (GConfClientNotifyFunc func, gpointer data);
 
 /* The start and end times of the work-day. */
 gint	  calendar_config_get_day_start_hour	(void);
 void	  calendar_config_set_day_start_hour	(gint	      day_start_hour);
-guint calendar_config_add_notification_day_start_hour (GConfClientNotifyFunc func, gpointer data);
 
 gint	  calendar_config_get_day_start_minute	(void);
 void	  calendar_config_set_day_start_minute	(gint	      day_start_min);
-guint calendar_config_add_notification_day_start_minute (GConfClientNotifyFunc func, gpointer data);
 
 gint	  calendar_config_get_day_end_hour	(void);
 void	  calendar_config_set_day_end_hour	(gint	      day_end_hour);
-guint calendar_config_add_notification_day_end_hour (GConfClientNotifyFunc func, gpointer data);
 
 gint	  calendar_config_get_day_end_minute	(void);
 void	  calendar_config_set_day_end_minute	(gint	      day_end_min);
-guint calendar_config_add_notification_day_end_minute (GConfClientNotifyFunc func, gpointer data);
 
 /* Whether we use 24-hour format or 12-hour format (AM/PM). */
 gboolean  calendar_config_get_24_hour_format	(void);
-void	  calendar_config_set_24_hour_format	(gboolean     use_24_hour);
-guint calendar_config_add_notification_24_hour_format (GConfClientNotifyFunc func, gpointer data);
-
-gboolean  calendar_config_get_show_status (void);
-void	  calendar_config_set_show_status (gboolean	status);
-
-gboolean  calendar_config_get_show_type (void);
-void	  calendar_config_set_show_type (gboolean	status);
-
-gboolean  calendar_config_get_show_rsvp (void);
-void	  calendar_config_set_show_rsvp (gboolean	status);
-
-gboolean  calendar_config_get_show_timezone (void);
-void	  calendar_config_set_show_timezone (gboolean	status);
-
-gboolean  calendar_config_get_show_categories (void);
-void	  calendar_config_set_show_categories (gboolean	status);
-
-gboolean calendar_config_get_show_role	(void);
-void calendar_config_set_show_role	(gboolean state);
 
 /* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */
 gint	  calendar_config_get_time_divisions	(void);
 void	  calendar_config_set_time_divisions	(gint	      divisions);
 guint calendar_config_add_notification_time_divisions (GConfClientNotifyFunc func, gpointer data);
 
-/* Whether we show the Marcus Bains Line, and in what colors. */
-void calendar_config_get_marcus_bains (gboolean *show_line, const gchar **dayview_color, const gchar **timebar_color);
-void calendar_config_add_notification_marcus_bains (GConfClientNotifyFunc func, gpointer data, gint *not_show, gint *not_dcolor, gint *not_tcolor);
-
-/* Whether we show event end times. */
-gboolean  calendar_config_get_show_event_end	(void);
-void	  calendar_config_set_show_event_end	(gboolean     show_end);
-guint calendar_config_add_notification_show_event_end (GConfClientNotifyFunc func, gpointer data);
-
 /* Whether we compress the weekend in the week/month views. */
 gboolean  calendar_config_get_compress_weekend	(void);
-void	  calendar_config_set_compress_weekend	(gboolean     compress);
-guint calendar_config_add_notification_compress_weekend (GConfClientNotifyFunc func, gpointer data);
 
 /* Whether we show week numbers in the Date Navigator. */
 gboolean  calendar_config_get_dnav_show_week_no	(void);
-void	  calendar_config_set_dnav_show_week_no	(gboolean     show_week_no);
 guint calendar_config_add_notification_dnav_show_week_no (GConfClientNotifyFunc func, gpointer data);
 
-/* Whether we show week number in the day view. */
-gboolean  calendar_config_get_dview_show_week_no (void);
-void	  calendar_config_set_dview_show_week_no (gboolean show_week_no);
-guint calendar_config_add_notification_dview_show_week_no (GConfClientNotifyFunc func, gpointer data);
-
 /* The positions of the panes in the normal and month views. */
-gint      calendar_config_get_hpane_pos		(void);
 void	  calendar_config_set_hpane_pos		(gint	      hpane_pos);
 
-gint      calendar_config_get_vpane_pos		(void);
-void	  calendar_config_set_vpane_pos		(gint	      vpane_pos);
-
-gboolean  calendar_config_get_preview_state	(void);
-void	  calendar_config_set_preview_state	(gboolean     state);
-guint	  calendar_config_add_notification_preview_state (GConfClientNotifyFunc func, gpointer data);
-
-gint      calendar_config_get_month_hpane_pos	(void);
 void	  calendar_config_set_month_hpane_pos	(gint	      hpane_pos);
 
-gint      calendar_config_get_month_vpane_pos	(void);
-void	  calendar_config_set_month_vpane_pos	(gint	      vpane_pos);
-
-gfloat     calendar_config_get_tag_vpane_pos	(void);
-void	  calendar_config_set_tag_vpane_pos	(gfloat	      vpane_pos);
-
 /* The current list of task lists selected */
 GSList   *calendar_config_get_tasks_selected (void);
 void	  calendar_config_set_tasks_selected (GSList *selected);
 guint	  calendar_config_add_notification_tasks_selected (GConfClientNotifyFunc func, gpointer data);
 
-/* The primary calendar */
-gchar     *calendar_config_get_primary_tasks (void);
-void	  calendar_config_set_primary_tasks (const gchar *primary_uid);
-guint	  calendar_config_add_notification_primary_tasks (GConfClientNotifyFunc func, gpointer data);
-
-/* The pane position */
-gint      calendar_config_get_task_vpane_pos    (void);
-void      calendar_config_set_task_vpane_pos    (gint         vpane_pos);
-
 /* The current list of memo lists selected */
 GSList   *calendar_config_get_memos_selected (void);
 void	  calendar_config_set_memos_selected (GSList *selected);
 guint	  calendar_config_add_notification_memos_selected (GConfClientNotifyFunc func, gpointer data);
 
-/* The primary calendar */
-gchar     *calendar_config_get_primary_memos (void);
-void	  calendar_config_set_primary_memos (const gchar *primary_uid);
-guint	  calendar_config_add_notification_primary_memos (GConfClientNotifyFunc func, gpointer data);
-
-/* Colors for the task list */
-void      calendar_config_get_tasks_due_today_color (GdkColor *color);
-void	  calendar_config_set_tasks_due_today_color (GdkColor *color);
-
-void      calendar_config_get_tasks_overdue_color (GdkColor *color);
-void	  calendar_config_set_tasks_overdue_color (GdkColor *color);
-
 /* Settings to hide completed tasks. */
 gboolean  calendar_config_get_hide_completed_tasks	(void);
 void	  calendar_config_set_hide_completed_tasks	(gboolean	hide);
-guint	  calendar_config_add_notification_hide_completed_tasks (GConfClientNotifyFunc func, gpointer data);
 
 CalUnits  calendar_config_get_hide_completed_tasks_units(void);
 void	  calendar_config_set_hide_completed_tasks_units(CalUnits	units);
-guint	  calendar_config_add_notification_hide_completed_tasks_units (GConfClientNotifyFunc func, gpointer data);
 
 gint	  calendar_config_get_hide_completed_tasks_value(void);
 void	  calendar_config_set_hide_completed_tasks_value(gint		value);
-guint	  calendar_config_add_notification_hide_completed_tasks_value (GConfClientNotifyFunc func, gpointer data);
 
 gchar *	  calendar_config_get_hide_completed_tasks_sexp (gboolean get_completed);
 
 /* Confirmation options */
 gboolean  calendar_config_get_confirm_delete (void);
-void      calendar_config_set_confirm_delete (gboolean confirm);
-
-gboolean  calendar_config_get_confirm_purge (void);
-void      calendar_config_set_confirm_purge (gboolean confirm);
 
 /* Default reminder options */
 gboolean calendar_config_get_use_default_reminder (void);
@@ -249,11 +148,6 @@ void     calendar_config_set_default_reminder_units (CalUnits units);
 GSList * calendar_config_get_free_busy (void);
 void calendar_config_set_free_busy (GSList * url_list);
 
-gchar *calendar_config_get_free_busy_template (void);
-void calendar_config_set_free_busy_template (const gchar *template);
-guint calendar_config_add_notification_free_busy_template (GConfClientNotifyFunc func,
-							   gpointer data);
-
 /* Returns TRUE if the locale has 'am' and 'pm' strings defined, i.e. it
    supports 12-hour time format. */
 gboolean  calendar_config_locale_supports_12_hour_format(void);