debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use DESKTOP_SESSION variable if set to look for Xfce

Browse source
This commit is contained in:
Christian Dywan 2011-02-08 19:10:00 +01:00
parent 6642c1ad97
commit 6c0395b65e
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
midori/sokoke.c
View file

@ -970,7 +970,16 @@ sokoke_get_desktop (void)
static SokokeDesktop desktop = SOKOKE_DESKTOP_UNTESTED; static SokokeDesktop desktop = SOKOKE_DESKTOP_UNTESTED;
if (G_UNLIKELY (desktop == SOKOKE_DESKTOP_UNTESTED)) if (G_UNLIKELY (desktop == SOKOKE_DESKTOP_UNTESTED))
{ {
/* Are we running in Xfce? */ desktop = SOKOKE_DESKTOP_UNKNOWN;
/* Are we running in Xfce >= 4.8? */
if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xfce"))
{
desktop = SOKOKE_DESKTOP_XFCE;
}
else
{
/* Are we running in Xfce <= 4.6? */
GdkDisplay* display = gdk_display_get_default (); GdkDisplay* display = gdk_display_get_default ();
Display* xdisplay = GDK_DISPLAY_XDISPLAY (display); Display* xdisplay = GDK_DISPLAY_XDISPLAY (display);
Window root_window = RootWindow (xdisplay, 0); Window root_window = RootWindow (xdisplay, 0);
@ -984,7 +993,6 @@ sokoke_get_desktop (void)
save_mode_atom, 0, (~0L), save_mode_atom, 0, (~0L),
False, AnyPropertyType, &actual_type, &actual_format, False, AnyPropertyType, &actual_type, &actual_format,
&n_items, &bytes, (unsigned char**)&value); &n_items, &bytes, (unsigned char**)&value);
desktop = SOKOKE_DESKTOP_UNKNOWN;
if (status == Success) if (status == Success)
{ {
if (n_items == 6 && !strncmp (value, "xfce4", 6)) if (n_items == 6 && !strncmp (value, "xfce4", 6))
@ -992,6 +1000,7 @@ sokoke_get_desktop (void)
XFree (value); XFree (value);
} }
} }
}
return desktop; return desktop;
#else #else