diff options
author | Robert Tari <robert@tari.in> | 2021-05-12 11:59:03 +0200 |
---|---|---|
committer | Robert Tari <robert@tari.in> | 2021-05-12 11:59:03 +0200 |
commit | 68f98ee4eb0cda37b11555fdef10c742bddf122e (patch) | |
tree | f0d6acc580ac40f96209376d4e5581e3f9b8aa0a | |
parent | 75dd432a3a70bfb40e74d6b14fe431d604f7e812 (diff) | |
download | libayatana-common-68f98ee4eb0cda37b11555fdef10c742bddf122e.tar.gz libayatana-common-68f98ee4eb0cda37b11555fdef10c742bddf122e.tar.bz2 libayatana-common-68f98ee4eb0cda37b11555fdef10c742bddf122e.zip |
Prefix functions in utils with ayatana_common_utils_
fixes https://github.com/AyatanaIndicators/libayatana-common/issues/18
-rw-r--r-- | src/utils.c | 26 | ||||
-rw-r--r-- | src/utils.h | 22 | ||||
-rw-r--r-- | tests/tst_utils.cpp | 28 |
3 files changed, 38 insertions, 38 deletions
diff --git a/src/utils.c b/src/utils.c index e5e96fa..b5a9690 100644 --- a/src/utils.c +++ b/src/utils.c @@ -46,7 +46,7 @@ is_xdg_current_desktop (const gchar* desktop) } gboolean -is_lomiri () +ayatana_common_utils_is_lomiri () { // For legacy reasons keep the MIR_SOCKET hack return (g_getenv ("MIR_SOCKET") != NULL || @@ -54,37 +54,37 @@ is_lomiri () } gboolean -is_gnome () +ayatana_common_utils_is_gnome () { return is_xdg_current_desktop(DESKTOP_GNOME); } gboolean -is_unity () +ayatana_common_utils_is_unity () { return is_xdg_current_desktop(DESKTOP_UNITY); } gboolean -is_mate () +ayatana_common_utils_is_mate () { return is_xdg_current_desktop(DESKTOP_MATE); } gboolean -is_xfce () +ayatana_common_utils_is_xfce () { return is_xdg_current_desktop(DESKTOP_XFCE); } gboolean -is_pantheon () +ayatana_common_utils_is_pantheon () { return is_xdg_current_desktop(DESKTOP_PANTHEON); } gboolean -is_budgie () +ayatana_common_utils_is_budgie () { return is_xdg_current_desktop(DESKTOP_BUDGIE); } @@ -119,7 +119,7 @@ find_browser () } gboolean -execute_command (const gchar * cmd) +ayatana_common_utils_execute_command (const gchar * cmd) { GError * err = NULL; @@ -136,11 +136,11 @@ execute_command (const gchar * cmd) } gboolean -open_url (const gchar * url) +ayatana_common_utils_open_url (const gchar * url) { char * browser = NULL; - if (is_lomiri()) + if (ayatana_common_utils_is_lomiri()) { #ifdef HAS_URLDISPATCHER lomiri_url_dispatch_send(url, NULL, NULL); @@ -154,14 +154,14 @@ open_url (const gchar * url) browser = find_browser(); if (browser != NULL) - return execute_command(g_strdup_printf("%s '%s'", browser, url)); + return ayatana_common_utils_execute_command(g_strdup_printf("%s '%s'", browser, url)); else return FALSE; } gboolean -have_program (const gchar * program) +ayatana_common_utils_have_program (const gchar * program) { gchar *path; gboolean have; @@ -174,7 +174,7 @@ have_program (const gchar * program) } gboolean -zenity_warning (const char * icon_name, +ayatana_common_utils_zenity_warning (const char * icon_name, const char * title, const char * text) { diff --git a/src/utils.h b/src/utils.h index a433a23..7301499 100644 --- a/src/utils.h +++ b/src/utils.h @@ -28,15 +28,15 @@ #define DESKTOP_PANTHEON "PANTHEON" #define DESKTOP_BUDGIE "Budgie" -gboolean is_lomiri(); -gboolean is_unity(); -gboolean is_gnome(); -gboolean is_mate(); -gboolean is_xfce(); -gboolean is_pantheon(); -gboolean is_budgie(); +gboolean ayatana_common_utils_is_lomiri(); +gboolean ayatana_common_utils_is_unity(); +gboolean ayatana_common_utils_is_gnome(); +gboolean ayatana_common_utils_is_mate(); +gboolean ayatana_common_utils_is_xfce(); +gboolean ayatana_common_utils_is_pantheon(); +gboolean ayatana_common_utils_is_budgie(); -gboolean execute_command(const gchar * cmd); -gboolean open_url(const gchar * url); -gboolean have_program(const gchar * program); -gboolean zenity_warning(const char *icon_name, const char *title, const char *text); +gboolean ayatana_common_utils_execute_command(const gchar * cmd); +gboolean ayatana_common_utils_open_url(const gchar * url); +gboolean ayatana_common_utils_have_program(const gchar * program); +gboolean ayatana_common_utils_zenity_warning(const char *icon_name, const char *title, const char *text); diff --git a/tests/tst_utils.cpp b/tests/tst_utils.cpp index 503afc9..c62bf43 100644 --- a/tests/tst_utils.cpp +++ b/tests/tst_utils.cpp @@ -38,44 +38,44 @@ public: TEST_F(XdgCurrentDesktopUtilsTest, isLomiri) { - EXPECT_FALSE(is_lomiri()); + EXPECT_FALSE(ayatana_common_utils_is_lomiri()); setenv("XDG_CURRENT_DESKTOP", "Lomiri", 1); - EXPECT_TRUE(is_lomiri()); + EXPECT_TRUE(ayatana_common_utils_is_lomiri()); } TEST_F(XdgCurrentDesktopUtilsTest, isGnome) { - EXPECT_FALSE(is_gnome()); + EXPECT_FALSE(ayatana_common_utils_is_gnome()); setenv("XDG_CURRENT_DESKTOP", "GNOME", 1); - EXPECT_TRUE(is_gnome()); + EXPECT_TRUE(ayatana_common_utils_is_gnome()); } TEST_F(XdgCurrentDesktopUtilsTest, isUnity) { - EXPECT_FALSE(is_unity()); + EXPECT_FALSE(ayatana_common_utils_is_unity()); setenv("XDG_CURRENT_DESKTOP", "Unity", 1); - EXPECT_TRUE(is_unity()); + EXPECT_TRUE(ayatana_common_utils_is_unity()); } TEST_F(XdgCurrentDesktopUtilsTest, isMate) { - EXPECT_FALSE(is_mate()); + EXPECT_FALSE(ayatana_common_utils_is_mate()); setenv("XDG_CURRENT_DESKTOP", "MATE", 1); - EXPECT_TRUE(is_mate()); + EXPECT_TRUE(ayatana_common_utils_is_mate()); } TEST_F(XdgCurrentDesktopUtilsTest, isXfce) { - EXPECT_FALSE(is_xfce()); + EXPECT_FALSE(ayatana_common_utils_is_xfce()); setenv("XDG_CURRENT_DESKTOP", "XFCE", 1); - EXPECT_TRUE(is_xfce()); + EXPECT_TRUE(ayatana_common_utils_is_xfce()); } TEST_F(XdgCurrentDesktopUtilsTest, isPantheon) { - EXPECT_FALSE(is_pantheon()); + EXPECT_FALSE(ayatana_common_utils_is_pantheon()); setenv("XDG_CURRENT_DESKTOP", "PANTHEON", 1); - EXPECT_TRUE(is_pantheon()); + EXPECT_TRUE(ayatana_common_utils_is_pantheon()); } TEST_F(XdgCurrentDesktopUtilsTest, isBudgie) { - EXPECT_FALSE(is_budgie()); + EXPECT_FALSE(ayatana_common_utils_is_budgie()); setenv("XDG_CURRENT_DESKTOP", "Budgie:GNOME", 1); - EXPECT_TRUE(is_budgie()); + EXPECT_TRUE(ayatana_common_utils_is_budgie()); } |