summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2016-07-09 18:41:58 +0200
committerraveit65 <[email protected]>2016-07-25 16:13:40 +0200
commitbfc5fb932891932b3e5f46e8067a5593d461ab96 (patch)
tree561cda2ff6db0a2dbbdf8e8bcacfb4cc5857adcf
parente2d30b28338f4d2947117bd98b9555915fd55fe0 (diff)
downloadmate-power-manager-bfc5fb932891932b3e5f46e8067a5593d461ab96.tar.bz2
mate-power-manager-bfc5fb932891932b3e5f46e8067a5593d461ab96.tar.xz
rename a function to match upstream
taken from: https://git.gnome.org/browse/gnome-power-manager/commit/?id=f2c0409
-rw-r--r--src/gpm-manager.c2
-rw-r--r--src/gpm-statistics.c4
-rw-r--r--src/gpm-tray-icon.c2
-rw-r--r--src/gpm-upower.c8
-rw-r--r--src/gpm-upower.h2
5 files changed, 9 insertions, 9 deletions
diff --git a/src/gpm-manager.c b/src/gpm-manager.c
index d07cae8..bfbfa3a 100644
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -1204,7 +1204,7 @@ gpm_manager_engine_discharging_cb (GpmEngine *engine, UpDevice *device, GpmManag
/* only show text if there is a valid time */
if (time_to_empty > 0)
remaining_text = gpm_get_timestring (time_to_empty);
- kind_desc = gpm_device_kind_to_localised_text (kind, 1);
+ kind_desc = gpm_device_kind_to_localised_string (kind, 1);
if (kind == UP_DEVICE_KIND_BATTERY) {
/* TRANSLATORS: laptop battery is now discharging */
diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c
index 9fab6bc..a93631c 100644
--- a/src/gpm-statistics.c
+++ b/src/gpm-statistics.c
@@ -403,7 +403,7 @@ gpm_stats_update_info_page_details (UpDevice *device)
gpm_stats_add_info_data (_("Device"), device_path);
g_free (device_path);
- gpm_stats_add_info_data (_("Type"), gpm_device_kind_to_localised_text (kind, 1));
+ gpm_stats_add_info_data (_("Type"), gpm_device_kind_to_localised_string (kind, 1));
if (vendor != NULL && vendor[0] != '\0')
gpm_stats_add_info_data (_("Vendor"), vendor);
if (model != NULL && model[0] != '\0')
@@ -1238,7 +1238,7 @@ gpm_stats_add_device (UpDevice *device)
label = g_strdup_printf ("%s %s", vendor, model);
}
else {
- label = g_strdup_printf ("%s", gpm_device_kind_to_localised_text (kind, 1));
+ label = g_strdup_printf ("%s", gpm_device_kind_to_localised_string (kind, 1));
}
icon = gpm_upower_get_device_icon (device);
diff --git a/src/gpm-tray-icon.c b/src/gpm-tray-icon.c
index 47315ba..18c2c8b 100644
--- a/src/gpm-tray-icon.c
+++ b/src/gpm-tray-icon.c
@@ -266,7 +266,7 @@ gpm_tray_icon_add_device (GpmTrayIcon *icon, GtkMenu *menu, const GPtrArray *arr
label = g_strdup_printf ("%s %s (%.1f%%)", vendor, model, percentage);
}
else {
- label = g_strdup_printf ("%s (%.1f%%)", gpm_device_kind_to_localised_text (kind, 1), percentage);
+ label = g_strdup_printf ("%s (%.1f%%)", gpm_device_kind_to_localised_string (kind, 1), percentage);
}
item = gtk_image_menu_item_new_with_label (label);
diff --git a/src/gpm-upower.c b/src/gpm-upower.c
index 82d12e9..43f0568 100644
--- a/src/gpm-upower.c
+++ b/src/gpm-upower.c
@@ -206,7 +206,7 @@ gpm_upower_get_device_summary (UpDevice *device)
if (!is_present)
return NULL;
- kind_desc = gpm_device_kind_to_localised_text (kind, 1);
+ kind_desc = gpm_device_kind_to_localised_string (kind, 1);
/* don't display all the extra stuff for keyboards and mice */
if (kind == UP_DEVICE_KIND_MOUSE ||
@@ -352,7 +352,7 @@ gpm_upower_get_device_description (UpDevice *device)
NULL);
details = g_string_new ("");
- text = gpm_device_kind_to_localised_text (kind, 1);
+ text = gpm_device_kind_to_localised_string (kind, 1);
/* TRANSLATORS: the type of data, e.g. Laptop battery */
g_string_append_printf (details, "<b>%s</b> %s\n", _("Product:"), text);
@@ -466,10 +466,10 @@ gpm_upower_get_device_description (UpDevice *device)
}
/**
- * gpm_device_kind_to_localised_text:
+ * gpm_device_kind_to_localised_string:
**/
const gchar *
-gpm_device_kind_to_localised_text (UpDeviceKind kind, guint number)
+gpm_device_kind_to_localised_string (UpDeviceKind kind, guint number)
{
const gchar *text = NULL;
switch (kind) {
diff --git a/src/gpm-upower.h b/src/gpm-upower.h
index 3f43e64..a60d906 100644
--- a/src/gpm-upower.h
+++ b/src/gpm-upower.h
@@ -27,7 +27,7 @@
G_BEGIN_DECLS
-const gchar *gpm_device_kind_to_localised_text (UpDeviceKind kind,
+const gchar *gpm_device_kind_to_localised_string (UpDeviceKind kind,
guint number);
const gchar *gpm_device_kind_to_icon (UpDeviceKind kind);
const gchar *gpm_device_technology_to_localised_string (UpDeviceTechnology technology_enum);