From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id E18391F990 for ; Thu, 6 Aug 2020 16:44:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729111AbgHFQns convert rfc822-to-8bit (ORCPT ); Thu, 6 Aug 2020 12:43:48 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:44483 "EHLO mail-ej1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729092AbgHFQmq (ORCPT ); Thu, 6 Aug 2020 12:42:46 -0400 Received: by mail-ej1-f66.google.com with SMTP id bo3so28401973ejb.11 for ; Thu, 06 Aug 2020 09:42:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=9ogNv/cqmribw52Uf1vGAIaHJXoBqHuMJN5cSDKeN5c=; b=Wufv29SC+a4exwMEVaaWaYwovRQzMLOjS6HYnjkhC5QeePULNm2/6+qRGS2jPbkrrM jM09uPrlQ2YSfILQtboPIiLkg8Asggyknx9IET/wDVOwORLMVmlhxLbGtUSUsGg+UFCG Z+LPgxyffwjn/xIP+EX1izTQ4Le9btFssLbOgwSb3daf3AUq+MLFOJMW3Nj30xRTQlox SPk2wlYpf43hPeR6xTcWh2tuvqljzz/+hlFjiX4UcwtYhzlknL1hIGFhyFii7txLa9KZ R5h+IrvycEOTUWUT/rVOFB0ZS9MBIEIFIeZwUeisW9dFlO2DeMbryYVvKuJHMuC1PbtB 9org== X-Gm-Message-State: AOAM530maH8AKzCJbfWAjk5+rjIQx3xiobHiXqqYYfOSGpVTbV0RATPe q++YT253nBquUooeCa79nNUGNW7qt0E8hE/3aIGJh3aTHCo= X-Google-Smtp-Source: ABdhPJyIKSTVJ6UjpADP0HXj6oR/iJX80KLYVklI/7WO1nDXwwpw++FdLPe4V+oGBA9G7FTSfqeYTobJz13lyv9gtX8= X-Received: by 2002:adf:fc45:: with SMTP id e5mr8747206wrs.226.1596730638688; Thu, 06 Aug 2020 09:17:18 -0700 (PDT) MIME-Version: 1.0 References: <37090d232221415b227c165bd44f6711d21f376b.1596634463.git.gitgitgadget@gmail.com> In-Reply-To: From: Eric Sunshine Date: Thu, 6 Aug 2020 12:17:07 -0400 Message-ID: Subject: Re: [PATCH 3/3] mergetool-lib: give kdiff3 prioirty in KDE environments To: =?UTF-8?Q?Marco_Trevisan_=28Trevi=C3=B1o=29?= Cc: =?UTF-8?Q?Marco_Trevisan_=28Trevi=C3=B1o=29_via_GitGitGadget?= , Git List Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Thu, Aug 6, 2020 at 8:37 AM Marco Trevisan (TreviƱo) wrote: > Il giorno mer 5 ago 2020 alle ore 23:16 Eric Sunshine > ha scritto: > > Wouldn't this change the behavior for people running old KDE which > > doesn't have XDG_CURRENT_DESKTOP, giving "kdiff3" much lower priority > > than it had before? > > Yeah, true.. So to avoid this we can just also check for > KDE_FULL_SESSION, that has been introduced by KDE 3.2, and this should > be enough I think. I'm not a user of git-mergetool or KDE, so I can't speak as an end-user. My comment was made merely as a reviewer of the code. If it is easy to avoid the behavior change by also checking KDE_FULL_SESSION in addition to the new check of XDG_CURRENT_DESKTOP without it being a maintenance burden, then that sounds like a good choice. On the other hand, if there wasn't a good way to avoid changing behavior for users of older KDE, then explaining that in the commit message would be expected.