Magellan Linux

  • Back to homepage
    • /[mcore-svn]/mcore-src/trunk/mcore-tools/src/modules/idesk/idesk.client.class.in

    Diff of /mcore-src/trunk/mcore-tools/src/modules/idesk/idesk.client.class.in

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2146 by niro, Fri Jan 10 13:32:59 2014 UTC revision 2147 by niro, Fri Jan 10 13:34:55 2014 UTC
    # Line 39  helper_generate_icon() Line 39  helper_generate_icon()
    39   [[ -z ${name} ]] && return 1   [[ -z ${name} ]] && return 1
    40   [[ -z ${command} ]] && return 1   [[ -z ${command} ]] && return 1
    41    
    42   [[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"   [[ -z ${dest} ]] && dest="${MCORE_UNPRIV_HOME}/.idesktop/${name}.lnk"
    43    
    44   # use some defaults for icon, dest, {x,y}res   # use some defaults for icon, dest, {x,y}res
    45   [[ -z ${xres} ]] && xres=50   [[ -z ${xres} ]] && xres=50
    # Line 48  helper_generate_icon() Line 48  helper_generate_icon()
    48   then   then
    49   # if no default icon is given use default.png   # if no default icon is given use default.png
    50   [[ -z ${deficon} ]] && deficon="default.png"   [[ -z ${deficon} ]] && deficon="default.png"
    51   icon="${ALX_SESSIONS_ICONS}/${deficon}"   icon="@@PIXMAPSDIR@@/${deficon}"
    52   fi   fi
    53    
    54   CONFIG="${dest}"   CONFIG="${dest}"
    # Line 88  helper_generate_all_desktop_icons() Line 88  helper_generate_all_desktop_icons()
    88   local dest   local dest
    89   local rc   local rc
    90    
    91   dest="${ALX_UNPRIV_HOME}/.idesktop"   dest="${MCORE_UNPRIV_HOME}/.idesktop"
    92   rc="${ALX_UNPRIV_HOME}/.ideskrc"   rc="${MCORE_UNPRIV_HOME}/.ideskrc"
    93    
    94   # progsh path   # progs path
    95   progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"   progsh_path="${MCORE_UNPRIV_HOME}/.progs"
    96    
    97   # get the resolution   # get the resolution
    98   res=$(mysqldo "select resolution from cfg_graphic where serial='${ALX_SERIAL}'")   res=$(mysqldo "select resolution from cfg_graphic where serial='${MCORE_SERIAL}'")
    99    
    100   # split res to x & y   # split res to x & y
    101   xres="${res%x*}"   xres="${res%x*}"
    # Line 122  helper_generate_all_desktop_icons() Line 122  helper_generate_all_desktop_icons()
    122   [[ -z ${i} ]] && continue   [[ -z ${i} ]] && continue
    123    
    124   # get database information   # get database information
    125   evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"   evaluate_table cfg_sessions "where serial='${MCORE_SERIAL}' and id='${i}'"
    126    
    127   # new line if x > xres   # new line if x > xres
    128   if [ ${x} -ge ${xres} ]   if [ ${x} -ge ${xres} ]
    Legend:
    Removed from v.2146  
    changed lines
      Added in v.2147