diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-02 16:25:03 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-02 16:25:03 +0800 |
| commit | 9c73777f2268b5bf2622f893e2a3ba7d0f720572 (patch) | |
| tree | f81b79f19b87f84b4429d329b3fc0f9ff7946060 /widgets/e-timezone-dialog | |
| parent | 236c15d106b4e740d4e3996e0649334ca8e13876 (diff) | |
| download | gsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.tar.gz gsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.tar.zst gsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.zip | |
First big sync of my GNOME 2 porting work (incomplete, and still
pretty broken).
Weeeeee!
svn path=/trunk/; revision=18503
Diffstat (limited to 'widgets/e-timezone-dialog')
| -rw-r--r-- | widgets/e-timezone-dialog/e-timezone-dialog.c | 7 | ||||
| -rw-r--r-- | widgets/e-timezone-dialog/e-timezone-dialog.h | 3 |
2 files changed, 4 insertions, 6 deletions
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 <libgnome/gnome-defs.h> #include <gtk/gtkwidget.h> #include <ical.h> @@ -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 |