More refactoring of settings management.

1 files changed, 51 insertions, 21 deletions

diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h
index b38dd98f74..540443a255 100644
--- a/calendar/gui/e-meeting-time-sel.h
+++ b/calendar/gui/e-meeting-time-sel.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef _E_MEETING_TIME_SELECTOR_H_
-#define _E_MEETING_TIME_SELECTOR_H_
+#ifndef E_MEETING_TIME_SELECTOR_H
+#define E_MEETING_TIME_SELECTOR_H
 
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
@@ -31,14 +31,31 @@
 #include "e-meeting-store.h"
 #include "e-meeting-list-view.h"
 
-G_BEGIN_DECLS
-
 /*
  * EMeetingTimeSelector displays a list of attendees for a meeting and a
  * graphical summary of the times which they are free and busy, allowing the
  * user to select an appropriate time for a meeting.
  */
 
+/* Standard GObject macros */
+#define E_TYPE_MEETING_TIME_SELECTOR \
+	(e_meeting_time_selector_get_type ())
+#define E_MEETING_TIME_SELECTOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_MEETING_TIME_SELECTOR, EMeetingTimeSelector))
+#define E_MEETING_TIME_SELECTOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_MEETING_TIME_SELECTOR, EMeetingTimeSelectorClass))
+#define E_IS_MEETING_TIME_SELECTOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_MEETING_TIME_SELECTOR))
+#define E_IS_MEETING_TIME_SELECTOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_MEETING_TIME_SELECTOR))
+#define E_MEETING_TIME_SELECTOR_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_MEETING_TIME_SELECTOR))
+
 /* Define this to include the debugging functions. */
 #undef E_MEETING_TIME_SELECTOR_DEBUG
 
@@ -48,6 +65,8 @@ G_BEGIN_DECLS
 #define E_MEETING_TIME_SELECTOR_TEXT_Y_PAD		3
 #define E_MEETING_TIME_SELECTOR_TEXT_X_PAD		2
 
+G_BEGIN_DECLS
+
 /* This is used to specify the format used when displaying the dates.
    The full format is like 'Sunday, September 12, 1999'. The abbreviated format
    is like 'Sun 12/9/99'. The short format is like '12/9/99'. The actual
@@ -84,19 +103,17 @@ extern const gchar *EMeetingTimeSelectorHours[24];
 /* An array of hour strings for 12 hour time, "12:00am" .. "11:00pm". */
 extern const gchar *EMeetingTimeSelectorHours12[24];
 
-#define E_MEETING_TIME_SELECTOR(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, e_meeting_time_selector_get_type (), EMeetingTimeSelector)
-#define E_MEETING_TIME_SELECTOR_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, e_meeting_time_selector_get_type (), EMeetingTimeSelectorClass)
-#define IS_E_MEETING_TIME_SELECTOR(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, e_meeting_time_selector_get_type ())
+typedef struct _EMeetingTimeSelector EMeetingTimeSelector;
+typedef struct _EMeetingTimeSelectorClass EMeetingTimeSelectorClass;
+typedef struct _EMeetingTimeSelectorPrivate EMeetingTimeSelectorPrivate;
 
-typedef struct _EMeetingTimeSelector       EMeetingTimeSelector;
-typedef struct _EMeetingTimeSelectorClass  EMeetingTimeSelectorClass;
-
-struct _EMeetingTimeSelector
-{
+struct _EMeetingTimeSelector {
 	/* We subclass a GtkTable which makes it easy to add extra widgets
 	   if neccesary. */
 	GtkTable table;
 
+	EMeetingTimeSelectorPrivate *priv;
+
 	/*
 	 * User Interface stuff - widgets, colors etc.
 	 */
@@ -246,9 +263,6 @@ struct _EMeetingTimeSelector
 	/* This is used to determine the delay between scrolls. */
 	gint scroll_count;
 
-	/* The notification function id for Free/Busy template uri changes */
-	guint fb_uri_not;
-
 	/* The notification function id for Free/Busy refreshes */
 	gboolean fb_refresh_not;
 
@@ -257,8 +271,7 @@ struct _EMeetingTimeSelector
 	guint style_change_idle_id;
 };
 
-struct _EMeetingTimeSelectorClass
-{
+struct _EMeetingTimeSelectorClass {
 	GtkTableClass parent_class;
 
 	void (* changed) (EMeetingTimeSelector *mts);
@@ -269,9 +282,26 @@ struct _EMeetingTimeSelectorClass
  * know where the data is coming from. This is mainly just for testing for now.
  */
 
-GType e_meeting_time_selector_get_type (void);
-GtkWidget* e_meeting_time_selector_new (EMeetingStore *ems);
-void e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *ems);
+GType		e_meeting_time_selector_get_type (void);
+GtkWidget *	e_meeting_time_selector_new	(EMeetingStore *ems);
+void		e_meeting_time_selector_construct
+						(EMeetingTimeSelector *mts,
+						 EMeetingStore *ems);
+gboolean	e_meeting_time_selector_get_show_week_numbers
+						(EMeetingTimeSelector *mts);
+void		e_meeting_time_selector_set_show_week_numbers
+						(EMeetingTimeSelector *mts,
+						 gboolean show_week_numbers);
+gboolean	e_meeting_time_selector_get_use_24_hour_format
+						(EMeetingTimeSelector *mts);
+void		e_meeting_time_selector_set_use_24_hour_format
+						(EMeetingTimeSelector *mts,
+						 gboolean use_24_hour_format);
+gint		e_meeting_time_seletor_get_week_start_day
+						(EMeetingTimeSelector *mts);
+void		e_meeting_time_selector_set_week_start_day
+						(EMeetingTimeSelector *mts,
+						 gint week_start_day);
 
 /* This returns the currently selected meeting time.
    Note that months are 1-12 and days are 1-31. The start time is guaranteed to
@@ -383,4 +413,4 @@ gchar * e_meeting_time_selector_dump_date (GDate *date);
 
 G_END_DECLS
 
-#endif /* _E_MEETING_TIME_SELECTOR_H_ */
+#endif /* E_MEETING_TIME_SELECTOR_H */