From 4da40ecbc1c73309d9fe073567fe76421a4bac5e Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Wed, 16 Sep 2015 17:23:15 +0300 Subject: [PATCH 01/12] Fix a double phrase --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bed291f..ad9de4f 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ Telegram-Purple Unofficial (Beta 3) Telegram-purple is a Libpurple plugin that adds support for the Telegram messenger. -I keep getting many questions about this plugin in my mail, so I've created a telegram group -chat for [telegram group chat](https://telegram.me/joinchat/01fb53f301b67d3c7a5532908dfa9a89) +I keep getting many questions about this plugin in my mail, so I've created a +[telegram group chat](https://telegram.me/joinchat/01fb53f301b67d3c7a5532908dfa9a89) for telegram-purple related discussions or questions. Beta 3 From 10e9d17121557e41b3fd16de8767c185b402182a Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Wed, 16 Sep 2015 17:24:56 +0300 Subject: [PATCH 02/12] Fix a typo - 'requires' --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ad9de4f..5423855 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,7 @@ does not display those smileys natively, but you can install a custom smiley the Building the Adium Plugin ------------------------- -Compiling with XCode is a little bit problematic, since it requries you to compile Adium first to get the necessary framework files. My advice is to just use the [prebuild bundle](https://github.com/majn/telegram-purple/releases), but if you really want to do it, follow those steps. +Compiling with XCode is a little bit problematic, since it requires you to compile Adium first to get the necessary framework files. My advice is to just use the [prebuild bundle](https://github.com/majn/telegram-purple/releases), but if you really want to do it, follow those steps. 1. Get the Adium source, compile it with XCode and copy the build output into telegram-adium/Frameworks/Adium. It should contain at least Adium.framework, AdiumLibpurple.framework and AIUitilies.framework 2. Open the Adium source code, go to ./Frameworks and copy libglib.framework and libpurple.framework into telegram-adium/Frameworks/Adium From 54094572d0e1181f72e1cb696a1ce0fc38a162fd Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Wed, 16 Sep 2015 17:26:33 +0300 Subject: [PATCH 03/12] Fix typo - "prebuilt" --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5423855..53fb0db 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,7 @@ does not display those smileys natively, but you can install a custom smiley the Building the Adium Plugin ------------------------- -Compiling with XCode is a little bit problematic, since it requires you to compile Adium first to get the necessary framework files. My advice is to just use the [prebuild bundle](https://github.com/majn/telegram-purple/releases), but if you really want to do it, follow those steps. +Compiling with XCode is a little bit problematic, since it requires you to compile Adium first to get the necessary framework files. My advice is to just use the [prebuilt bundle](https://github.com/majn/telegram-purple/releases), but if you really want to do it, follow those steps. 1. Get the Adium source, compile it with XCode and copy the build output into telegram-adium/Frameworks/Adium. It should contain at least Adium.framework, AdiumLibpurple.framework and AIUitilies.framework 2. Open the Adium source code, go to ./Frameworks and copy libglib.framework and libpurple.framework into telegram-adium/Frameworks/Adium From 6fca984210bb8bf1b2e0e003b8dccd1b729e6457 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Wed, 16 Sep 2015 17:27:05 +0300 Subject: [PATCH 04/12] Fix typo - "these" --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 53fb0db..a105788 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,7 @@ does not display those smileys natively, but you can install a custom smiley the Building the Adium Plugin ------------------------- -Compiling with XCode is a little bit problematic, since it requires you to compile Adium first to get the necessary framework files. My advice is to just use the [prebuilt bundle](https://github.com/majn/telegram-purple/releases), but if you really want to do it, follow those steps. +Compiling with XCode is a little bit problematic, since it requires you to compile Adium first to get the necessary framework files. My advice is to just use the [prebuilt bundle](https://github.com/majn/telegram-purple/releases), but if you really want to do it, follow these steps: 1. Get the Adium source, compile it with XCode and copy the build output into telegram-adium/Frameworks/Adium. It should contain at least Adium.framework, AdiumLibpurple.framework and AIUitilies.framework 2. Open the Adium source code, go to ./Frameworks and copy libglib.framework and libpurple.framework into telegram-adium/Frameworks/Adium From 00658a322afd2f1729deb41f5129b65159e15021 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Wed, 16 Sep 2015 17:28:28 +0300 Subject: [PATCH 05/12] Fix a misphrasing --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a105788..6efcfc0 100644 --- a/README.md +++ b/README.md @@ -134,10 +134,10 @@ Compiling with XCode is a little bit problematic, since it requires you to compi 1. Get the Adium source, compile it with XCode and copy the build output into telegram-adium/Frameworks/Adium. It should contain at least Adium.framework, AdiumLibpurple.framework and AIUitilies.framework 2. Open the Adium source code, go to ./Frameworks and copy libglib.framework and libpurple.framework into telegram-adium/Frameworks/Adium 3. Build the tgl submodule and delete libtgl.so from libs/ (it should only contain libtgl.a) -4. Install libwebp with homebrew, move into copy it into your project +4. Install libwebp with homebrew, and copy it into your project: brew install webp - cp /usr/local/Cellar/webp/0.4.3/lib/libwebp.a ./telegram-adium/Frameworks/ + cp /usr/local/Cellar/webp/0.4.3/lib/libwebp.a ./telegram-adium/Frameworks/ 5. Build the XCode-Project and execute the created bundle From 6afe24475719f6715f2c5cc8fe652c8c4d6a807d Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Wed, 16 Sep 2015 17:29:15 +0300 Subject: [PATCH 06/12] =?UTF-8?q?Correct=20=E2=80=9Cmail=E2=80=9D=20to=20?= =?UTF-8?q?=E2=80=9CE-mail=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6efcfc0..29bc292 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Telegram-Purple Unofficial (Beta 3) Telegram-purple is a Libpurple plugin that adds support for the Telegram messenger. -I keep getting many questions about this plugin in my mail, so I've created a +I keep getting many questions about this plugin in my E-mail, so I've created a [telegram group chat](https://telegram.me/joinchat/01fb53f301b67d3c7a5532908dfa9a89) for telegram-purple related discussions or questions. From 37f86fda7ed177b8b815af47ffccc1eb41bd94b6 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Wed, 16 Sep 2015 17:31:49 +0300 Subject: [PATCH 07/12] Fix misphrasing --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 29bc292..0a04be2 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Beta 3 - Mark messages read on other devices as 'deferred' to avoid needless notifications -This version should fix the crashes that seem to occur in many of the older version. Consider this another intermediate Beta version, there will be at least another one until I will consider it a release candidate. +This version should fix the crashes that seem to have occured in many of the older versions. Consider this another intermediate Beta version, as there will be at least another one until I consider issuing a release candidate. If you migrate from an older version, the Telegram authentication files have been moved to .purple/telegram-purple. If you want to keep your old secret chats, please copy it manually from ~/.telegram-purple, otherwise you will be prompted for a new SMS code. From 562df1ad7cad87ae6af58cd3e14620df96a7d24a Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Wed, 16 Sep 2015 17:32:31 +0300 Subject: [PATCH 08/12] Fix misphrasing --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0a04be2..0f371bf 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Beta 3 This version should fix the crashes that seem to have occured in many of the older versions. Consider this another intermediate Beta version, as there will be at least another one until I consider issuing a release candidate. -If you migrate from an older version, the Telegram authentication files have been moved to .purple/telegram-purple. If you want to keep your old secret chats, please copy it manually from ~/.telegram-purple, otherwise you will be prompted for a new SMS code. +If you migrate from an older version, the Telegram authentication files have been moved to .purple/telegram-purple. If you want to keep your old secret chats, please copy them manually from ~/.telegram-purple, or otherwise you will be prompted for a new SMS code. Build ----- From f9960c1f6e18a6f5d6cd58f88b41dec0a1cf5d1b Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Wed, 16 Sep 2015 17:33:26 +0300 Subject: [PATCH 09/12] Fix misphrasing --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0f371bf..c2fd2a9 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ If you migrate from an older version, the Telegram authentication files have bee Build ----- -Below, you will find instructions on how to build the libpurple protocol plugin. If you just want to use the plugin in Adium, [download precompiled packages here.](https://github.com/majn/telegram-purple/releases). +Below, you will find instructions on how to build the libpurple protocol plugin. If you just want to use the plugin in Adium, [download the precompiled packages here.](https://github.com/majn/telegram-purple/releases). #### 1. Clone From 5762d4833910d4fad26aad178235070e5df467de Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Wed, 16 Sep 2015 17:33:56 +0300 Subject: [PATCH 10/12] Fix a misphrasing --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c2fd2a9..1743dd6 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ If you migrate from an older version, the Telegram authentication files have bee Build ----- -Below, you will find instructions on how to build the libpurple protocol plugin. If you just want to use the plugin in Adium, [download the precompiled packages here.](https://github.com/majn/telegram-purple/releases). +Below, you will find the instructions for how to build the libpurple protocol plugin. If you just want to use the plugin in Adium, [download the precompiled packages here.](https://github.com/majn/telegram-purple/releases). #### 1. Clone From b334efc5c873ad75a666516afc519ea77518e7a1 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Wed, 16 Sep 2015 17:36:13 +0300 Subject: [PATCH 11/12] Fix a misphrasing --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1743dd6..7a2b1d3 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ If libwebp is not available, you can disable sticker support by calling ./config Pulling Updates --------------- -This repository contains submodules and just a simple pull won't be enough to update all submodule files. Pull new changes with: +This repository contains submodules, and a simple pull just won't be enough to update all the submodules’ files. Pull new changes with: git pull From be5bbbc6822a7c823575f46b6ac2f3f57416c8b2 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Wed, 16 Sep 2015 17:37:28 +0300 Subject: [PATCH 12/12] Add missing comma --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a2b1d3..a6e8c58 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ Foreign users, like for example people you only know through a group chat but ne You can use Telegram secret chats with this plugin, they will show up as a new buddy with a '!' in front of the buddy name. -One caveat of secret chats in Telegram is that they can only have one endpoint, this is a limitation of the protocol. This means that if you create a secret chat in Pidgin you will not be able to use that chat on your phone. You will be asked whether to accept each secret chat, so you can always choose to accept the chat on a different device if you want. You can set a default behavior for dealing with secret chats (Accept or Decline) in the account settings if you don't want that prompt to appear every time. +One caveat of secret chats in Telegram is that they can only have one endpoint, this is a limitation of the protocol. This means that if you create a secret chat in Pidgin you will not be able to use that chat on your phone. You will be asked whether to accept each secret chat, so you can always choose to accept the chat on a different device if you want. You can set a default behavior for dealing with secret chats (Accept or Decline) in the account settings, if you don't want that prompt to appear every time. Self destructive messages will be ignored, since I don't know any way to delete them from the conversation and the history.