From 06a9f9410791e2d7d682947e827ed7b22d0c60f9 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Mon, 17 May 2021 19:10:16 +0200 Subject: Use prefixed libayatana-common symbols --- src/service.c | 12 ++++++------ src/utils.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/service.c b/src/service.c index db1fad5..c93c4b6 100644 --- a/src/service.c +++ b/src/service.c @@ -401,7 +401,7 @@ count_batteries (GList * devices, int *total, int *inuse) static gboolean should_be_visible (IndicatorPowerService * self) { - if (!is_lomiri()) + if (!ayatana_common_utils_is_lomiri()) { return TRUE; } @@ -817,23 +817,23 @@ on_statistics_activated (GSimpleAction * a G_GNUC_UNUSED, GVariant * param, gpointer gself G_GNUC_UNUSED) { - if (is_mate()) + if (ayatana_common_utils_is_mate()) { char *cmd = g_strconcat ("mate-power-statistics", " --device ", g_variant_get_string (param, NULL), NULL); - execute_command (cmd); + ayatana_common_utils_execute_command (cmd); g_free (cmd); } - else if (is_budgie() || is_gnome() || is_unity()) + else if (ayatana_common_utils_is_budgie() || ayatana_common_utils_is_gnome() || ayatana_common_utils_is_unity()) { char *cmd = g_strconcat ("gnome-power-statistics", " --device ", g_variant_get_string (param, NULL), NULL); - execute_command (cmd); + ayatana_common_utils_execute_command (cmd); g_free (cmd); } else { - zenity_warning ("dialog-warning", + ayatana_common_utils_zenity_warning ("dialog-warning", _("Warning"), _("The Ayatana Power Indicator does not support evoking the\npower statistics application of your desktop environment, yet.\n\nPlease report this to the developers at:\nhttps://github.com/ArcticaProject/ayatana-indicator-power/issues")); } diff --git a/src/utils.c b/src/utils.c index 992b84d..fd3a951 100644 --- a/src/utils.c +++ b/src/utils.c @@ -43,19 +43,19 @@ utils_handle_settings_request (void) else #endif /* XFCE does not set XDG_CURRENT_DESKTOP, it seems... */ - if (is_xfce()) + if (ayatana_common_utils_is_xfce()) { control_center_cmd = "xfce4-power-manager-settings"; } - else if (is_mate()) + else if (ayatana_common_utils_is_mate()) { control_center_cmd = "mate-power-preferences"; } - else if (is_pantheon()) + else if (ayatana_common_utils_is_pantheon()) { control_center_cmd = "switchboard --open-plug system-pantheon-power"; } - else if (is_budgie() || is_unity() || is_gnome()) + else if (ayatana_common_utils_is_budgie() || ayatana_common_utils_is_unity() || ayatana_common_utils_is_gnome()) { gchar *path; @@ -69,7 +69,7 @@ utils_handle_settings_request (void) } else { - zenity_warning ("dialog-warning", + ayatana_common_utils_zenity_warning ("dialog-warning", _("Warning"), _("The Ayatana Power Indicator does not support evoking the\npower settings dialog of your desktop environment, yet.\n\nPlease report this to the developers at:\nhttps://github.com/ArcticaProject/ayatana-indicator-power/issues")); } @@ -77,6 +77,6 @@ utils_handle_settings_request (void) if (control_center_cmd) { - execute_command(control_center_cmd); + ayatana_common_utils_execute_command(control_center_cmd); } } -- cgit v1.2.3