Various cleanups. (e_timezone_dialog_get_timezone): Return an

        * e-timezone-dialog/e-timezone-dialog.c: Various cleanups.
        (e_timezone_dialog_get_timezone): Return an icaltimezone.
        (e_timezone_dialog_set_timezone): Take an icaltimezone
        (e_timezone_dialog_construct): Set a minimum size on the scrolled
        window

svn path=/trunk/; revision=20255

1 files changed, 12 insertions, 33 deletions

diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.h b/widgets/e-timezone-dialog/e-timezone-dialog.h
index cdcfc91ef4..35617844f1 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.h
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.h
@@ -51,39 +51,18 @@ struct _ETimezoneDialogClass {
 };
 
 
-GtkType		 e_timezone_dialog_get_type		(void);
-ETimezoneDialog* e_timezone_dialog_construct		(ETimezoneDialog  *etd);
-
-ETimezoneDialog* e_timezone_dialog_new			(void);
-
-/* Returns the TZID of the timezone set, and optionally its displayed name.
-   The TZID may be NULL, in which case the builtin timezone with the city name
-   of display_name should be used. If display_name is also NULL or "", then it
-   is assumed to be a 'local time'. Note that display_name may be translated,
-   so you need to convert it back to English before trying to load it. 
-   It will be in the GTK+ encoding, i.e. not UTF-8. */
-char*		 e_timezone_dialog_get_timezone		(ETimezoneDialog  *etd,
-							 const char	 **display_name);
-
-/* Sets the TZID and displayed name of the timezone. The TZID may be NULL for
-   a 'local time' (i.e. display_name is NULL or "") or if it is a builtin
-   timezone which hasn't been loaded yet. (This is done so we don't load
-   timezones until we really need them.) The display_name should be the
-   translated name in the GTK+ - it will be displayed exactly as it is. */
-void		 e_timezone_dialog_set_timezone		(ETimezoneDialog  *etd,
-							 char		  *tzid,
-							 char		  *display_name);
-
-GtkWidget*	 e_timezone_dialog_get_toplevel		(ETimezoneDialog  *etd);
-
-void             e_timezone_dialog_reparent             (ETimezoneDialog *etd,
-							 GtkWidget *new_parent);
-
-/* Returns the builtin timezone corresponding to display_name, which is
-   the translated location, e.g. 'Europe/London', in the GTK+ encoding.
-   If display_name is NULL or "" it returns NULL. */
-icaltimezone *e_timezone_dialog_get_builtin_timezone  (const char *display_name);
+GType            e_timezone_dialog_get_type     (void);
+ETimezoneDialog *e_timezone_dialog_construct    (ETimezoneDialog  *etd);
 
-
+ETimezoneDialog *e_timezone_dialog_new          (void);
+
+icaltimezone    *e_timezone_dialog_get_timezone (ETimezoneDialog  *etd);
+void             e_timezone_dialog_set_timezone (ETimezoneDialog  *etd,
+						 icaltimezone     *zone);
+
+GtkWidget       *e_timezone_dialog_get_toplevel (ETimezoneDialog  *etd);
+
+void             e_timezone_dialog_reparent     (ETimezoneDialog  *etd,
+						 GtkWidget        *new_parent);
 
 #endif /* __E_TIMEZONE_DIALOG_H__ */