src/utils.[ch]: Make desktop env checks available globally, load MSD media keys settings, if in MATE environment.

1 files changed, 2 insertions, 63 deletions

diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c
index 3965865..33305d9 100644
--- a/src/backend-dbus/actions.c
+++ b/src/backend-dbus/actions.c
@@ -29,6 +29,8 @@
 
 #include "actions.h"
 
+#include "../utils.h"
+
 enum
 {
   END_SESSION_TYPE_LOGOUT = 0,
@@ -81,69 +83,6 @@ log_and_clear_error (GError ** err, const char * loc, const char * func)
     }
 }
 
-static 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;
-}
-
-static 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;
-}
-
-static 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;
-}
-
 
 /***
 ****