sd-login: let's not needlessly yell at users

While GNOME/KDE are generally capitalized, systemd tools generally are
not, hence let's not start doing so in the XDG_CURRENT_SESSION
environment variable.

diff --git a/NEWS b/NEWS
index 6c973fc8158ed5aa7bad8bbf9cb23bc3e7d4d7db..f618fecefa11961a19df6be72497123b0b244eae 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -51,7 +51,7 @@ CHANGES WITH 217:
         * A user console daemon systemd-consoled has been
           added. Currently, it is a preview, and will so far open a
           single terminal on each session of the user marked as
         * A user console daemon systemd-consoled has been
           added. Currently, it is a preview, and will so far open a
           single terminal on each session of the user marked as

-          Desktop=SYSTEMD-CONSOLE.
+          Desktop=systemd-console.

 
         * Route metrics can be specified for DHCP routes added by
           systemd-networkd.
 
         * Route metrics can be specified for DHCP routes added by
           systemd-networkd.

diff --git a/src/console/consoled-manager.c b/src/console/consoled-manager.c
index 8f3823fe469766134f72e4f12e2b6d06d479b317..1b856f2228bce4c8c423e56713ce72be05e44bee 100644 (file)
--- a/src/console/consoled-manager.c
+++ b/src/console/consoled-manager.c
@@ -132,7 +132,7 @@ static int manager_sysview_session_filter(Manager *m, sysview_event *event) {
         if (r < 0)
                 return 0;
 
         if (r < 0)
                 return 0;
 

-        return streq(desktop, "SYSTEMD-CONSOLE");
+        return streq(desktop, "systemd-console");

 }
 
 static int manager_sysview_session_add(Manager *m, sysview_event *event) {
 }
 
 static int manager_sysview_session_add(Manager *m, sysview_event *event) {

diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
index 93af19709b0dd3294655678d9ac03989c8d7e139..64b882724c00fe224deb877a20ff4a49e84a0f99 100644 (file)
--- a/src/systemd/sd-login.h
+++ b/src/systemd/sd-login.h
@@ -147,7 +147,7 @@ int sd_session_get_type(const char *session, char **type);
 /* Determine the class of this session, i.e. one of "user", "greeter" or "lock-screen". */
 int sd_session_get_class(const char *session, char **clazz);
 
 /* Determine the class of this session, i.e. one of "user", "greeter" or "lock-screen". */
 int sd_session_get_class(const char *session, char **clazz);
 

-/* Determine the desktop brand of this session, i.e. something like "GNOME", "KDE" or "SYSTEMD-CONSOLE". */
+/* Determine the desktop brand of this session, i.e. something like "GNOME", "KDE" or "systemd-console". */

 int sd_session_get_desktop(const char *session, char **desktop);
 
 /* Determine the X11 display of this session. */
 int sd_session_get_desktop(const char *session, char **desktop);
 
 /* Determine the X11 display of this session. */