stv0g/telegram-purple
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into dev-1.3.0

Browse source
This commit is contained in:
mjentsch 2016-03-20 17:05:14 +01:00
commit a3341cb5cf
6 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -1,6 +1,11 @@
Changelog Changelog
--------- ---------
##### 1.2.6
- Include libtgl bugfix "use-after-not-created for photos"
- Fix Adium bundle version incompatibillity for newest version
##### 1.2.5 ##### 1.2.5
- Include libtgl fix to prevent crashes on certain channel messages - Include libtgl fix to prevent crashes on certain channel messages

14
README.md
View file

@ -4,7 +4,7 @@ Telegram-Purple Unofficial (Beta)
Telegram-purple is a Libpurple protocol plugin that adds support for the Telegram messenger. Telegram-purple is a Libpurple protocol plugin that adds support for the Telegram messenger.
I keep getting many questions about this plugin in my E-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://goo.gl/a8SigQ) for [telegram group chat](https://goo.gl/QHttTR) for
telegram-purple related discussions or questions. telegram-purple related discussions or questions.
Installation Installation
@ -17,7 +17,7 @@ If your platform is not supported or you want to contribute by testing or develo
#### OSX (Adium) #### OSX (Adium)
1. Download and execute the [Telegram-Adium bundle] (https://github.com/majn/telegram-purple/releases/download/v1.2.5/telegram-adium-1.2.5.AdiumLibpurplePlugin.zip) 1. Download and execute the [Telegram-Adium bundle] (https://github.com/majn/telegram-purple/releases/download/v1.2.6/telegram-adium-1.2.6.AdiumLibpurplePlugin.zip)
2. Restart Adium 2. Restart Adium
#### Windows #### Windows
@ -239,13 +239,11 @@ and `.dsc` files, do this:
Note that the parenthesis are important. Note that the parenthesis are important.
1.2.5 1.2.6
----- -----
- Handle revoked sessions automatically - Include libtgl bugfix "use-after-not-created for photos"
- Include libtgl fix to prevent crashes on certain channel messages - Fix Adium bundle version incompatibillity for newest version
- Improve error handling
Discussion / Help Discussion / Help
----------------- -----------------
@ -275,7 +273,7 @@ FAQ
Telegram group chat for telegram-purple or libtgl related discussions or questions: Telegram group chat for telegram-purple or libtgl related discussions or questions:
- https://goo.gl/a8SigQ - https://goo.gl/QHttTR
Submitting Bug Reports Submitting Bug Reports

17
telegram-adium/telegram-adium.xcodeproj/project.pbxproj
View file

@ -289,6 +289,7 @@
C410948219BB2D7D0083BF3F /* Sources */, C410948219BB2D7D0083BF3F /* Sources */,
C410948319BB2D7D0083BF3F /* Frameworks */, C410948319BB2D7D0083BF3F /* Frameworks */,
C410948419BB2D7D0083BF3F /* Resources */, C410948419BB2D7D0083BF3F /* Resources */,
C4C325A11C91BD230020D32E /* ShellScript */,
); );
buildRules = ( buildRules = (
); );
@ -346,6 +347,22 @@
}; };
/* End PBXResourcesBuildPhase section */ /* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
C4C325A11C91BD230020D32E /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "install_name_tool -change \"@executable_path/../Frameworks/libglib.framework/Versions/2.38.1/libglib\" \"@executable_path/../Frameworks/libglib.framework/libglib\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.$WRAPPER_EXTENSION/Contents/MacOS/$PRODUCT_NAME\"\ninstall_name_tool -change \"@executable_path/../Frameworks/libpurple.framework/Versions/2.10.7rd8d96a636413/libpurple\" \"@executable_path/../Frameworks/libpurple.framework/libpurple\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.$WRAPPER_EXTENSION/Contents/MacOS/$PRODUCT_NAME\"\n";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */
C410948219BB2D7D0083BF3F /* Sources */ = { C410948219BB2D7D0083BF3F /* Sources */ = {
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;

2
telegram-adium/telegram-adium/telegram-adium-Info.plist
View file

@ -43,7 +43,7 @@
<key>CFPlugInUnloadFunction</key> <key>CFPlugInUnloadFunction</key>
<string></string> <string></string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
<string>Copyright © 2014 Matthias Jentsch.</string> <string>Copyright © 2014-2016 Matthias Jentsch.</string>
<key>NSPrincipalClass</key> <key>NSPrincipalClass</key>
<string>TelegramPlugin</string> <string>TelegramPlugin</string>
</dict> </dict>

6
telegram-base.c
View file

@ -493,9 +493,9 @@ void tgp_create_group_chat_by_usernames (struct tgl_state *TLS, const char *titl
debug ("User %s not found in peer list", users[j]); debug ("User %s not found in peer list", users[j]);
} }
} }
if (i > 0) { if (j > 1) {
tgl_do_create_group_chat (TLS, j, ids, title, (int) strlen (title), tgp_notify_on_error_gw, tgl_do_create_group_chat (TLS, j, ids, title, (int) strlen(title),
g_strdup (title)); tgp_notify_on_error_gw, g_strdup (title));
} else { } else {
purple_notify_message (_telegram_protocol, PURPLE_NOTIFY_MSG_INFO, _("Couldn't create group"), purple_notify_message (_telegram_protocol, PURPLE_NOTIFY_MSG_INFO, _("Couldn't create group"),
_("Please select at least one other user."), NULL, NULL, NULL); _("Please select at least one other user."), NULL, NULL, NULL);

2
tgl

@ -1 +1 @@
Subproject commit 1a7bc415474b7d58309ae3207806faad42722e4b Subproject commit 561d73ccb6b53e5ba919b10cb54d1e8f5c43f95f