[gnome-applets/wip/muktupavels/werror] battstat: fix -Wsign-compare warnings

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 2307a22f134820e337829e7ea41c90f7040d6cf6
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Apr 4 21:07:00 2020 +0300

    battstat: fix -Wsign-compare warnings

 .../org.gnome.gnome-applets.battstat.gschema.xml.in        |  1 +
 gnome-applets/battstat/battstat-applet.c                   |  3 ++-
 gnome-applets/battstat/battstat-upower.c                   |  2 +-
 gnome-applets/battstat/battstat.h                          | 14 +++++++-------
 4 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/data/schemas/org.gnome.gnome-applets.battstat.gschema.xml.in 
b/data/schemas/org.gnome.gnome-applets.battstat.gschema.xml.in
index 969649046..449916742 100644
--- a/data/schemas/org.gnome.gnome-applets.battstat.gschema.xml.in
+++ b/data/schemas/org.gnome.gnome-applets.battstat.gschema.xml.in
@@ -2,6 +2,7 @@
        <schema id="org.gnome.gnome-applets.battstat">
                <key name="red-value" type="i">
                        <default>15</default>
+                       <range min="1" max="25"/>
                        <summary>Red value level</summary>
                        <description>The battery level below which the battery is displayed as red. Also the 
value at which the low battery warning is displayed.</description>
                </key>
diff --git a/gnome-applets/battstat/battstat-applet.c b/gnome-applets/battstat/battstat-applet.c
index c18ebb422..33310b74e 100644
--- a/gnome-applets/battstat/battstat-applet.c
+++ b/gnome-applets/battstat/battstat-applet.c
@@ -705,7 +705,8 @@ update_battery_image (ProgressData *battstat, int batt_percent, int batt_time)
   GdkColor *color, *darkcolor;
   GdkPixbuf *pixbuf;
   guint progress_value;
-  gint i, x;
+  guint i;
+  gint x;
   int batt_life;
 
   if (!battstat->showbattery)
diff --git a/gnome-applets/battstat/battstat-upower.c b/gnome-applets/battstat/battstat-upower.c
index 5fc90fb93..4252126a1 100644
--- a/gnome-applets/battstat/battstat-upower.c
+++ b/gnome-applets/battstat/battstat-upower.c
@@ -183,7 +183,7 @@ battstat_upower_get_battery_info( BatteryStatus *status )
   int charging = 0;
 
   /* For each physical battery bay... */
-  int i;
+  unsigned int i;
   for( i = 0; i < devices->len; i++ )
   {
     UpDevice *upd = g_ptr_array_index( devices, i );
diff --git a/gnome-applets/battstat/battstat.h b/gnome-applets/battstat/battstat.h
index 21dd12211..15da93a10 100644
--- a/gnome-applets/battstat/battstat.h
+++ b/gnome-applets/battstat/battstat.h
@@ -103,9 +103,9 @@ typedef struct _BattstatApplet
   GtkWidget *hbox_ptr;
 
   /* flags set from gsettings or the properties dialog */
-  guint red_val;
-  guint orange_val;
-  guint yellow_val;
+  gint red_val;
+  gint orange_val;
+  gint yellow_val;
   gboolean red_value_is_time;
   gboolean lowbattnotification;
   gboolean fullbattnot;
@@ -147,11 +147,11 @@ typedef struct _BattstatApplet
   int timeout;
 
   /* last_* for the benefit of the check_for_updates function */
-  guint last_batt_life;
-  guint last_acline_status;
+  gint last_batt_life;
+  gint last_acline_status;
   StatusPixmapIndex last_pixmap_index;
-  guint last_charging;
-  guint last_minutes;
+  gint last_charging;
+  gint last_minutes;
   gboolean last_present;
 } ProgressData;