From: Andy Spencer <andy753421@gmail.com>
Date: Thu, 24 Nov 2011 10:40:04 +0000 (+0000)
Subject: Fix 64-bit warnings
X-Git-Tag: v0.6.1~1
X-Git-Url: http://pileus.org/git/?p=aweather;a=commitdiff_plain;h=a52c3912b474f14a476f9be92fcdb312fa6cbba5

Fix 64-bit warnings
---

diff --git a/src/plugins/alert.c b/src/plugins/alert.c
index 4d4a556..d4c6e21 100644
--- a/src/plugins/alert.c
+++ b/src/plugins/alert.c
@@ -423,7 +423,7 @@ void fips_parse(gchar *text, GTree **_counties, GList **_states)
 		GritsPoly *poly = grits_poly_parse(sparts[3], "\t", " ", ",");
 
 		/* Insert polys into the tree */
-		gint id = g_ascii_strtoll(sparts[0], NULL, 10);
+		glong id = g_ascii_strtoll(sparts[0], NULL, 10);
 		g_tree_insert(counties, (gpointer)id, poly);
 
 		/* Insert into states list */
@@ -585,7 +585,7 @@ static GritsPoly *_load_county_based(GritsPluginAlert *alert, AlertMsg *msg)
 	gchar **fipses  = g_strsplit(msg->cap.fips6, " ", -1);
 	GList *counties = NULL;
 	for (int i = 0; fipses[i]; i++) {
-		gint fips = g_ascii_strtoll(fipses[i], NULL, 10);
+		glong fips = g_ascii_strtoll(fipses[i], NULL, 10);
 		GritsPoly *county = g_tree_lookup(alert->counties, (gpointer)fips);
 		if (!county)
 			continue;
diff --git a/src/plugins/level2.c b/src/plugins/level2.c
index 654465d..2edaabc 100644
--- a/src/plugins/level2.c
+++ b/src/plugins/level2.c
@@ -393,8 +393,8 @@ static void _on_sweep_clicked(GtkRadioButton *button, gpointer _level2)
 {
 	AWeatherLevel2 *level2 = _level2;
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
-		gint type = (gint)g_object_get_data(G_OBJECT(button), "type");
-		gint elev = (gint)g_object_get_data(G_OBJECT(button), "elev");
+		gint type = (glong)g_object_get_data(G_OBJECT(button), "type");
+		gint elev = (glong)g_object_get_data(G_OBJECT(button), "elev");
 		aweather_level2_set_sweep(level2, type, (float)elev/100);
 		//level2->colormap = level2->sweep_colors;
 	}
@@ -476,9 +476,9 @@ GtkWidget *aweather_level2_get_config(AWeatherLevel2 *level2)
 			g_object_set(button, "draw-indicator", FALSE, NULL);
 			gtk_box_pack_end(GTK_BOX(elev_box), button, TRUE, TRUE, 0);
 
-			g_object_set_data(G_OBJECT(button), "level2", (gpointer)level2);
-			g_object_set_data(G_OBJECT(button), "type",   (gpointer)vi);
-			g_object_set_data(G_OBJECT(button), "elev",   (gpointer)(int)(elev*100));
+			g_object_set_data(G_OBJECT(button), "level2", level2);
+			g_object_set_data(G_OBJECT(button), "type", (gpointer)(guintptr)vi);
+			g_object_set_data(G_OBJECT(button), "elev", (gpointer)(guintptr)(elev*100));
 			g_signal_connect(button, "clicked", G_CALLBACK(_on_sweep_clicked), level2);
 		}
 	}