Mercurial > hg > forks > geeqie

changeset 2519:4d1bf123eeed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix clang compile errors
author Colin Clark <colin.clark@cclark.uk>
date Thu, 06 Jul 2017 14:47:45 +0100
parents 8d368d89a7c0
children 2f88376d1cf2
files src/bar_gps.c src/cellrenderericon.c
diffstat 2 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/bar_gps.c	Sun Jul 02 19:46:19 2017 +0100
+++ b/src/bar_gps.c	Thu Jul 06 14:47:45 2017 +0100
@@ -230,7 +230,7 @@
 
 	if (info == TARGET_TEXT_PLAIN)
 		{
-		location = decode_geo_parameters(gtk_selection_data_get_data(selection_data));
+		location = decode_geo_parameters((gchar *)gtk_selection_data_get_data(selection_data));
 		if (!(g_strstr_len(location,-1,"Error")))
 			{
 			latlong = g_strsplit(location, " ", 2);
--- a/src/cellrenderericon.c	Sun Jul 02 19:46:19 2017 +0100
+++ b/src/cellrenderericon.c	Thu Jul 06 14:47:45 2017 +0100
@@ -683,7 +683,11 @@
 	GdkPixbuf *pixbuf;
 	const gchar *text;
 	GdkRectangle cell_rect;
+#if GTK_CHECK_VERSION(3,0,0)
+	GtkStateFlags state;
+#else
 	GtkStateType state;
+#endif
 	gint xpad, ypad;
 
 
@@ -712,16 +716,28 @@
 	if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
 		{
 		if (gtk_widget_has_focus(widget))
+#if GTK_CHECK_VERSION(3,0,0)
+			state = GTK_STATE_FLAG_SELECTED;
+		else
+			state = GTK_STATE_FLAG_ACTIVE;
+#else
 			state = GTK_STATE_SELECTED;
 		else
 			state = GTK_STATE_ACTIVE;
+#endif
 		}
 	else
 		{
 		if (gtk_widget_get_state(widget) == GTK_STATE_INSENSITIVE)
+#if GTK_CHECK_VERSION(3,0,0)
+			state = GTK_STATE_FLAG_INSENSITIVE;
+		else
+			state = GTK_STATE_FLAG_NORMAL;
+#else
 			state = GTK_STATE_INSENSITIVE;
 		else
 			state = GTK_STATE_NORMAL;
+#endif
 		}
 
 #if GTK_CHECK_VERSION(3,0,0)