Merge pull request #27 from regolith-linux/session-name-change2

refactor: another attempt for different session ids

debian/changelog

@@ -1,3 +1,9 @@
+regolith-session (1.0.2) focal; urgency=medium
+
+  * refactor: another attempt for different session ids
+
+ -- Regolith Linux <[email protected]>  Sat, 20 Jan 2024 15:19:58 -0800
+
 regolith-session (0.9.10) focal; urgency=medium
 
   * fix: set XDG_CURRENT_DESKTOP, overriding previous value if already set

debian/control

@@ -36,7 +36,8 @@ Recommends:
     regolith-wm-ftue,
     regolith-wm-ilia,
     regolith-wm-rofication-ilia,
-    regolith-wm-swap-focus
+    regolith-wm-swap-focus,
+    xdg-desktop-portal-regolith-x11-config
 Suggests:
     update-manager,
     software-properties-gtk
@@ -71,7 +72,8 @@ Recommends:
     gnome-terminal,
     regolith-look-default,
     regolith-wm-ilia,
-    regolith-wm-rofication-ilia
+    regolith-wm-rofication-ilia,
+    xdg-desktop-portal-regolith-wayland-config
 Provides: regolith-desktop-session
 Conflicts: session-shortcuts
 Description: Regolith customized SwayWM session
@@ -81,9 +83,7 @@ Description: Regolith customized SwayWM session
 Package: regolith-session-common
 Architecture: any
 Depends: ${misc:Depends},
-    regolith-resource-loader
-Recommends:
-    xdg-desktop-portal-regolith    
+    regolith-resource-loader  
 Conflicts: session-shortcuts, regolith-session-flashback (<= 0.6.4)
 Description: Common files for regolith X11 session
  This package contains common scripts required by regolith-session variants.

usr/bin/regolith-session-wayland

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This script initializes Regolith Xresources and launches sway.
+# This script initializes Regolith Trawn resources and launches Sway.
 
 set -Eeu -o pipefail
 source /usr/lib/regolith/regolith-session-common.sh
@@ -33,7 +33,7 @@ fi
 
 # Register with gnome-session so that it does not kill the whole session thinking it is dead.
 if [ -n "$DESKTOP_AUTOSTART_ID" ]; then
-    dbus-send --print-reply --session --dest=org.gnome.SessionManager "/org/gnome/SessionManager" org.gnome.SessionManager.RegisterClient "string:Regolith" "string:$DESKTOP_AUTOSTART_ID"
+    dbus-send --print-reply --session --dest=org.gnome.SessionManager "/org/gnome/SessionManager" org.gnome.SessionManager.RegisterClient "string:Regolith-Wayland" "string:$DESKTOP_AUTOSTART_ID"
 fi
 
 # Import environment variables from environment.d
@@ -42,13 +42,13 @@ while read -r l; do
 done < <(/usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator)
 
 # Set XDG_CURRENT_DESKTOP
-export XDG_CURRENT_DESKTOP="Regolith:GNOME:sway"
+export XDG_CURRENT_DESKTOP="Regolith-Wayland:GNOME:sway"
 
 # Start sway-regolith
 unsupported_gpu=$(trawlcat regolith.sway.unsupported_gpu false)
-echo "Regolith is launching sway with $SWAY_CONFIG_FILE"
+echo "Regolith is launching Sway with $SWAY_CONFIG_FILE"
 
-if [[ "$unsupported_gpu" == "true" ]]; then
+if [[ "${unsupported_gpu,,}" == "true" ]]; then
     sway-regolith -c "$SWAY_CONFIG_FILE" --unsupported-gpu
 else
     sway-regolith -c "$SWAY_CONFIG_FILE" 

usr/lib/regolith/regolith-session-common.sh

@@ -66,7 +66,7 @@ load_standard_trawlres() {
 # Change the quotes in workspace names from double to to single.
 # Due to a limitation of the preprocessor they have double quotes.
 # The i3-wm workspace command fails with double quotes in the name
-# NOTE: Calling this function in Regolith 2 desktop sessio was removed due to silent failures
+# NOTE: Calling this function in Regolith 2 desktop session was removed due to silent failures
 xres_i3_cleanup() {
     xrdb -query |grep wm.workspace.|sed "s/\"/'/g"|xrdb -merge
 }

usr/share/applications/regolith-wayland.desktop

@@ -3,7 +3,7 @@ Type=Application
 Name=regolith-wayland
 Comment=Productivity-focused desktop environment, Regolith
 Exec=regolith-session-wayland
-X-GNOME-WMName=Regolith
+X-GNOME-WMName=Regolith-Wayland
 X-GNOME-Autostart-Phase=WindowManager
 X-GNOME-Provides=windowmanager
 X-GNOME-Autostart-Notify=false