From 4a9821117b46a81a875309c5e373b11fcb73d5e5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 7 Oct 2016 17:28:37 +0300
Subject: [PATCH] Version 0.10.12.alpha: no new settings link for macOS 10.8+
 version.

---
 .../settings/settings_notifications_widget.cpp       |  9 +++++++++
 .../settings/settings_notifications_widget.h         |  1 +
 Telegram/build/deploy.sh                             | 12 +++++-------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_notifications_widget.cpp b/Telegram/SourceFiles/settings/settings_notifications_widget.cpp
index 3db9684e1c..6aa9c61b18 100644
--- a/Telegram/SourceFiles/settings/settings_notifications_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications_widget.cpp
@@ -62,6 +62,15 @@ void NotificationsWidget::createControls() {
 	addChildRow(_playSound, margin, lang(lng_settings_sound_notify), SLOT(onPlaySound()), Global::SoundNotify());
 	addChildRow(_includeMuted, margin, lang(lng_settings_include_muted), SLOT(onIncludeMuted()), Global::IncludeMuted());
 
+	if (cPlatform() != dbipMac) {
+		createNotificationsControls();
+	}
+}
+
+void NotificationsWidget::createNotificationsControls() {
+	style::margins margin(0, 0, 0, st::settingsSkip);
+	style::margins slidedPadding(0, margin.bottom() / 2, 0, margin.bottom() - (margin.bottom() / 2));
+
 	QString nativeNotificationsLabel;
 #ifdef Q_OS_WIN
 	if (App::wnd()->psHasNativeNotifications()) {
diff --git a/Telegram/SourceFiles/settings/settings_notifications_widget.h b/Telegram/SourceFiles/settings/settings_notifications_widget.h
index dd07c6e3ff..5bc3c28d9d 100644
--- a/Telegram/SourceFiles/settings/settings_notifications_widget.h
+++ b/Telegram/SourceFiles/settings/settings_notifications_widget.h
@@ -41,6 +41,7 @@ private slots:
 
 private:
 	void createControls();
+	void createNotificationsControls();
 	void desktopEnabledUpdated();
 	void viewParamUpdated();
 
diff --git a/Telegram/build/deploy.sh b/Telegram/build/deploy.sh
index 0ac8f307b1..911eabd5aa 100755
--- a/Telegram/build/deploy.sh
+++ b/Telegram/build/deploy.sh
@@ -181,20 +181,18 @@ fi
 
 if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ] || [ "$BuildTarget" == "mac" ]; then
   if [ "$BuildTarget" != "mac" ] || [ "$DeployMac" == "1" ]; then
-    scp "$DeployPath/$UpdateFile" "tmaster:tdesktop/www/$RemoteFolder/"
-    scp "$DeployPath/$SetupFile" "tmaster:tdesktop/www/$RemoteFolder/"
+    rsync -av --progress "$DeployPath/$UpdateFile" "$DeployPath/$SetupFile" "tmaster:tdesktop/www/$RemoteFolder/"
   fi
   if [ "$BuildTarget" == "mac" ]; then
     if [ "$DeployMac32" == "1" ]; then
-      scp "$Mac32DeployPath/$Mac32UpdateFile" "tmaster:tdesktop/www/$Mac32RemoteFolder/"
-      scp "$Mac32DeployPath/$Mac32SetupFile" "tmaster:tdesktop/www/$Mac32RemoteFolder/"
+      rsync -av --progress "$Mac32DeployPath/$Mac32UpdateFile" "$Mac32DeployPath/$Mac32SetupFile" "tmaster:tdesktop/www/$Mac32RemoteFolder/"
     fi
     if [ "$DeployWin" == "1" ]; then
-      scp "$WinDeployPath/$WinUpdateFile" "tmaster:tdesktop/www/$WinRemoteFolder/"
       if [ "$BetaVersion" == "0" ]; then
-        scp "$WinDeployPath/$WinSetupFile" "tmaster:tdesktop/www/$WinRemoteFolder/"
+        rsync -av --progress "$WinDeployPath/$WinUpdateFile" "$WinDeployPath/$WinSetupFile" "$WinDeployPath/$WinPortableFile" "tmaster:tdesktop/www/$WinRemoteFolder/"
+      else
+        rsync -av --progress "$WinDeployPath/$WinUpdateFile" "$WinDeployPath/$WinPortableFile" "tmaster:tdesktop/www/$WinRemoteFolder/"
       fi
-      scp "$WinDeployPath/$WinPortableFile" "tmaster:tdesktop/www/$WinRemoteFolder/"
     fi
 
     if [ "$DeployMac" == "1" ]; then