Changeset 0e9f798


Ignore:
Timestamp:
01/31/14 10:12:23 (7 months ago)
Author:
Kris Moore <kris@…>
Branches:
releng/10.0
Children:
00b8b8a
Parents:
021fffe1
Message:

Backport some DE detection fixes to 10.0

Location:
src-sh/de-info/de-profiles
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • src-sh/de-info/de-profiles/cinnamon.profile

    r6f64bff5 r0e9f798  
    66DE_TERMINAL_TITLE="-t" 
    77DE_TERMINAL_COMMAND="-e" 
     8DE_SESSION_NAME="CINNAMON" 
    89 
    910active() { 
    10 if [ "$DESKTOP_SESSION" = "cinnamon" ] || [ "$DESKTOP_SESSION" = "32Cinnamon" ] || [ "$DESKTOP_SESSION" = "openbox-cinnamon"  ] || [ ! -z $CINNAMON_VERSION ]; then 
     11#if [ "$DESKTOP_SESSION" = "cinnamon" ] || [ "$DESKTOP_SESSION" = "32Cinnamon" ] || [ "$DESKTOP_SESSION" = "openbox-cinnamon"  ] || [ ! -z $CINNAMON_VERSION ]; then 
     12if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
    1113DE_ACTIVE=1 
    1214fi   
  • src-sh/de-info/de-profiles/gnome.profile

    rbee06b9 r0e9f798  
    66DE_TERMINAL_TITLE="-t" 
    77DE_TERMINAL_COMMAND="-e" 
     8DE_SESSION_NAME="GNOME" 
    89 
    910active() { 
    10 if [ "$DESKTOP_SESSION" = "gnome" ] || [ "$DESKTOP_SESSION" = "02gnome" ] || [ "$DESKTOP_SESSION" = "openbox-gnome"  ] ; then 
     11if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
    1112DE_ACTIVE=1 
    1213fi   
  • src-sh/de-info/de-profiles/kde.profile

    rbee06b9 r0e9f798  
    88DE_TERMINAL_SEPARATE_ARGS="YES" 
    99DE_FILEMAN="dolphin %s" 
     10DE_SESSION_NAME="KDE" 
    1011 
    1112active() { 
    1213 
    13  if [ -n "$KDE_SESSION_UID" ] || [ "${XDG_CURRENT_DESKTOP}" == "KDE" ] ; then 
     14 if [ -n "$KDE_SESSION_UID" ] || [ "${XDG_CURRENT_DESKTOP}" == "KDE" ] || [ "$DE_SESSION_NAME" == "$PCDM_SESSION" ] ; then 
    1415    DE_ACTIVE=1 
    1516 fi 
  • src-sh/de-info/de-profiles/lxde.profile

    rbee06b9 r0e9f798  
    66DE_TERMINAL_TITLE="-T" 
    77DE_TERMINAL_COMMAND="-e" 
     8DE_SESSION_NAME="LXDE" 
    89 
    910active() 
    1011{ 
    11 if [ "$DESKTOP_SESSION" = "LXDE" ] ; then 
     12if [ "$DESKTOP_SESSION" = "LXDE" ] || [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
    1213DE_ACTIVE=1 
    1314fi 
  • src-sh/de-info/de-profiles/mate.profile

    rd7a088d r0e9f798  
    66DE_TERMINAL_TITLE="-t" 
    77DE_TERMINAL_COMMAND="-e" 
     8DE_SESSION_NAME="MATE" 
    89 
    910active() { 
    10 if [ "$DESKTOP_SESSION" = "mate" ] || [ "$DESKTOP_SESSION" = "02Mate" ] || [ "$DESKTOP_SESSION" = "openbox-mate"  ] ; then 
     11if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
    1112DE_ACTIVE=1 
    1213fi   
  • src-sh/de-info/de-profiles/xfce.profile

    rbee06b9 r0e9f798  
    77DE_TERMINAL_TITLE="-T" 
    88DE_TERMINAL_COMMAND="-e" 
     9DE_SESSION_NAME="XFCE" 
    910 
    10 active() 
    11 { 
    12 if [ "$DESKTOP_SESSION" = "xfce4" -o "$DESKTOP_SESSION" = "04xfce" ]; then 
     11active() { 
     12if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
    1313DE_ACTIVE=1 
    14 fi 
     14fi   
     15 
    1516} 
    1617 
Note: See TracChangeset for help on using the changeset viewer.