From 9c73777f2268b5bf2622f893e2a3ba7d0f720572 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Sat, 2 Nov 2002 08:25:03 +0000 Subject: First big sync of my GNOME 2 porting work (incomplete, and still pretty broken). Weeeeee! svn path=/trunk/; revision=18503 --- widgets/e-timezone-dialog/e-timezone-dialog.c | 7 +++---- widgets/e-timezone-dialog/e-timezone-dialog.h | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'widgets/e-timezone-dialog') diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index 6b99bf4689..fa2b994012 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -246,8 +246,7 @@ e_timezone_dialog_construct (ETimezoneDialog *etd) /* Load the content widgets */ - priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/e-timezone-dialog.glade", - NULL); + priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/e-timezone-dialog.glade", NULL, NULL); if (!priv->xml) { g_message ("e_timezone_dialog_construct(): Could not load the Glade XML file!"); goto error; @@ -546,7 +545,7 @@ get_zone_from_point (ETimezoneDialog *etd, It will be in the GTK+ encoding, i.e. not UTF-8. */ char* e_timezone_dialog_get_timezone (ETimezoneDialog *etd, - char **display_name) + const char **display_name) { ETimezoneDialogPrivate *priv; @@ -612,7 +611,7 @@ find_selected_point (ETimezoneDialog *etd) { ETimezoneDialogPrivate *priv; icalarray *zones; - char *current_zone; + const char *current_zone; EMapPoint *point = NULL; int i; diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.h b/widgets/e-timezone-dialog/e-timezone-dialog.h index 00283b4bc4..f81791bb6f 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.h +++ b/widgets/e-timezone-dialog/e-timezone-dialog.h @@ -22,7 +22,6 @@ #ifndef __E_TIMEZONE_DIALOG_H__ #define __E_TIMEZONE_DIALOG_H__ -#include #include #include @@ -64,7 +63,7 @@ ETimezoneDialog* e_timezone_dialog_new (void); 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, - char **display_name); + 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 -- cgit v1.2.3