mirror of
https://github.com/smxi/inxi.git
synced 2025-01-31 18:12:21 +00:00
pulled back mate changes, that needs more work
This commit is contained in:
parent
245b454e6c
commit
64b2e73a18
20
inxi
20
inxi
|
@ -13820,7 +13820,7 @@ sub get_env_de_data {
|
||||||
}
|
}
|
||||||
sub get_env_xprop_de_data {
|
sub get_env_xprop_de_data {
|
||||||
eval $start if $b_log;
|
eval $start if $b_log;
|
||||||
my ($program,$string,@version_data);
|
my ($program,$value,@version_data);
|
||||||
# NOTE: Always add to set_prop the search term if you add an item!!
|
# NOTE: Always add to set_prop the search term if you add an item!!
|
||||||
set_xprop();
|
set_xprop();
|
||||||
# note that cinnamon split from gnome, and and can now be id'ed via xprop,
|
# note that cinnamon split from gnome, and and can now be id'ed via xprop,
|
||||||
|
@ -13838,16 +13838,16 @@ sub get_env_xprop_de_data {
|
||||||
}
|
}
|
||||||
elsif ($xdg_desktop eq 'mate' || ( $b_xprop && main::awk(\@xprop,'_marco') )){
|
elsif ($xdg_desktop eq 'mate' || ( $b_xprop && main::awk(\@xprop,'_marco') )){
|
||||||
# NOTE: mate-about reported wrong version, 1.18.0 when actual was 1.18.2
|
# NOTE: mate-about reported wrong version, 1.18.0 when actual was 1.18.2
|
||||||
if ($program = main::check_program('mate-session') ) {
|
# if ($program = main::check_program('mate-session') ) {
|
||||||
$string = 'mate-session';
|
# $value = 'mate-session';
|
||||||
}
|
# }
|
||||||
if (!$program && ($program = main::check_program('mate-about') ) ) {
|
# if (!$program && ($program = main::check_program('mate-about') ) ) {
|
||||||
$string = 'mate-about';
|
$value = 'mate-about';
|
||||||
}
|
# }
|
||||||
if ($string){
|
if ($value){
|
||||||
@data = main::program_values($string);
|
@data = main::program_values($value);
|
||||||
$desktop[0] = $data[3];
|
$desktop[0] = $data[3];
|
||||||
$desktop[1] = main::program_version($program,$data[0],$data[1],$data[2],$data[5]);
|
$desktop[1] = main::program_version($value,$data[0],$data[1],$data[2],$data[5]);
|
||||||
}
|
}
|
||||||
set_gtk_data() if $extra > 0;
|
set_gtk_data() if $extra > 0;
|
||||||
$desktop[0] ||= 'MATE';
|
$desktop[0] ||= 'MATE';
|
||||||
|
|
Loading…
Reference in a new issue