kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Merge fixes

Browse source
This commit is contained in:
Eric Kotato 2020-01-29 07:53:44 +03:00
parent 3592098569
commit 10e8d6e979
3 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/Resources/qrc/telegram/telegram.qrc
View file

@ -57,9 +57,9 @@
<qresource prefix="/misc">
<file alias="default_shortcuts-custom.json">../../default_shortcuts-custom.json</file>
<file alias="default_kotato-settings-custom.json">../../default_kotato-settings-custom.json</file>
<file alias="kotatogramdesktop.desktop">../../../../lib/xdg/kotatogramdesktop.desktop</file>
</qresource>
<qresource prefix="/ktg_lang">
<file alias="ru.json">../../langs/rewrites/ru.json</file>
<file alias="kotatogramdesktop.desktop">../../../../lib/xdg/kotatogramdesktop.desktop</file>
</qresource>
</RCC>

7
Telegram/SourceFiles/data/data_peer.cpp
View file

@ -86,12 +86,11 @@ void PeerClickHandler::onClick(ClickContext context) const {
if (context.button == Qt::LeftButton && App::wnd()) {
const auto controller = App::wnd()->sessionController();
const auto currentPeer = controller->activeChatCurrent().peer();
if (_peer
&& _peer->isChannel()
&& currentPeer != _peer) {
if (_peer && _peer->isChannel() && currentPeer != _peer) {
const auto clickedChannel = _peer->asChannel();
if (!clickedChannel->isPublic() && !clickedChannel->amIn()
&& currentPeer->asChannel()->linkedChat() != clickedChannel) {
&& (!currentPeer->isChannel()
|| currentPeer->asChannel()->linkedChat() != clickedChannel)) {
Ui::show(Box<InformBox>(_peer->isMegagroup()
? tr::lng_group_not_accessible(tr::now)
: tr::lng_channel_not_accessible(tr::now)));

11
lib/xdg/tg.protocol
View file

@ -1,11 +0,0 @@
[Protocol]
exec=/usr/bin/kotatogram-desktop -- %u
protocol=tg
input=none
output=none
helper=true
listing=false
reading=false
writing=false
makedir=false
deleting=false