GNOME.org
 

[gnome-power-manager] trivial: Rename an internal source file as DeviceKit-power might not be providing the data

commit 1559f7d651366d1da8e374c2e88150da2d6cb11f
Author: Richard Hughes <richard hughsie com>
Date:   Fri Feb 5 10:20:42 2010 +0000

    trivial: Rename an internal source file as DeviceKit-power might not be providing the data

 src/Makefile.am                       |    8 +++---
 src/gpm-engine.c                      |   10 ++++----
 src/gpm-manager.c                     |   10 ++++----
 src/gpm-statistics.c                  |    4 +-
 src/gpm-tray-icon.c                   |    4 +-
 src/{gpm-devicekit.c => gpm-upower.c} |   36 ++++++++++++++++----------------
 src/{gpm-devicekit.h => gpm-upower.h} |    6 ++--
 7 files changed, 39 insertions(+), 39 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index a90b4dc..4f9e401 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,8 +78,8 @@ libgpmshared_a_SOURCES =				\
 	gpm-common.c					\
 	gpm-marshal.h					\
 	gpm-marshal.c					\
-	gpm-devicekit.c					\
-	gpm-devicekit.h					\
+	gpm-upower.c					\
+	gpm-upower.h					\
 	$(NULL)
 
 gnome_power_statistics_SOURCES =			\
@@ -247,8 +247,8 @@ gnome_power_self_test_SOURCES =				\
 	gpm-marshal.c					\
 	gpm-common.h					\
 	gpm-common.c					\
-	gpm-devicekit.h					\
-	gpm-devicekit.c					\
+	gpm-upower.h					\
+	gpm-upower.c					\
 	$(NULL)
 
 gnome_power_self_test_LDADD =				\
diff --git a/src/gpm-engine.c b/src/gpm-engine.c
index 99b5d5c..d244219 100644
--- a/src/gpm-engine.c
+++ b/src/gpm-engine.c
@@ -30,7 +30,7 @@
 #include "egg-debug.h"
 
 #include "gpm-common.h"
-#include "gpm-devicekit.h"
+#include "gpm-upower.h"
 #include "gpm-marshal.h"
 #include "gpm-engine.h"
 #include "gpm-stock-icons.h"
@@ -246,7 +246,7 @@ gpm_engine_get_summary (GpmEngine *engine)
 	array = engine->priv->array;
 	for (i=0;i<array->len;i++) {
 		device = g_ptr_array_index (engine->priv->array, i);
-		part = gpm_devicekit_get_object_summary (device);
+		part = gpm_upower_get_device_summary (device);
 		if (part != NULL)
 			g_string_append_printf (tooltip, "%s\n", part);
 		g_free (part);
@@ -296,15 +296,15 @@ gpm_engine_get_icon_priv (GpmEngine *engine, DkpDeviceType device_type, GpmEngin
 		if (type == device_type && is_present) {
 			if (warning != GPM_ENGINE_WARNING_NONE) {
 				if (warning_temp == warning)
-					return gpm_devicekit_get_object_icon (device);
+					return gpm_upower_get_device_icon (device);
 				continue;
 			}
 			if (use_state) {
 				if (state == DKP_DEVICE_STATE_CHARGING || state == DKP_DEVICE_STATE_DISCHARGING)
-					return gpm_devicekit_get_object_icon (device);
+					return gpm_upower_get_device_icon (device);
 				continue;
 			}
-			return gpm_devicekit_get_object_icon (device);
+			return gpm_upower_get_device_icon (device);
 		}
 	}
 	return NULL;
diff --git a/src/gpm-manager.c b/src/gpm-manager.c
index e5d1ab5..68577b9 100644
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -59,7 +59,7 @@
 #include "gpm-prefs-server.h"
 #include "gpm-tray-icon.h"
 #include "gpm-engine.h"
-#include "gpm-devicekit.h"
+#include "gpm-upower.h"
 #include "gpm-disks.h"
 
 #include "org.gnome.PowerManager.Backlight.h"
@@ -1297,7 +1297,7 @@ gpm_manager_engine_discharging_cb (GpmEngine *engine, DkpDevice *device, GpmMana
 		goto out;
 	}
 
-	icon = gpm_devicekit_get_object_icon (device);
+	icon = gpm_upower_get_device_icon (device);
 	/* show the notification */
 	gpm_manager_notify (manager, &manager->priv->notification_discharging, title, message, GPM_MANAGER_NOTIFY_TIMEOUT_LONG,
 			    icon, NOTIFY_URGENCY_NORMAL);
@@ -1419,7 +1419,7 @@ gpm_manager_engine_charge_low_cb (GpmEngine *engine, DkpDevice *device, GpmManag
 	}
 
 	/* get correct icon */
-	icon = gpm_devicekit_get_object_icon (device);
+	icon = gpm_upower_get_device_icon (device);
 	gpm_manager_notify (manager, &manager->priv->notification, title, message, GPM_MANAGER_NOTIFY_TIMEOUT_LONG, icon, NOTIFY_URGENCY_NORMAL);
 	gpm_manager_play (manager, GPM_MANAGER_SOUND_BATTERY_LOW, TRUE);
 out:
@@ -1544,7 +1544,7 @@ gpm_manager_engine_charge_critical_cb (GpmEngine *engine, DkpDevice *device, Gpm
 	}
 
 	/* get correct icon */
-	icon = gpm_devicekit_get_object_icon (device);
+	icon = gpm_upower_get_device_icon (device);
 	gpm_manager_notify (manager, &manager->priv->notification, title, message, GPM_MANAGER_NOTIFY_TIMEOUT_LONG, icon, NOTIFY_URGENCY_CRITICAL);
 	gpm_manager_play (manager, GPM_MANAGER_SOUND_BATTERY_LOW, TRUE);
 out:
@@ -1651,7 +1651,7 @@ gpm_manager_engine_charge_action_cb (GpmEngine *engine, DkpDevice *device, GpmMa
 		return;
 
 	/* get correct icon */
-	icon = gpm_devicekit_get_object_icon (device);
+	icon = gpm_upower_get_device_icon (device);
 	gpm_manager_notify (manager, &manager->priv->notification,
 			    title, message, GPM_MANAGER_NOTIFY_TIMEOUT_LONG,
 			    icon, NOTIFY_URGENCY_CRITICAL);
diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c
index 0651e6d..ec536c3 100644
--- a/src/gpm-statistics.c
+++ b/src/gpm-statistics.c
@@ -38,7 +38,7 @@
 
 #include "gpm-common.h"
 #include "gpm-stock-icons.h"
-#include "gpm-devicekit.h"
+#include "gpm-upower.h"
 #include "gpm-graph-widget.h"
 
 static GtkBuilder *builder = NULL;
@@ -1145,7 +1145,7 @@ gpm_stats_add_device (DkpDevice *device)
 
 	id = dkp_device_get_object_path (device);
 	text = gpm_device_type_to_localised_text (type, 1);
-	icon = gpm_devicekit_get_object_icon (device);
+	icon = gpm_upower_get_device_icon (device);
 
 	gtk_list_store_append (list_store_devices, &iter);
 	gtk_list_store_set (list_store_devices, &iter,
diff --git a/src/gpm-tray-icon.c b/src/gpm-tray-icon.c
index 9c33614..569d490 100644
--- a/src/gpm-tray-icon.c
+++ b/src/gpm-tray-icon.c
@@ -43,7 +43,7 @@
 
 #include "egg-debug.h"
 
-#include "gpm-devicekit.h"
+#include "gpm-upower.h"
 #include "gpm-engine.h"
 #include "gpm-common.h"
 #include "gpm-stock-icons.h"
@@ -238,7 +238,7 @@ gpm_tray_icon_add_device (GpmTrayIcon *icon, GtkMenu *menu, const GPtrArray *arr
 		item = gtk_image_menu_item_new_with_label (label);
 
 		/* generate the image */
-		icon_name = gpm_devicekit_get_object_icon (device);
+		icon_name = gpm_upower_get_device_icon (device);
 		image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
 		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
 		gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
diff --git a/src/gpm-devicekit.c b/src/gpm-upower.c
similarity index 95%
rename from src/gpm-devicekit.c
rename to src/gpm-upower.c
index 6e26827..c2eb8bd 100644
--- a/src/gpm-devicekit.c
+++ b/src/gpm-upower.c
@@ -27,14 +27,14 @@
 #include "egg-debug.h"
 #include "egg-precision.h"
 
-#include "gpm-devicekit.h"
+#include "gpm-upower.h"
 #include "gpm-common.h"
 
 #define GPM_DKP_TIME_PRECISION			5*60
 #define GPM_DKP_TEXT_MIN_TIME			120
 
 /**
- * gpm_devicekit_get_object_icon_index:
+ * gpm_upower_get_device_icon_index:
  * @percent: The charge of the device
  *
  * The index value depends on the percentage charge:
@@ -48,7 +48,7 @@
  * Return value: The character string for the filename suffix.
  **/
 static const gchar *
-gpm_devicekit_get_object_icon_index (DkpDevice *device)
+gpm_upower_get_device_icon_index (DkpDevice *device)
 {
 	gdouble percentage;
 	/* get device properties */
@@ -67,13 +67,13 @@ gpm_devicekit_get_object_icon_index (DkpDevice *device)
 }
 
 /**
- * gpm_devicekit_get_object_icon:
+ * gpm_upower_get_device_icon:
  *
  * Need to free the return value
  *
  **/
 gchar *
-gpm_devicekit_get_object_icon (DkpDevice *device)
+gpm_upower_get_device_icon (DkpDevice *device)
 {
 	gchar *filename = NULL;
 	const gchar *prefix = NULL;
@@ -110,11 +110,11 @@ gpm_devicekit_get_object_icon (DkpDevice *device)
 			filename = g_strdup_printf ("gpm-%s-100", prefix);
 
 		} else if (state == DKP_DEVICE_STATE_CHARGING) {
-			index_str = gpm_devicekit_get_object_icon_index (device);
+			index_str = gpm_upower_get_device_icon_index (device);
 			filename = g_strdup_printf ("gpm-%s-%s-charging", prefix, index_str);
 
 		} else if (state == DKP_DEVICE_STATE_DISCHARGING) {
-			index_str = gpm_devicekit_get_object_icon_index (device);
+			index_str = gpm_upower_get_device_icon_index (device);
 			filename = g_strdup_printf ("gpm-%s-%s", prefix, index_str);
 		}
 	} else if (type == DKP_DEVICE_TYPE_BATTERY) {
@@ -135,11 +135,11 @@ gpm_devicekit_get_object_icon (DkpDevice *device)
 #endif
 
 		} else if (state == DKP_DEVICE_STATE_CHARGING) {
-			index_str = gpm_devicekit_get_object_icon_index (device);
+			index_str = gpm_upower_get_device_icon_index (device);
 			filename = g_strdup_printf ("gpm-%s-%s-charging", prefix, index_str);
 
 		} else if (state == DKP_DEVICE_STATE_DISCHARGING) {
-			index_str = gpm_devicekit_get_object_icon_index (device);
+			index_str = gpm_upower_get_device_icon_index (device);
 			filename = g_strdup_printf ("gpm-%s-%s", prefix, index_str);
 
 #if !DKP_CHECK_VERSION(0x009)
@@ -158,20 +158,20 @@ gpm_devicekit_get_object_icon (DkpDevice *device)
 
 			/* try to find a suitable icon depending on AC state */
 			if (on_battery) {
-				index_str = gpm_devicekit_get_object_icon_index (device);
+				index_str = gpm_upower_get_device_icon_index (device);
 				filename = g_strdup_printf ("gpm-%s-%s", prefix, index_str);
 			} else {
-				index_str = gpm_devicekit_get_object_icon_index (device);
+				index_str = gpm_upower_get_device_icon_index (device);
 				filename = g_strdup_printf ("gpm-%s-%s-charging", prefix, index_str);
 			}
 #else
 		} else if (state == DKP_DEVICE_STATE_PENDING_CHARGE) {
-			index_str = gpm_devicekit_get_object_icon_index (device);
+			index_str = gpm_upower_get_device_icon_index (device);
 			/* FIXME: do new grey icons */
 			filename = g_strdup_printf ("gpm-%s-%s-charging", prefix, index_str);
 
 		} else if (state == DKP_DEVICE_STATE_PENDING_DISCHARGE) {
-			index_str = gpm_devicekit_get_object_icon_index (device);
+			index_str = gpm_upower_get_device_icon_index (device);
 			filename = g_strdup_printf ("gpm-%s-%s", prefix, index_str);
 		} else {
 			filename = g_strdup ("gpm-battery-missing");
@@ -189,7 +189,7 @@ gpm_devicekit_get_object_icon (DkpDevice *device)
 			filename = g_strdup_printf ("gpm-%s-100", prefix);
 
 		} else if (state == DKP_DEVICE_STATE_DISCHARGING) {
-			index_str = gpm_devicekit_get_object_icon_index (device);
+			index_str = gpm_upower_get_device_icon_index (device);
 			filename = g_strdup_printf ("gpm-%s-%s", prefix, index_str);
 		}
 	}
@@ -205,10 +205,10 @@ gpm_devicekit_get_object_icon (DkpDevice *device)
 }
 
 /**
- * gpm_devicekit_get_object_summary:
+ * gpm_upower_get_device_summary:
  **/
 gchar *
-gpm_devicekit_get_object_summary (DkpDevice *device)
+gpm_upower_get_device_summary (DkpDevice *device)
 {
 	const gchar *type_desc = NULL;
 	gchar *description = NULL;
@@ -338,10 +338,10 @@ gpm_devicekit_get_object_summary (DkpDevice *device)
 }
 
 /**
- * gpm_devicekit_get_object_description:
+ * gpm_upower_get_device_description:
  **/
 gchar *
-gpm_devicekit_get_object_description (DkpDevice *device)
+gpm_upower_get_device_description (DkpDevice *device)
 {
 	GString	*details;
 	const gchar *text;
diff --git a/src/gpm-devicekit.h b/src/gpm-upower.h
similarity index 87%
rename from src/gpm-devicekit.h
rename to src/gpm-upower.h
index c608f53..67f75cf 100644
--- a/src/gpm-devicekit.h
+++ b/src/gpm-upower.h
@@ -31,9 +31,9 @@ const gchar	*gpm_device_type_to_localised_text	(DkpDeviceType	 type,
 							 guint		 number);
 const gchar	*gpm_device_type_to_icon		(DkpDeviceType	 type);
 const gchar	*gpm_device_technology_to_localised_text (DkpDeviceTechnology technology_enum);
-gchar		*gpm_devicekit_get_object_icon		(DkpDevice *device);
-gchar		*gpm_devicekit_get_object_summary	(DkpDevice *device);
-gchar		*gpm_devicekit_get_object_description	(DkpDevice *device);
+gchar		*gpm_upower_get_device_icon		(DkpDevice *device);
+gchar		*gpm_upower_get_device_summary		(DkpDevice *device);
+gchar		*gpm_upower_get_device_description	(DkpDevice *device);
 
 G_END_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]