Fix clang compile errors

diff --git a/src/bar_gps.c b/src/bar_gps.c
index 40bb368..fa0213d 100644 (file)
--- a/src/bar_gps.c
+++ b/src/bar_gps.c
@@ -230,7 +230,7 @@ static void bar_pane_gps_close_save_cb(GenericDialog *gd, gpointer data)
 
        if (info == TARGET_TEXT_PLAIN)
                {
 
        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);
                if (!(g_strstr_len(location,-1,"Error")))
                        {
                        latlong = g_strsplit(location, " ", 2);

diff --git a/src/cellrenderericon.c b/src/cellrenderericon.c
index cc815ec..5f42e1c 100644 (file)
--- a/src/cellrenderericon.c
+++ b/src/cellrenderericon.c
@@ -683,7 +683,11 @@ gqv_cell_renderer_icon_render(GtkCellRenderer              *cell,
        GdkPixbuf *pixbuf;
        const gchar *text;
        GdkRectangle cell_rect;
        GdkPixbuf *pixbuf;
        const gchar *text;
        GdkRectangle cell_rect;

+#if GTK_CHECK_VERSION(3,0,0)
+       GtkStateFlags state;
+#else

        GtkStateType state;
        GtkStateType state;

+#endif

        gint xpad, ypad;
 
 
        gint xpad, ypad;
 
 


@@ -712,16 +716,28 @@ gqv_cell_renderer_icon_render(GtkCellRenderer             *cell,
        if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
                {
                if (gtk_widget_has_focus(widget))
        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;
                        state = GTK_STATE_SELECTED;
                else
                        state = GTK_STATE_ACTIVE;

+#endif

                }
        else
                {
                if (gtk_widget_get_state(widget) == GTK_STATE_INSENSITIVE)
                }
        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;
                        state = GTK_STATE_INSENSITIVE;
                else
                        state = GTK_STATE_NORMAL;

+#endif

                }
 
 #if GTK_CHECK_VERSION(3,0,0)
                }
 
 #if GTK_CHECK_VERSION(3,0,0)