From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 From: Sergey V Turchin To: ALT Linux Sisyphus discussions Date: Mon, 16 Jan 2012 16:11:43 +0400 Message-ID: <9700499.5ktIjMqu2a@summoner.localdomain> User-Agent: KMail/4.7.4 (Linux/3.1.6-std-def-alt1; KDE/4.7.4; i686; ; ) In-Reply-To: <4F13DBDF.10205@gmail.com> References: <4F13DBDF.10205@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2696676.U20HPzDrII"; micalg="pgp-sha1"; protocol="application/pgp-signature" Subject: Re: [sisyphus] =?utf-8?b?a2RtNCArIGx4ZGUg0Lgg0L/QtdGA0LXQutC70Y7Rh9C1?= =?utf-8?b?0L3QuNC1INC/0L7Qu9GM0LfQvtCy0LDRgtC10LvQtdC5?= X-BeenThere: sisyphus@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Sisyphus discussions List-Id: ALT Linux Sisyphus discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jan 2012 12:11:55 -0000 Archived-At: List-Archive: List-Post: --nextPart2696676.U20HPzDrII Content-Type: multipart/mixed; boundary="nextPart1739449.FufftVBq7a" Content-Transfer-Encoding: 7Bit --nextPart1739449.FufftVBq7a Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="utf-8" T24gMTYg0Y/QvdCy0LDRgNGPIDIwMTIgMTI6MTI6MTUgQWxleGV5IEJvcmlzZW5rb3Ygd3JvdGU6 Cj4g0JrQvtGA0L7RgtC60LjQuSDQstC+0L/RgNC+0YE6INC/0L7Rh9C10LzRgyBrZG00INGB0L7Q t9C00LDRkdGCINGE0LDQudC7IC92YXIvcnVuL3hkbS5waWQsINCwINC90LUKPiAvdmFyL3J1bi9r ZG0ucGlkID8K0KfRgtC+0LEg0L7QtNC90L7QvtCx0YDQsNC30L3QtdC1INCx0YvQu9C+LiDQlNCw INC4INC/0L4g0LTRgNGD0LPQvtC80YMg0L3QuNC60L7Qs9C00LAg0Lgg0L3QtSDQsdGL0LvQvi4g 0JIgS0RFMyDRgtC+0LbQtS4KCj4gJCBjYXQgL3Byb2MvYGNhdCAvdmFyL3J1bi94ZG0ucGlkYC9j bWRsaW5lCj4ga2RtLW5vZGFlbW9uCj4g0K3RgtC+INC00LvRjyDRh9C10LPQvi3RgtC+INC90LDQ tNC+INC40LvQuCDQv9GA0L7RgdGC0L4g0YLQsNC6INC/0L7Qu9GD0YfQuNC70L7RgdGMPwpDIGNt ZGxpbmUg0Lgg0LjQvNC10L3QtdC8INC/0YDQvtGG0LXRgdGB0LAg0LIgcHJvYyDRgtCw0Lwg0LLQ vtC+0LHRidC1INCw0YXQsNC70LDQuS3QvNCw0YXQsNC70LDQuSDQutCw0LrQvtC5LdGC0L4uCgo+ INCi0LXQv9C10YDRjCwg0L/QvtGH0LXQvNGDINC40L3RgtC10YDQtdGB0YPRjtGB0YwuINCV0YHQ u9C4INC40YHQv9C+0LvRjNC30YPQtdGC0YHRjyDRgdCy0Y/Qt9C60LAgbHhkZSArIGdkbSwg0YLQ vgo+INC/0LXRgNC10LrQu9GO0YfQtdC90LjQtSDQv9C+0LvRjNC30L7QstCw0YLQtdC70LXQuSDQ tNC+0YHRgtGD0L/QvdC+LgrQn9GA0LjQu9Cw0LPQsNGOINC90LDQsdGA0L7RgdC+0Log0LTQu9GP IEtETS4KClsuLi5dCgotLSAKUmVnYXJkcywgU2VyZ2V5LiAgICAgICBBTFQgTGludXgsIGh0dHA6 Ly93d3cuYWx0bGludXgucnUv --nextPart1739449.FufftVBq7a Content-Disposition: attachment; filename="lxsession-logout.c.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="lxsession-logout.c.patch" --- lxsession-logout.c~ 2011-08-30 01:05:54.000000000 +0400 +++ lxsession-logout.c 2012-01-16 16:08:45.391131299 +0400 @@ -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 = NULL); 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,8 +144,14 @@ static gboolean verify_running(const cha /* 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) - return TRUE; + if( proc_dm != NULL ) + { + if (strstr(buffer, proc_dm) != NULL) + return TRUE; + } else { + if (strstr(buffer, display_manager) != NULL) + return TRUE; + } } } } @@ -450,7 +456,7 @@ int main(int argc, char * argv[]) } /* 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; --nextPart1739449.FufftVBq7a-- --nextPart2696676.U20HPzDrII Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iEYEABECAAYFAk8UFAMACgkQ+zBIrxwqPwhWyQCfYFgOcJRpJKLA2zmRvAsXeu2k yQUAniYlUi/5BBiUfkTcYEp7VOWvTf6x =Y+75 -----END PGP SIGNATURE----- --nextPart2696676.U20HPzDrII--