From a61c9db881da3b1fed7b456b57bfbd50b61c0f29 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Wed, 24 Feb 2016 03:39:01 +0100 Subject: [PATCH 1/6] Portability fix for POSIX shells Only a handful of shells support the "==" comparison operator for the "test" built-in. The standard, portable operator is "=" instead. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b333e4b..af04356 100755 --- a/configure +++ b/configure @@ -4414,7 +4414,7 @@ if test "${enable_icons+set}" = set; then : enableval=$enable_icons; fi - if test "x$enable_icons" == "xno"; then : + if test "x$enable_icons" = "xno"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Icons are deactivated. Pidgin needs icons. Finch and telepathy-haze don't." >&5 $as_echo "$as_me: WARNING: Icons are deactivated. Pidgin needs icons. Finch and telepathy-haze don't." >&2;} diff --git a/configure.ac b/configure.ac index c50bd05..bacef3f 100644 --- a/configure.ac +++ b/configure.ac @@ -65,7 +65,7 @@ AS_IF([test "x$enable_libwebp" != "xno"], [ AC_SUBST([COPY_ICONS], [yes]) AC_ARG_ENABLE([icons], AS_HELP_STRING([--disable-icons], [Don't copy the protocol icons for Pidgin. Only useful if you're using Finch of telepathy-haze. (Adium users shouldn't be using this build system at all.)])) - AS_IF([test "x$enable_icons" == "xno"], [ + AS_IF([test "x$enable_icons" = "xno"], [ AC_WARN([Icons are deactivated. Pidgin needs icons. Finch and telepathy-haze don't.]) AC_SUBST([COPY_ICONS], [no]) ]) From cb12fbf4f9922912559bda759c504ea2d5924bb3 Mon Sep 17 00:00:00 2001 From: mj Date: Sat, 27 Feb 2016 17:55:01 +0100 Subject: [PATCH 2/6] Update group chat link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f506d89..9348ac5 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Telegram-Purple Unofficial (Beta) 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 -[telegram group chat](https://goo.gl/a8SigQ) for +[telegram group chat](https://goo.gl/QHttTR) for telegram-purple related discussions or questions. Installation @@ -253,7 +253,7 @@ FAQ Telegram group chat for telegram-purple or libtgl related discussions or questions: - - https://goo.gl/a8SigQ + - https://goo.gl/QHttTR Submitting Bug Reports From 3107a601eb47a81afe24b962ebfe5851e67783f0 Mon Sep 17 00:00:00 2001 From: mjentsch Date: Sat, 27 Feb 2016 15:18:50 +0100 Subject: [PATCH 3/6] Merge libtgl fix use-after-not-created for photos --- tgl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgl b/tgl index e03d95b..bec66c2 160000 --- a/tgl +++ b/tgl @@ -1 +1 @@ -Subproject commit e03d95bbdfecaec0aaca7dec60644ed9d8aeff08 +Subproject commit bec66c25d52368695e10625f956de5250a2d836d From d020f9c32a578f7e32ff3dd90cec299e172aa187 Mon Sep 17 00:00:00 2001 From: mjentsch Date: Fri, 11 Mar 2016 12:18:08 +0100 Subject: [PATCH 4/6] Fix Adium bundle breaking on library version jumps Link against the generic libpurple and glib bundled with Adium instead of the specific version number to avoid breakage on version updates. --- .../telegram-adium.xcodeproj/project.pbxproj | 17 +++++++++++++++++ .../telegram-adium/telegram-adium-Info.plist | 6 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/telegram-adium/telegram-adium.xcodeproj/project.pbxproj b/telegram-adium/telegram-adium.xcodeproj/project.pbxproj index dbde3e2..454fcc4 100644 --- a/telegram-adium/telegram-adium.xcodeproj/project.pbxproj +++ b/telegram-adium/telegram-adium.xcodeproj/project.pbxproj @@ -286,6 +286,7 @@ C410948219BB2D7D0083BF3F /* Sources */, C410948319BB2D7D0083BF3F /* Frameworks */, C410948419BB2D7D0083BF3F /* Resources */, + C4C325A11C91BD230020D32E /* ShellScript */, ); buildRules = ( ); @@ -343,6 +344,22 @@ }; /* 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 */ C410948219BB2D7D0083BF3F /* Sources */ = { isa = PBXSourcesBuildPhase; diff --git a/telegram-adium/telegram-adium/telegram-adium-Info.plist b/telegram-adium/telegram-adium/telegram-adium-Info.plist index eb2aa25..7ec90e9 100644 --- a/telegram-adium/telegram-adium/telegram-adium-Info.plist +++ b/telegram-adium/telegram-adium/telegram-adium-Info.plist @@ -19,11 +19,11 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.2.5 + 1.2.6 CFBundleSignature AdIM CFBundleVersion - 1.2.5 + 1.2.6 CFPlugInDynamicRegisterFunction CFPlugInDynamicRegistration @@ -43,7 +43,7 @@ CFPlugInUnloadFunction NSHumanReadableCopyright - Copyright © 2014 Matthias Jentsch. + Copyright © 2014-2016 Matthias Jentsch. NSPrincipalClass TelegramPlugin From 54cfce4df2f98f017042550163d17d10881de9d3 Mon Sep 17 00:00:00 2001 From: mjentsch Date: Fri, 11 Mar 2016 13:10:14 +0100 Subject: [PATCH 5/6] Bump version to 1.2.6 --- CHANGELOG.md | 5 +++++ README.md | 10 ++++------ configure | 18 +++++++++--------- configure.ac | 2 +- rpm/purple-telegram.spec | 5 ++++- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d37e1db..849311d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Changelog --------- +##### 1.2.6 + +- Include libtgl bugfix "use-after-not-created for photos" +- Fix Adium bundle version incompatibillity for newest version + ##### 1.2.5 - Include libtgl fix to prevent crashes on certain channel messages diff --git a/README.md b/README.md index 9348ac5..7a55024 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If your plattform is not supported or you want to contribute by testing or devel #### 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 #### Windows @@ -217,13 +217,11 @@ and `.dsc` files, do this: Note that the parenthesis are important. -1.2.5 +1.2.6 ----- -- Handle revoked sessions automatically -- Include libtgl fix to prevent crashes on certain channel messages -- Improve error handling - +- Include libtgl bugfix "use-after-not-created for photos" +- Fix Adium bundle version incompatibillity for newest version Discussion / Help ----------------- diff --git a/configure b/configure index af04356..4338975 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for telegram-purple 1.2.5. +# Generated by GNU Autoconf 2.69 for telegram-purple 1.2.6. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='telegram-purple' PACKAGE_TARNAME='telegram-purple' -PACKAGE_VERSION='1.2.5' -PACKAGE_STRING='telegram-purple 1.2.5' +PACKAGE_VERSION='1.2.6' +PACKAGE_STRING='telegram-purple 1.2.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1250,7 +1250,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures telegram-purple 1.2.5 to adapt to many kinds of systems. +\`configure' configures telegram-purple 1.2.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1311,7 +1311,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of telegram-purple 1.2.5:";; + short | recursive ) echo "Configuration of telegram-purple 1.2.6:";; esac cat <<\_ACEOF @@ -1421,7 +1421,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -telegram-purple configure 1.2.5 +telegram-purple configure 1.2.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1840,7 +1840,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by telegram-purple $as_me 1.2.5, which was +It was created by telegram-purple $as_me 1.2.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5106,7 +5106,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by telegram-purple $as_me 1.2.5, which was +This file was extended by telegram-purple $as_me 1.2.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5168,7 +5168,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -telegram-purple config.status 1.2.5 +telegram-purple config.status 1.2.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index bacef3f..b3f3f0d 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([telegram-purple], [1.2.5]) +AC_INIT([telegram-purple], [1.2.6]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADERS([config.h]) diff --git a/rpm/purple-telegram.spec b/rpm/purple-telegram.spec index ffaae5d..c71a63f 100644 --- a/rpm/purple-telegram.spec +++ b/rpm/purple-telegram.spec @@ -1,5 +1,5 @@ Name: purple-telegram -Version: 1.2.5 +Version: 1.2.6 Release: 1%{?dist} Summary: Adds support for Libpurple based messengers Group: Applications/Internet @@ -39,6 +39,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/telegram- %{_datadir}/pixmaps/pidgin/protocols/48/telegram.png %changelog +* Fri Mar 11 mjentsch 1.2.6-1 +- build for 1.2.6 + * Sat Jan 23 mjentsch 1.2.5-1 - build for 1.2.5 From 1388bc6ed7821954e64599a652ade90359e2ba96 Mon Sep 17 00:00:00 2001 From: Ben Wiederhake Date: Thu, 18 Feb 2016 22:27:14 +0100 Subject: [PATCH 6/6] Fix empty group handling Fixes #203. --- telegram-base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telegram-base.c b/telegram-base.c index 13518b7..4def10f 100644 --- a/telegram-base.c +++ b/telegram-base.c @@ -493,7 +493,7 @@ void tgp_create_group_chat_by_usernames (struct tgl_state *TLS, const char *titl 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, g_strdup (title)); } else {