[Xfce4-commits] <xfce4-appfinder:master> Use new xdg function to set environment.

[Nick Schermer]

Updating branch refs/heads/master
         to eb9f5f8095c782fa3504955b978257b78820a7eb (commit)
       from 1d3756c50096a7257d62c19f4302947ce464f510 (commit)

commit eb9f5f8095c782fa3504955b978257b78820a7eb
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Aug 2 22:07:23 2013 +0200

    Use new xdg function to set environment.

 configure.ac.in |    2 +-
 src/main.c      |   10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 05d7108..a0dc536 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -75,7 +75,7 @@ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0])
 XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
-XDT_CHECK_PACKAGE([GARCON], [garcon-1], [0.2.0])
+XDT_CHECK_PACKAGE([GARCON], [garcon-1], [0.3.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0])
 
 dnl ************************************
diff --git a/src/main.c b/src/main.c
index 4815b21..f0ea074 100644
--- a/src/main.c
+++ b/src/main.c
@@ -279,14 +279,8 @@ main (gint argc, gchar **argv)
         }
     }
 
-  /* if the value is unset, fallback to XFCE, if the
-   * value is empty, allow all applications in the menu */
-  desktop = g_getenv ("XDG_CURRENT_DESKTOP");
-  if (G_LIKELY (desktop == NULL))
-    desktop = "XFCE";
-  else if (*desktop == '\0')
-    desktop = NULL;
-  garcon_set_environment (desktop);
+  /* init garcon environment */
+  garcon_set_environment_xdg (GARCON_ENVIRONMENT_XFCE);
 
   if (!xfconf_init (&error))
     {