panel: Drop xinerama conversions for panel monitor indices.

With linuxmint/muffin@476ea9b2fadc, monitor order works like it did
pre-5.4, primary at 0 and the remaining monitors sorted by connector
name following.

This lets us remove the translation code we were using to avoid
users with existing panel layouts having to re-setup their panels
after upgrading.

Author: mtwebster

js/ui/cinnamonDBus.js

@@ -348,8 +348,7 @@ var CinnamonDBus = class {
             for (let i = 0; i < Main.layoutManager.monitors.length; i++) {
                 let current = Main.layoutManager.monitors[i];
 
-                let xinerama_index = global.display.logical_index_to_xinerama_index(current.index);
-                monitors.push(xinerama_index);
+                monitors.push(current.index);
             }
         } catch (e) {
             log(e.message);
@@ -371,8 +370,7 @@ var CinnamonDBus = class {
             throw new Error("GetMonitorWorkRect: invalid monitor index: " + index + ".  Must be 0 to " + (n_mons - 1));
         }
 
-        let logical_index = global.display.xinerama_index_to_logical_index(index);
-        let rect = global.workspace_manager.get_active_workspace().get_work_area_for_monitor(logical_index);
+        let rect = global.workspace_manager.get_active_workspace().get_work_area_for_monitor(index);
 
         return [rect.x, rect.y, rect.width, rect.height];
     }

js/ui/panel.js

@@ -235,66 +235,12 @@ function setHeightForPanel(panel) {
     return height;
 }
 
-function convertSettingsXMonToLMon(strv) {
-    let out = [];
-
-    for (let i = 0; i < strv.length; i++) {
-        let elements = strv[i].split(":");
-
-        if (elements.length !== 3)
-            continue;
-
-        let [id, xmon, pos] = elements;
-
-        if (xmon > global.display.get_n_monitors() - 1) {
-            // log("Skipping panel enabled info for monitor we don't have: " + strv[i]);
-            out.push(strv[i]);
-            continue;
-        }
-
-        let l_mon = xmon;
-        if (!Meta.is_wayland_compositor())
-            l_mon = global.display.xinerama_index_to_logical_index(xmon);
-
-        out.push(`${id}:${l_mon}:${pos}`);
-
-        // log(`xmon: ${id}:${xmon}:${pos}  to lmon: ${id}:${l_mon}:${pos}`);
-    }
-
-    return out;
-}
-
-function convertSettingsLMonToXMon(strv) {
-    let out = [];
-
-    for (let i = 0; i < strv.length; i++) {
-        let elements = strv[i].split(":");
-
-        if (elements.length !== 3)
-            continue;
-
-        let [id, lmon, pos] = elements;
-
-        let x_mon = lmon;
-        if (!Meta.is_wayland_compositor())
-            x_mon = global.display.logical_index_to_xinerama_index(lmon);
-
-        out.push(`${id}:${x_mon}:${pos}`);
-
-        // log(`l_mon: ${id}:${l_mon}:${pos}  to xmon: ${id}:${x_mon}:${pos}`);
-    }
-
-    return out;
-}
-
 function getPanelsEnabledList() {
-    let panelProperties = global.settings.get_strv("panels-enabled");
-    return convertSettingsXMonToLMon(panelProperties);
+    return global.settings.get_strv("panels-enabled");
 }
 
 function setPanelsEnabledList(list) {
-    let converted = convertSettingsLMonToXMon(list)
-    let panelProperties = global.settings.set_strv("panels-enabled", converted);
+    global.settings.set_strv("panels-enabled", list);
 }
 
 function updatePanelsMeta(meta, panel_props) {