aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt3
-rw-r--r--src/service.c2
-rw-r--r--src/utils.c121
-rw-r--r--src/utils.h7
4 files changed, 4 insertions, 129 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae45795..ecd4ff1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,8 @@ pkg_check_modules(SERVICE_DEPS REQUIRED
glib-2.0>=2.36
gio-2.0>=2.36
gio-unix-2.0>=2.36
- libnotify>=0.7.6)
+ libnotify>=0.7.6
+ libayatana-common>=0.9.0)
include_directories (SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS})
diff --git a/src/service.c b/src/service.c
index d7b4649..af46b87 100644
--- a/src/service.c
+++ b/src/service.c
@@ -20,7 +20,7 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
-
+#include <ayatana/common/utils.h>
#include "brightness.h"
#include "dbus-shared.h"
#include "device.h"
diff --git a/src/utils.c b/src/utils.c
index 82c5cf7..16dd776 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -19,27 +19,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <ayatana/common/utils.h>
#include "utils.h"
#ifdef HAS_URLDISPATCHER
# include <lomiri-url-dispatcher.h>
#endif
-/* Run a particular program based on an activation */
-void
-execute_command (const gchar * cmd)
-{
- GError * err = NULL;
-
- g_debug ("Issuing command '%s'", cmd);
-
- if (!g_spawn_command_line_async (cmd, &err))
- {
- g_warning ("Unable to start %s: %s", cmd, err->message);
- g_error_free (err);
- }
-}
-
gboolean
zenity_warning (const char * icon_name,
const char * title,
@@ -139,108 +125,3 @@ utils_handle_settings_request (void)
execute_command(control_center_cmd);
}
}
-
-gboolean
-is_unity ()
-{
- const gchar *xdg_current_desktop;
- gchar **desktop_names;
- int i;
-
- xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
- if (xdg_current_desktop != NULL) {
- desktop_names = g_strsplit (xdg_current_desktop, ":", 0);
- for (i = 0; desktop_names[i]; ++i) {
- if (!g_strcmp0 (desktop_names[i], "Unity")) {
- g_strfreev (desktop_names);
- return TRUE;
- }
- }
- g_strfreev (desktop_names);
- }
- return FALSE;
-}
-
-gboolean
-is_gnome ()
-{
- const gchar *xdg_current_desktop;
- gchar **desktop_names;
- int i;
-
- xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
- if (xdg_current_desktop != NULL) {
- desktop_names = g_strsplit (xdg_current_desktop, ":", 0);
- for (i = 0; desktop_names[i]; ++i) {
- if (!g_strcmp0 (desktop_names[i], "GNOME")) {
- g_strfreev (desktop_names);
- return TRUE;
- }
- }
- g_strfreev (desktop_names);
- }
- return FALSE;
-}
-
-gboolean
-is_mate ()
-{
- const gchar *xdg_current_desktop;
- gchar **desktop_names;
- int i;
-
- xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
- if (xdg_current_desktop != NULL) {
- desktop_names = g_strsplit (xdg_current_desktop, ":", 0);
- for (i = 0; desktop_names[i]; ++i) {
- if (!g_strcmp0 (desktop_names[i], "MATE")) {
- g_strfreev (desktop_names);
- return TRUE;
- }
- }
- g_strfreev (desktop_names);
- }
- return FALSE;
-}
-
-gboolean
-is_xfce ()
-{
- const gchar *xdg_current_desktop;
- gchar **desktop_names;
- int i;
-
- xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
- if (xdg_current_desktop != NULL) {
- desktop_names = g_strsplit (xdg_current_desktop, ":", 0);
- for (i = 0; desktop_names[i]; ++i) {
- if (!g_strcmp0 (desktop_names[i], "XFCE")) {
- g_strfreev (desktop_names);
- return TRUE;
- }
- }
- g_strfreev (desktop_names);
- }
- return FALSE;
-}
-
-gboolean
-is_pantheon ()
-{
- const gchar *xdg_current_desktop;
- gchar **desktop_names;
- int i;
-
- xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
- if (xdg_current_desktop != NULL) {
- desktop_names = g_strsplit (xdg_current_desktop, ":", 0);
- for (i = 0; desktop_names[i]; ++i) {
- if (!g_strcmp0 (desktop_names[i], "Pantheon")) {
- g_strfreev (desktop_names);
- return TRUE;
- }
- }
- g_strfreev (desktop_names);
- }
- return FALSE;
-}
diff --git a/src/utils.h b/src/utils.h
index 2666f02..7d03abb 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -21,15 +21,8 @@
#include <glib/gi18n.h>
#include <string.h>
-void execute_command (const gchar * cmd);
void utils_handle_settings_request(void);
gboolean zenity_warning (const char * icon_name, const char * title, const char * text);
-gboolean is_unity();
-gboolean is_gnome();
-gboolean is_mate();
-gboolean is_pantheon();
-gboolean is_xfce();
-
#endif /* __INDICATOR_POWER_UTILS_H__ */