fix some warnings

6 files changed, 17 insertions, 9 deletions

diff --git a/applets/clock/clock-location.c b/applets/clock/clock-location.c
index 9b4c882d..13495587 100644
--- a/applets/clock/clock-location.c
+++ b/applets/clock/clock-location.c
@@ -66,7 +66,7 @@ static guint location_signals[LAST_SIGNAL] = { 0 };
 static void clock_location_finalize (GObject *);
 static void clock_location_set_tz (ClockLocation *this);
 static void clock_location_unset_tz (ClockLocation *this);
-static gboolean update_weather_info (ClockLocation *loc);
+static gboolean update_weather_info (gpointer data);
 static void setup_weather_updates (ClockLocation *loc);
 
 static gchar *clock_location_get_valid_weather_code (const gchar *code);
@@ -680,8 +680,9 @@ weather_info_updated (WeatherInfo *info, gpointer data)
 }
 
 static gboolean
-update_weather_info (ClockLocation *loc)
+update_weather_info (gpointer data)
 {
+	ClockLocation *loc = (ClockLocation *) data;
 	ClockLocationPrivate *priv = PRIVATE (loc);
 	WeatherPrefs prefs = {
 		FORECAST_STATE,
diff --git a/applets/clock/system-timezone.c b/applets/clock/system-timezone.c
index b736ffee..d3745e3d 100644
--- a/applets/clock/system-timezone.c
+++ b/applets/clock/system-timezone.c
@@ -877,7 +877,6 @@ system_timezone_is_zone_file_valid (const char  *zone_file,
 {
         GError     *our_error;
         GIOChannel *channel;
-        GIOStatus   status;
         char        buffer[strlen (TZ_MAGIC)];
         gsize       read;
 
@@ -904,9 +903,9 @@ system_timezone_is_zone_file_valid (const char  *zone_file,
         our_error = NULL;
         channel = g_io_channel_new_file (zone_file, "r", &our_error);
         if (!our_error)
-                status = g_io_channel_read_chars (channel,
-                                                  buffer, strlen (TZ_MAGIC),
-                                                  &read, &our_error);
+                g_io_channel_read_chars (channel,
+                                         buffer, strlen (TZ_MAGIC),
+                                         &read, &our_error);
         if (channel)
                 g_io_channel_unref (channel);
 
diff --git a/mate-panel/panel-layout.c b/mate-panel/panel-layout.c
index d3a4a9a2..9275dfaf 100644
--- a/mate-panel/panel-layout.c
+++ b/mate-panel/panel-layout.c
@@ -125,7 +125,7 @@ panel_layout_append_group_helper (GKeyFile                  *keyfile,
                                   const char                *type_for_error_message)
 {
     gboolean    retval = FALSE;
-    char       *id;
+    const char *id;
     char       *unique_id = NULL;
     char       *path = NULL;
     GSettings  *settings = NULL;
diff --git a/mate-panel/panel-profile.c b/mate-panel/panel-profile.c
index b5bb9078..61c05b8c 100644
--- a/mate-panel/panel-profile.c
+++ b/mate-panel/panel-profile.c
@@ -1587,7 +1587,7 @@ panel_profile_toplevel_id_list_notify (GSettings *settings,
 
 	toplevel_ids_strv = g_settings_get_strv (settings, key);
 
-	toplevel_ids = mate_gsettings_strv_to_gslist (toplevel_ids_strv);
+	toplevel_ids = mate_gsettings_strv_to_gslist ((const gchar **) toplevel_ids_strv);
 	toplevel_ids = panel_g_slist_make_unique (toplevel_ids,
 						  (GCompareFunc) g_strcmp0,
 						  FALSE);
@@ -1631,7 +1631,7 @@ panel_profile_object_id_list_update (gchar **objects)
 	GSList *sublist = NULL, *l;
 	GSList *object_ids;
 
-	object_ids = mate_gsettings_strv_to_gslist (objects);
+	object_ids = mate_gsettings_strv_to_gslist ((const gchar **) objects);
 	object_ids = panel_g_slist_make_unique (object_ids,
 						(GCompareFunc) g_strcmp0,
 						FALSE);
diff --git a/mate-panel/panel-widget.c b/mate-panel/panel-widget.c
index a776a86a..ca4ff641 100644
--- a/mate-panel/panel-widget.c
+++ b/mate-panel/panel-widget.c
@@ -2517,7 +2517,11 @@ panel_widget_applet_key_press_event (GtkWidget   *widget,
 	if (!mate_panel_applet_in_drag)
 		return FALSE;
 
+#if GTK_CHECK_VERSION (3, 0, 0)
 	return gtk_bindings_activate (G_OBJECT (panel),
+#else
+	return gtk_bindings_activate (GTK_OBJECT (panel),
+#endif
 				      ((GdkEventKey *)event)->keyval, 
 				      ((GdkEventKey *)event)->state);	
 }
diff --git a/mate-panel/panel.c b/mate-panel/panel.c
index 6c29eda2..2b4c5859 100644
--- a/mate-panel/panel.c
+++ b/mate-panel/panel.c
@@ -399,7 +399,11 @@ panel_key_press_event (GtkWidget   *widget,
 	if (GTK_IS_SOCKET (gtk_window_get_focus (GTK_WINDOW (widget))) &&
 	    event->keyval == GDK_KEY_F10 &&
 	    (event->state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK)
+#if GTK_CHECK_VERSION (3, 0, 0)
 		return gtk_bindings_activate (G_OBJECT (widget),
+#else
+		return gtk_bindings_activate (GTK_OBJECT (widget),
+#endif
 					      event->keyval,
 					      event->state);