From 04a042ee01dba30ba231c48ec7d172b6be1a6fca Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 25 May 2009 23:07:23 -0400 Subject: Fix compiler warnings in widgets. --- widgets/e-timezone-dialog/e-timezone-dialog.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'widgets/e-timezone-dialog/e-timezone-dialog.c') diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index f0879a41ae..cff74204f1 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -81,8 +81,6 @@ extern long timezone; extern int daylight; #endif -static void e_timezone_dialog_class_init (ETimezoneDialogClass *class); -static void e_timezone_dialog_init (ETimezoneDialog *etd); static void e_timezone_dialog_dispose (GObject *object); static void e_timezone_dialog_finalize (GObject *object); @@ -406,7 +404,7 @@ static void format_utc_offset (int utc_offset, char *buffer) { - char *sign = "+"; + const gchar *sign = "+"; int hours, minutes, seconds; if (utc_offset < 0) { -- cgit v1.2.3 From ffa17ed195a6bbb40d386fb572b7941e22f47f8d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 13:20:45 -0400 Subject: Fix compiler warnings in plugins. --- widgets/e-timezone-dialog/e-timezone-dialog.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'widgets/e-timezone-dialog/e-timezone-dialog.c') diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index cff74204f1..b60fdf4ca2 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -24,6 +24,7 @@ #include #endif +#include #include #include #include @@ -75,12 +76,6 @@ struct _ETimezoneDialogPrivate { GtkWidget *preview_label; }; -#ifndef G_OS_WIN32 /* Declared properly in time.h already */ -extern char *tzname[2]; -extern long timezone; -extern int daylight; -#endif - static void e_timezone_dialog_dispose (GObject *object); static void e_timezone_dialog_finalize (GObject *object); -- cgit v1.2.3 From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 23:21:02 -0400 Subject: Remove trailing whitespace, again. --- widgets/e-timezone-dialog/e-timezone-dialog.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'widgets/e-timezone-dialog/e-timezone-dialog.c') diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index b60fdf4ca2..80a4485739 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -101,9 +101,9 @@ static void set_map_timezone (ETimezoneDialog *etd, static void on_combo_changed (GtkComboBox *combo, ETimezoneDialog *etd); -static void timezone_combo_get_active_text (GtkComboBox *combo, +static void timezone_combo_get_active_text (GtkComboBox *combo, const char **zone_name); -static gboolean timezone_combo_set_active_text (GtkComboBox *combo, +static gboolean timezone_combo_set_active_text (GtkComboBox *combo, const char *zone_name); static void map_destroy_cb (gpointer data, @@ -793,7 +793,7 @@ on_combo_changed (GtkComboBox *combo_box, ETimezoneDialog *etd) set_map_timezone (etd, map_zone); } -static void +static void timezone_combo_get_active_text (GtkComboBox *combo, const char **zone_name) { GtkTreeModel *list_store; @@ -802,13 +802,13 @@ timezone_combo_get_active_text (GtkComboBox *combo, const char **zone_name) list_store = gtk_combo_box_get_model (combo); /* Get the active iter in the list */ - if (gtk_combo_box_get_active_iter (combo, &iter)) + if (gtk_combo_box_get_active_iter (combo, &iter)) gtk_tree_model_get (list_store, &iter, 0, zone_name, -1); - else + else *zone_name = ""; } -static gboolean +static gboolean timezone_combo_set_active_text (GtkComboBox *combo, const char *zone_name) { GtkTreeModel *list_store; @@ -818,7 +818,7 @@ timezone_combo_set_active_text (GtkComboBox *combo, const char *zone_name) list_store = gtk_combo_box_get_model (combo); index = (GHashTable *) g_object_get_data (G_OBJECT (list_store), "index"); - if (zone_name && *zone_name) + if (zone_name && *zone_name) id = g_hash_table_lookup (index, zone_name); gtk_combo_box_set_active (combo, GPOINTER_TO_INT (id)); -- cgit v1.2.3