Subject: Cinnamon icon is loaded as a cog not the official Cinnamon logo

From: Dave Chamberlin-Kidd <[email-masked]>
Date: Wed, 20 May 2020 13:48:20 +0100

Package: x2goclient

Version: 4.1.2.3
Severity: wishlist
Tag: patch

When the original code to load the Cinnamon icon was implemented it appears
there wasn't an official icon. There is now. There is no error message as
the code works as is but an incorrect icon is used for Cinnamon. This patch
replaces the cog icon and removes the comment explaining why it was used.

Cheers
Dave
From a36a21a4cbc1a143468d5d61f565b8ed9960ee80 Mon Sep 17 00:00:00 2001
From: Dave Chamberlin-Kidd <[email-masked]>
Date: Wed, 20 May 2020 08:09:10 +0100
Subject: [PATCH] Replace cinnamon cog with offical icon

---
 res/img/icons/16x16/cinnamon.png | Bin 505 -> 653 bytes
 src/sessionbutton.cpp            |   2 --
 2 files changed, 2 deletions(-)

diff --git a/res/img/icons/16x16/cinnamon.png b/res/img/icons/16x16/cinnamon.png
index 282d3718926bd173805c2c97a500970790d33946..dbd8d4d319ea0b1db1e698fbcf5a0ef0ba5ffff9 100644
GIT binary patch
delta 628
zcmV-)0*n3m1C0fcB!2{FK}|sb0I`n?{9y$E000SaNLh0L01ejw01ejxLMWSf00007
zbV*G`2jm451}ie`ux!@=00JCIL_t(I%axPAYtvB_#Xt8YG1|eUB2H}~Nh`!8NTq_4
zU>z(tsPrGOl76KGp(+ki!CACH{E?`E?m;?;KalF&q0$<YQh!KNLLGEyLkFR4()Ya%
zNlOex+B3a(Ip@50?t52gLpdIasF52e7sSv5pe_}J8Q@JYmCLvCWoJ=L1pU-ICIv=;
z3NWq8GJr7}0J)+{m#CyRtJ~w@Y@xPmP)r2<QtS9Ah5^^*R<PPPCE2WPJxPa$J>|}&
z>mW&Bc5BUE3V&w{H7|f{cO=Cyfa{(QrSo%;Yfnbg@b$72`>vv2{hi*&Kth_C7gULd
z(zy)#K<Q>Aj>-%5NX)2_5ug&R_D$_U>@SbToc4NP^<+kb6=NBZk`pP2@G0=}$L&_q
z^4RHa*V<XYuf8KaV*eb+dg6g}?w)`aN28M>3>uIwTz^w+6&Dj{kGj^r15SYclKRGB
ztmi$#-LeyTxI+WFy?}!Hcf@n?exKAg-U5+k=@G~@qP@*_PL!PJYV&Q>3;Gk0UK&nP
zHuVfJ*xWA}k*lhDuB{DEfE>t*l$>Z1xVE)s1BZ^8`=auoh4{M>V{ZsDDJ3U*3Rn=~
zgDRKVKW(h4Cu)MJTwYXC2NVN552fc94Zvn~dmQ+30P)Pa>$?MB0K(ZqZEMXAfjk53
z|E>)@U3Yy$XI_1)|1*ude_$*YHkJ`ZFG6FSfr^NJc3p2Kl%8K~<^KgV`q%%wq^%zS
O0000<MNUMnLSTZPz8_8i

delta 453
zcmV;$0XqJT1^EMzBo78+OGiWi{{a60|De66laVnVf8GiK4I>g$Bt1a@00D+cL_t(I
z%e9lSic?__g}*a<bAyF~0WCx}E(9cng1&(dU|}KHY$IYJi-iFN1G$qbAZp{H_yAkj
z3EKMxZkZK=xFXqNWd$uH3HKixl_Z#m$WAwhnZx|w&w;}%cVBh))nzl;Up$^hL;#l;
z4QRUQe{?!mfHP+HWIP_9$n*SNM1-WXz-Qn#@ZQ~D{@Sr=12d~jdJGKnJnu)uQQ#P`
z0}LbLQA(*kvom+mCNKnQ5%EmYg_P38h<FavfKUB?e{&gwnxrGZgKoEbe@fqW_mFh6
z(P-3w{TYLHyIs$+>>+R|B95n&w&r1#Ww~W$fA^}@YQHFoH<DWJ{?Py`mC6jvh)90`
zKCjvD3*7w!aMj&UO4`Y?Y#o?>0xK&k>%f=MXw>ZWdi#qQ97M!-Nq38)kfax7S<1|=
z0j-GG8w>^q%YI=4I293lz>SF5HnX?D^`F}5X0y4m&>*F>8xeOTtxYDA^OC*+UnQNB
vE3_u5WoEnol7-hrQM~$}EZmZGsDb4NFZGtSsKLtO00000NkvXXu0mjfA86Gk

diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp
index 0a46ee6..4e284b1 100644
--- a/src/sessionbutton.cpp
+++ b/src/sessionbutton.cpp
@@ -848,8 +848,6 @@ void SessionButton::slot_cmd_change ( const QString& command )
     else if ( command == "CINNAMON" )
     {
         newRootless=false;
-        // As of 2014-10-01, Cinnamon does not have a logo. This icon is the
-        // gear, which is the default start menu icon as of 2.2.
         pix.load ( par->iconsPath ( "/16x16/cinnamon.png" ) );
     }
     else if ( command == "TRINITY" )
-- 
2.26.2