Attachment 5291 Details for Bug 26823 – Поддержка альтовского kdm

[patch] Поддержка альтовского kdm

lxsession-logout.c.patch (text/plain), 2.67 KB, created by Aleksey Borisenkov on 2012-01-16 20:05:21 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Aleksey Borisenkov

Created: 2012-01-16 20:05:21 MSK

Size: 2.67 KB

patch

obsolete

>diff --git a/lxsession/lxsession-logout/lxsession-logout.c b/lxsession/lxsession-logout/lxsession-logout.c
>index 5bb8add..6d00b27 100644
>--- a/lxsession/lxsession-logout/lxsession-logout.c
>+++ b/lxsession/lxsession-logout/lxsession-logout.c
>@@ -75,7 +75,7 @@ typedef struct {
> } HandlerContext;
> 
> static gboolean lock_screen(void);
>-static gboolean verify_running(const char * display_manager, const char * executable);
>+static gboolean verify_running(const char * display_manager, const char * executable, const char * proc_dm);
> static void logout_clicked(GtkButton * button, HandlerContext * handler_context);
> static void change_root_property(GtkWidget* w, const char* prop_name, const char* value);
> static void shutdown_clicked(GtkButton * button, HandlerContext * handler_context);
>@@ -101,7 +101,7 @@ static gboolean lock_screen(void)
> }
> 
> /* Verify that a program is running and that an executable is available. */
>-static gboolean verify_running(const char * display_manager, const char * executable)
>+static gboolean verify_running(const char * display_manager, const char * executable, const char * proc_dm)
> {
>     /* See if the executable we need to run is in the path. */
>     gchar * full_path = g_find_program_in_path(executable);
>@@ -144,7 +144,7 @@ static gboolean verify_running(const char * display_manager, const char * execut
>                             /* Null terminate the buffer and look for the display manager name in the command.
>                              * If found, return success. */
>                             buffer[length] = '\0';
>-                            if (strstr(buffer, display_manager) != NULL)
>+                            if (strstr(buffer, proc_dm) != NULL)
>                                 return TRUE;
>                         }
>                     }
>@@ -436,21 +436,21 @@ int main(int argc, char * argv[])
>     }
> 
>     /* If we are under GDM, its "Switch User" is available. */
>-    if (verify_running("gdm", "gdmflexiserver"))
>+    if (verify_running("gdm", "gdmflexiserver", "gdm"))
>     {
>         handler_context.switch_user_available = TRUE;
>         handler_context.switch_user_GDM = TRUE;
>     }
> 
>     /* If we are under GDM3, its "Switch User" is available. */
>-    if (verify_running("gdm3", "gdmflexiserver"))
>+    if (verify_running("gdm3", "gdmflexiserver", "gdm3"))
>     {
>         handler_context.switch_user_available = TRUE;
>         handler_context.switch_user_GDM = TRUE;
>     }
> 
>     /* If we are under KDM, its "Switch User" is available. */
>-    if (verify_running("kdm", "kdmctl"))
>+    if (verify_running("xdm", "kdmctl", "kdm"))
>     {
>         handler_context.switch_user_available = TRUE;
>         handler_context.switch_user_KDM = TRUE;

Actions: View | Diff

Attachments on bug 26823: 5290 | 5291