[gnome-builder] battery-monitor: more style clean ups

[Ray Strode <halfline src gnome org>]

commit 36f8f1c75babbeaa1cf868309ce433f6dbcf2d5e
Author: Ray Strode <rstrode redhat com>
Date:   Thu Oct 29 08:18:56 2015 -0400

    battery-monitor: more style clean ups
    
    The sed substitution for commit
    
    d9922c159b1edfaff185f116cb3e7faa36aa2c6b
    
    fell over for the globals in the battery-monitor
    code.
    
    This commit mops up the fall out.

 libide/ide-battery-monitor.c |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/libide/ide-battery-monitor.c b/libide/ide-battery-monitor.c
index ac783fa..c45ff71 100644
--- a/libide/ide-battery-monitor.c
+++ b/libide/ide-battery-monitor.c
@@ -22,9 +22,9 @@
 
 #define CONSERVE_THRESHOLD 50.0
 
-static GDBusProxy *u_powerProxy;
-static GDBusProxy *u_powerDeviceProxy;
-static gint        u_powerHold;
+static GDBusProxy *power_proxy;
+static GDBusProxy *power_device_proxy;
+static gint        power_hold;
 
 G_LOCK_DEFINE_STATIC (proxy_lock);
 
@@ -35,7 +35,7 @@ ide_battery_monitor_get_proxy (void)
 
   G_LOCK (proxy_lock);
 
-  if (!u_powerProxy)
+  if (!power_proxy)
     {
       GDBusConnection *bus;
 
@@ -43,19 +43,19 @@ ide_battery_monitor_get_proxy (void)
 
       if (bus)
         {
-          u_powerProxy = g_dbus_proxy_new_sync (bus,
-                                                G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
-                                                NULL,
-                                                "org.freedesktop.UPower",
-                                                "/org/freedesktop/UPower",
-                                                "org.freedesktop.UPower",
-                                                NULL,
-                                                NULL);
+          power_proxy = g_dbus_proxy_new_sync (bus,
+                                               G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
+                                               NULL,
+                                               "org.freedesktop.UPower",
+                                               "/org/freedesktop/UPower",
+                                               "org.freedesktop.UPower",
+                                               NULL,
+                                               NULL);
           g_object_unref (bus);
         }
     }
 
-  proxy = u_powerProxy ? g_object_ref (u_powerProxy) : NULL;
+  proxy = power_proxy ? g_object_ref (power_proxy) : NULL;
 
   G_UNLOCK (proxy_lock);
 
@@ -69,7 +69,7 @@ ide_battery_monitor_get_device_proxy (void)
 
   G_LOCK (proxy_lock);
 
-  if (!u_powerDeviceProxy)
+  if (!power_device_proxy)
     {
       GDBusConnection *bus;
 
@@ -77,7 +77,7 @@ ide_battery_monitor_get_device_proxy (void)
 
       if (bus)
         {
-          u_powerDeviceProxy = g_dbus_proxy_new_sync (bus,
+          power_device_proxy = g_dbus_proxy_new_sync (bus,
                                                       G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
                                                       NULL,
                                                       "org.freedesktop.UPower",
@@ -89,7 +89,7 @@ ide_battery_monitor_get_device_proxy (void)
         }
     }
 
-  proxy = u_powerDeviceProxy ? g_object_ref (u_powerDeviceProxy) : NULL;
+  proxy = power_device_proxy ? g_object_ref (power_device_proxy) : NULL;
 
   G_UNLOCK (proxy_lock);
 
@@ -159,10 +159,10 @@ _ide_battery_monitor_shutdown (void)
 {
   G_LOCK (proxy_lock);
 
-  if (--u_powerHold == 0)
+  if (--power_hold == 0)
     {
-      g_clear_object (&u_powerProxy);
-      g_clear_object (&u_powerDeviceProxy);
+      g_clear_object (&power_proxy);
+      g_clear_object (&power_device_proxy);
     }
 
   G_UNLOCK (proxy_lock);
@@ -175,7 +175,7 @@ _ide_battery_monitor_init (void)
   g_autoptr(GDBusProxy) device_proxy = NULL;
 
   G_LOCK (proxy_lock);
-  u_powerHold++;
+  power_hold++;
   G_UNLOCK (proxy_lock);
 
   proxy = ide_battery_monitor_get_proxy ();