mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-01 15:15:13 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/telegramdesktop/tdesktop

Browse Source
This commit is contained in:
John Preston
2015-01-28 16:18:51 +03:00
parent fd4ecd08e9 2c03490f2d
commit 89ce0ce1e2
28 changed files with 241 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Telegram/SourceFiles/pspecific_linux.cpp
View File

@@ -772,21 +772,18 @@ void PsMainWindow::psFirstShow() {
setWindowState(Qt::WindowMaximized);
}
if (cFromAutoStart()) {
if (cStartMinimized()) {
setWindowState(Qt::WindowMinimized);
if (cWorkMode() == dbiwmTrayOnly || cWorkMode() == dbiwmWindowAndTray) {
hide();
} else {
show();
}
showShadows = false;
if ((cFromAutoStart() && cStartMinimized()) || cStartInTray()) {
setWindowState(Qt::WindowMinimized);
if (cWorkMode() == dbiwmTrayOnly || cWorkMode() == dbiwmWindowAndTray) {
hide();
} else {
show();
}
showShadows = false;
} else {
show();
}
posInited = true;
}
@@ -1324,6 +1321,14 @@ uint64 psIdleTime() {
return getms(true) - _lastUserAction;
}
bool psSkipAudioNotify() {
return false;
}
bool psSkipDesktopNotify() {
return false;
}
QStringList psInitLogs() {
return _initLogs;
}
@@ -1658,7 +1663,7 @@ bool _execUpdater(bool update = true) {
QByteArray data(QFile::encodeName(cExeDir() + "Updater"));
memcpy(path, data.constData(), data.size());
char *args[MaxArgsCount] = {0}, p_noupdate[] = "-noupdate", p_autostart[] = "-autostart", p_debug[] = "-debug", p_tosettings[] = "-tosettings", p_key[] = "-key", p_path[] = "-workpath";
char *args[MaxArgsCount] = {0}, p_noupdate[] = "-noupdate", p_autostart[] = "-autostart", p_debug[] = "-debug", p_tosettings[] = "-tosettings", p_key[] = "-key", p_path[] = "-workpath", p_startintray[] = "-startintray";
char p_datafile[MaxLen] = {0}, p_pathbuf[MaxLen] = {0};
int argIndex = 0;
args[argIndex++] = path;
@@ -1668,6 +1673,7 @@ bool _execUpdater(bool update = true) {
}
if (cFromAutoStart()) args[argIndex++] = p_autostart;
if (cDebug()) args[argIndex++] = p_debug;
if (cStartInTray()) args[argIndex++] = p_startintray;
if (cDataFile() != (cTestMode() ? qsl("data_test") : qsl("data"))) {
QByteArray dataf = QFile::encodeName(cDataFile());
if (dataf.size() < MaxLen) {