Hello community, here is the log from the commit of package smuxi for openSUSE:Factory checked in at 2015-03-25 10:01:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/smuxi (Old) and /work/SRC/openSUSE:Factory/.smuxi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smuxi" Changes: -------- --- /work/SRC/openSUSE:Factory/smuxi/smuxi.changes 2014-06-25 10:49:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.smuxi.new/smuxi.changes 2015-03-25 10:01:25.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 23 21:00:07 UTC 2015 - [email protected] + +- Update to version 0.11.1: + + Bug fix release. + +------------------------------------------------------------------- Old: ---- smuxi-0.11.tar.gz New: ---- smuxi-0.11.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smuxi.spec ++++++ --- /var/tmp/diff_new_pack.5QrnFK/_old 2015-03-25 10:01:26.000000000 +0100 +++ /var/tmp/diff_new_pack.5QrnFK/_new 2015-03-25 10:01:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package smuxi # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: smuxi -Version: 0.11 +Version: 0.11.1 Release: 0 # FIXME: when db4o is in Factory, uncomment BuildRequires for it Url: http://www.smuxi.org ++++++ smuxi-0.11.tar.gz -> smuxi-0.11.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/aclocal.m4 new/smuxi-0.11.1/aclocal.m4 --- old/smuxi-0.11/aclocal.m4 2014-03-16 16:51:51.000000000 +0100 +++ new/smuxi-0.11.1/aclocal.m4 2015-03-21 11:18:04.000000000 +0100 @@ -21,7 +21,7 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # gettext.m4 serial 66 (gettext-0.18.2) -dnl Copyright (C) 1995-2013 Free Software Foundation, Inc. +dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -423,7 +423,7 @@ AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) # iconv.m4 serial 18 (gettext-0.18.2) -dnl Copyright (C) 2000-2002, 2007-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -692,7 +692,7 @@ ]) # intlmacosx.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -749,7 +749,7 @@ ]) # lib-ld.m4 serial 6 -dnl Copyright (C) 1996-2003, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -869,7 +869,7 @@ ]) # lib-link.m4 serial 26 (gettext-0.18.2) -dnl Copyright (C) 2001-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1647,7 +1647,7 @@ ]) # lib-prefix.m4 serial 7 (gettext-0.18) -dnl Copyright (C) 2001-2005, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1872,7 +1872,7 @@ ]) # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -2064,8 +2064,63 @@ fi[]dnl ])# PKG_CHECK_MODULES -# po.m4 serial 21 (gettext-0.18.3) -dnl Copyright (C) 1995-2013 Free Software Foundation, Inc. + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + +# po.m4 serial 22 (gettext-0.19) +dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -2096,7 +2151,7 @@ dnl Release version of the gettext macros. This is used to ensure that dnl the gettext macros and po/Makefile.in.in are in sync. - AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) + AC_SUBST([GETTEXT_MACRO_VERSION], [0.19]) dnl Perform the following tests also if --disable-nls has been given, dnl because they are needed for "make dist" to work. @@ -2519,7 +2574,7 @@ ]) # progtest.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1996-2003, 2005, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -2693,10 +2748,9 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/config.guess new/smuxi-0.11.1/config.guess --- old/smuxi-0.11/config.guess 2014-03-16 16:51:56.000000000 +0100 +++ new/smuxi-0.11.1/config.guess 2015-03-21 11:18:09.000000000 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -826,7 +826,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1260,16 +1260,26 @@ if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; @@ -1361,154 +1371,6 @@ exit ;; esac -eval $set_cc_for_build -cat >$dummy.c <<EOF -#ifdef _SEQUENT_ -# include <sys/types.h> -# include <sys/utsname.h> -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include <sys/param.h> - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include <sys/param.h> -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 <<EOF $0: unable to guess system type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/config.sub new/smuxi-0.11.1/config.sub --- old/smuxi-0.11/config.sub 2014-03-16 16:51:56.000000000 +0100 +++ new/smuxi-0.11.1/config.sub 2015-03-21 11:18:09.000000000 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-08-10' +timestamp='2014-09-11' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -68,7 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -265,6 +265,7 @@ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -282,8 +283,10 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -295,11 +298,11 @@ | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ @@ -324,7 +327,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -381,6 +384,7 @@ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -400,8 +404,10 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -413,6 +419,7 @@ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -822,6 +829,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -1367,14 +1378,14 @@ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1592,9 +1603,6 @@ mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/configure new/smuxi-0.11.1/configure --- old/smuxi-0.11/configure 2014-03-16 16:51:53.000000000 +0100 +++ new/smuxi-0.11.1/configure 2015-03-21 11:18:07.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for smuxi 0.11. +# Generated by GNU Autoconf 2.69 for smuxi 0.11.1. # # Report bugs to <https://smuxi.im/issues/new>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='smuxi' PACKAGE_TARNAME='smuxi' -PACKAGE_VERSION='0.11' -PACKAGE_STRING='smuxi 0.11' +PACKAGE_VERSION='0.11.1' +PACKAGE_STRING='smuxi 0.11.1' PACKAGE_BUGREPORT='https://smuxi.im/issues/new' PACKAGE_URL='' @@ -1543,7 +1543,7 @@ # 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 smuxi 0.11 to adapt to many kinds of systems. +\`configure' configures smuxi 0.11.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1613,7 +1613,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of smuxi 0.11:";; + short | recursive ) echo "Configuration of smuxi 0.11.1:";; esac cat <<\_ACEOF @@ -1829,7 +1829,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -smuxi configure 0.11 +smuxi configure 0.11.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2107,7 +2107,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by smuxi $as_me 0.11, which was +It was created by smuxi $as_me 0.11.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2659,8 +2659,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2973,7 +2973,7 @@ # Define the identity of the package. PACKAGE='smuxi' - VERSION='0.11' + VERSION='0.11.1' cat >>confdefs.h <<_ACEOF @@ -12623,7 +12623,7 @@ - GETTEXT_MACRO_VERSION=0.18 + GETTEXT_MACRO_VERSION=0.19 @@ -18796,7 +18796,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by smuxi $as_me 0.11, which was +This file was extended by smuxi $as_me 0.11.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18853,7 +18853,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -smuxi config.status 0.11 +smuxi config.status 0.11.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/configure.ac new/smuxi-0.11.1/configure.ac --- old/smuxi-0.11/configure.ac 2014-01-11 22:41:01.000000000 +0100 +++ new/smuxi-0.11.1/configure.ac 2015-03-21 10:21:55.000000000 +0100 @@ -1,5 +1,5 @@ AC_PREREQ([2.54]) -AC_INIT([smuxi], [0.11], [https://smuxi.im/issues/new]) +AC_INIT([smuxi], [0.11.1], [https://smuxi.im/issues/new]) # using the --foreign option makes automake less strict about GNU policy AC_CONFIG_MACRO_DIR([.]) AM_INIT_AUTOMAKE([foreign tar-ustar]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/lib/Twitterizer/Twitterizer2/Exceptions/TwitterizerException.cs new/smuxi-0.11.1/lib/Twitterizer/Twitterizer2/Exceptions/TwitterizerException.cs --- old/smuxi-0.11/lib/Twitterizer/Twitterizer2/Exceptions/TwitterizerException.cs 2013-04-14 13:23:07.000000000 +0200 +++ new/smuxi-0.11.1/lib/Twitterizer/Twitterizer2/Exceptions/TwitterizerException.cs 2015-03-21 11:18:07.000000000 +0100 @@ -38,6 +38,9 @@ using System.Linq; using System.Net; using System.Text; +#if !SILVERLIGHT + using System.Runtime.Serialization; +#endif using Core; /// <summary> @@ -107,6 +110,18 @@ #endif } } + +#if !SILVERLIGHT + /// <summary> + /// Initializes a new instance of the <see cref="TwitterizerException"/> class. + /// </summary> + /// <param name="info">The serialization info.</param> + /// <param name="context">The streaming context.</param> + protected TwitterizerException(SerializationInfo info, StreamingContext context) : + base(info, context) + { + } +#endif #endregion /// <summary> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/ltmain.sh new/smuxi-0.11.1/ltmain.sh --- old/smuxi-0.11/ltmain.sh 2014-03-16 16:51:49.000000000 +0100 +++ new/smuxi-0.11.1/ltmain.sh 2015-03-21 11:18:02.000000000 +0100 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.11 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.7" +VERSION="2.4.2 Debian-2.4.2-1.11" TIMESTAMP="" package_revision=1.3337 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/po-Engine-IRC/hr.po new/smuxi-0.11.1/po-Engine-IRC/hr.po --- old/smuxi-0.11/po-Engine-IRC/hr.po 2014-02-16 19:35:40.000000000 +0100 +++ new/smuxi-0.11.1/po-Engine-IRC/hr.po 2015-03-21 10:21:44.000000000 +0100 @@ -295,7 +295,7 @@ #: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2961 #, csharp-format msgid "{0} is now known as {1}" -msgstr "{0} je sada znan kao {0}" +msgstr "{0} je sada znan kao {1}" #. TRANSLATOR: do NOT change the position of {0} and {2}! #: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2998 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/src/AssemblyVersion.cs new/smuxi-0.11.1/src/AssemblyVersion.cs --- old/smuxi-0.11/src/AssemblyVersion.cs 2014-03-16 16:51:58.000000000 +0100 +++ new/smuxi-0.11.1/src/AssemblyVersion.cs 2015-03-21 11:18:12.000000000 +0100 @@ -36,5 +36,5 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("0.11")] +[assembly: AssemblyVersion("0.11.1")] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/src/Common/Defines.cs new/smuxi-0.11.1/src/Common/Defines.cs --- old/smuxi-0.11/src/Common/Defines.cs 2014-03-16 16:51:58.000000000 +0100 +++ new/smuxi-0.11.1/src/Common/Defines.cs 2015-03-21 11:18:12.000000000 +0100 @@ -27,10 +27,10 @@ public static class Defines { public const string GitBranch = "release/0.11"; - public const string GitCommitHash = "dff7157"; + public const string GitCommitHash = "24b8867"; private static readonly string f_InstallPrefix = "/usr/local"; - private static readonly string f_DistVersion = "release/0.11/dff7157"; + private static readonly string f_DistVersion = "release/0.11/24b8867"; private static readonly string f_TwitterApiKey = "60QV2qQx9cS7y1BJDbgAA|2VgD6qQKddsF5HYQ0TrRgs3tFTnCwDONBmRlTmG658"; public static string InstallPrefix { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/src/Engine/Config/MessageBuilderSettings.cs new/smuxi-0.11.1/src/Engine/Config/MessageBuilderSettings.cs --- old/smuxi-0.11/src/Engine/Config/MessageBuilderSettings.cs 2014-02-19 21:12:49.000000000 +0100 +++ new/smuxi-0.11.1/src/Engine/Config/MessageBuilderSettings.cs 2015-03-21 10:21:44.000000000 +0100 @@ -69,8 +69,8 @@ static void InitBuiltinSmartLinks() { - string path_last_chars = @"a-zA-Z0-9#/%&@=\-_+;:~"; - string path_chars = path_last_chars + @")(?!.,"; + string path_last_chars = @"a-zA-Z0-9#/%&@=\-_+;:~'"; + string path_chars = path_last_chars + @"\(\)\[\]\{\}?!.,"; string domainchars = @"[a-z0-9\-]+"; string subdomain = domainchars + @"\."; string common_tld = @"de|es|im|us|com|net|org|info|biz|gov|name|edu|onion|museum"; @@ -117,7 +117,10 @@ // Gst.Buffer.Unref() from matching string heuristic_domain = @"(?:(?:" + subdomain + ")+(?:" + common_tld + ")|localhost)"; string heuristic_address = heuristic_domain + "(?:" + path + ")?"; - regex = new Regex(heuristic_address, RegexOptions.Compiled); + regex = new Regex( + heuristic_address, + RegexOptions.IgnoreCase | RegexOptions.Compiled + ); BuiltinPatterns.Add(new MessagePatternModel(regex) { LinkFormat = "http://{0}"; }); @@ -213,7 +216,7 @@ }); // Debian Security Advisories (DSA) - regex = new Regex(@"DSA-([0-9]{4})(-[0-9]{1,2})?", + regex = new Regex(@"DSA[ -]?([0-9]{4})(-[0-9]{1,2})?", RegexOptions.IgnoreCase | RegexOptions.Compiled); BuiltinPatterns.Add(new MessagePatternModel(regex) { LinkFormat = "http://www.debian.org/security/dsa-{1}"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/src/Engine/Config/ServerModel.cs new/smuxi-0.11.1/src/Engine/Config/ServerModel.cs --- old/smuxi-0.11/src/Engine/Config/ServerModel.cs 2014-02-16 19:28:04.000000000 +0100 +++ new/smuxi-0.11.1/src/Engine/Config/ServerModel.cs 2015-03-21 10:21:44.000000000 +0100 @@ -82,6 +82,9 @@ case "_Username": Username = (string) e.Value; break; + case "_Nickname": + Nickname = (string) e.Value; + break; case "_Realname": Realname = (string) e.Value; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/src/Engine/Session.cs new/smuxi-0.11.1/src/Engine/Session.cs --- old/smuxi-0.11/src/Engine/Session.cs 2014-03-09 10:27:04.000000000 +0100 +++ new/smuxi-0.11.1/src/Engine/Session.cs 2015-03-21 10:21:44.000000000 +0100 @@ -1676,6 +1676,9 @@ // TODO: use a timeout here to only refresh once in 1 second _Filters = _FilterListController.GetFilterList().Values; } + if (e.Key == "Interface/Chat/HighlightWords") { + MessageBuilderSettings.ApplyConfig(UserConfig); + } if (e.Key == "Interface/Notebook/EngineBufferLines") { lock (_Chats) { foreach (var chat in _Chats) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs new/smuxi-0.11.1/src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs --- old/smuxi-0.11/src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs 2014-02-16 19:29:57.000000000 +0100 +++ new/smuxi-0.11.1/src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs 2015-03-21 10:21:44.000000000 +0100 @@ -2311,7 +2311,11 @@ public void CommandRaw(CommandModel cd) { - _IrcClient.WriteLine(cd.Parameter); + if (_IrcClient.IsRegistered) { + _IrcClient.WriteLine(cd.Parameter); + } else { + _IrcClient.WriteLine(cd.Parameter, Priority.Critical); + } } public void CommandMe(CommandModel cd) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs new/smuxi-0.11.1/src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs --- old/smuxi-0.11/src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs 2014-02-16 19:28:04.000000000 +0100 +++ new/smuxi-0.11.1/src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs 2015-03-21 10:21:44.000000000 +0100 @@ -310,7 +310,6 @@ JabberClient.Close(); } - [MethodImpl(MethodImplOptions.Synchronized)] public override void Dispose() { Trace.Call(); @@ -318,18 +317,6 @@ base.Dispose(); AutoReconnect = false; - JabberClient.OnMessage -= OnMessage; - JabberClient.OnClose -= OnClose; - JabberClient.OnLogin -= OnLogin; - JabberClient.OnError -= OnError; - JabberClient.OnStreamError -= OnStreamError; - JabberClient.OnPresence -= OnPresence; - JabberClient.OnRosterItem -= OnRosterItem; - JabberClient.OnReadXml -= OnReadXml; - JabberClient.OnWriteXml -= OnWriteXml; - JabberClient.OnAuthError -= OnAuthError; - JabberClient.ClientSocket.OnValidateCertificate -= ValidateCertificate; - JabberClient.SendingServiceUnavailable -= OnSendingServiceUnavailable; JabberClient.SocketDisconnect(); } @@ -635,6 +622,31 @@ } JabberClient.SendMyPresence(); + + // send presence update to all MUCs, see XEP-0045: + // http://xmpp.org/extensions/xep-0045.html#changepres + foreach (var chat in Chats) { + if (!(chat is XmppGroupChatModel)) { + continue; + } + var muc = (XmppGroupChatModel) chat; + + var to = new Jid(muc.ID) { + Resource = muc.OwnNickname + }; + + var presence = new Presence() { + Show = JabberClient.Show, + Status = JabberClient.Status, + From = JabberClient.MyJID, + To = to + }; + + if (JabberClient.EnableCapabilities) { + presence.AddChild(JabberClient.Capabilities); + } + JabberClient.Send(presence); + } } [MethodImpl(MethodImplOptions.Synchronized)] @@ -1808,7 +1820,7 @@ void OnGroupChatPresence(XmppGroupChatModel chat, Presence pres) { Jid jid = pres.From; - var person = new PersonModel(jid, pres.From.Resource, NetworkID, Protocol, this); + var person = new PersonModel(jid, pres.From.Resource ?? pres.From, NetworkID, Protocol, this); PrintGroupChatPresence(chat, person, pres); switch (pres.Type) { case PresenceType.available: @@ -1825,7 +1837,13 @@ chat.UnsafePersons.Add(person.ID, person); // did I join? then the chat roster is fully received - if (pres.From.Resource == chat.OwnNickname) { + if (pres.From.Resource == chat.OwnNickname || + pres.MucUser.StatusCodes.Exists(x => x.Code == StatusCode.SelfPresence)) { + if (pres.MucUser.StatusCodes.Exists(x => x.Code == StatusCode.ModifiedNick)) { + // as per XEP-0045 7.2.3 Example 24 the server is + // allowed to give us a different nick than we requested + chat.OwnNickname = pres.From.Resource; + } chat.IsJoining = false; // HACK: lower probability of sync race condition swallowing messages ThreadPool.QueueUserWorkItem(delegate { @@ -2073,8 +2091,12 @@ } // mark highlights only for received messages - bool hilight = person.ID != groupChat.OwnNickname; - var message = CreateMessage(person, msg, hilight, false); + MessageModel message; + if (person.ID == groupChat.OwnNickname) { + message = CreateEchoGroupChatMessage(groupChat, msg); + } else { + message = CreateGroupChatMessage(groupChat, person, msg); + } Session.AddMessageToChat(groupChat, message); OnMessageReceived( new MessageEventArgs(groupChat, message, msg.From, groupChat.ID) @@ -2123,14 +2145,48 @@ if (msg.Nickname != null) { ProcessNickname(GetOrCreateContact(msg.From, msg.Nickname.Value), msg.Nickname); } - var message = CreateMessage(chat.Person, msg, true, true); + var message = CreatePrivateChatMessage(chat.Person, msg); AddMessageToChatIfNotFiltered(message, chat, isNew); OnMessageReceived( new MessageEventArgs(chat, message, msg.From, null) ); } - MessageModel CreateMessage(PersonModel person, Message msg, bool mark_hilights, bool force_hilight) + MessageModel CreateEchoGroupChatMessage(XmppGroupChatModel groupChat, Message msg) + { + var builder = CreateMessageBuilder(); + string msgstring; + if (msg.Html != null) { + msgstring = msg.Html.ToString(); + } else { + msgstring = msg.Body.Trim(); + } + var self = new PersonModel( + groupChat.OwnNickname, + groupChat.OwnNickname, + NetworkID, Protocol, this); + if (msgstring.StartsWith("/me ")) { + // leave the " " intact + msgstring = msgstring.Substring(3); + builder.AppendActionPrefix(); + builder.AppendIdendityName(self); + } else { + builder.AppendSenderPrefix(self); + } + + if (msg.Html != null) { + builder.AppendHtmlMessage(msgstring); + } else { + builder.AppendMessage(msgstring); + } + + if (msg.XDelay != null) { + builder.TimeStamp = msg.XDelay.Stamp; + } + return builder.ToMessage(); + } + + MessageModel CreateGroupChatMessage(XmppGroupChatModel groupChat, PersonModel person, Message msg) { var builder = CreateMessageBuilder(); string msgstring; @@ -2144,9 +2200,9 @@ // leave the " " intact msgstring = msgstring.Substring(3); builder.AppendActionPrefix(); - builder.AppendIdendityName(person, force_hilight); + builder.AppendIdendityName(person); } else { - builder.AppendSenderPrefix(person, force_hilight); + builder.AppendSenderPrefix(person); } if (msg.Html != null) { @@ -2154,8 +2210,42 @@ } else { builder.AppendMessage(msgstring); } - if (mark_hilights) { - builder.MarkHighlights(); + // mark hilights only for OwnNickname, too + builder.Me = new PersonModel( + groupChat.OwnNickname, + groupChat.OwnNickname, + NetworkID, Protocol, this); + builder.MarkHighlights(); + + if (msg.XDelay != null) { + builder.TimeStamp = msg.XDelay.Stamp; + } + return builder.ToMessage(); + } + + MessageModel CreatePrivateChatMessage(PersonModel person, Message msg) + { + var builder = CreateMessageBuilder(); + string msgstring; + if (msg.Html != null) { + msgstring = msg.Html.ToString(); + } else { + msgstring = msg.Body.Trim(); + } + + if (msgstring.StartsWith("/me ")) { + // leave the " " intact + msgstring = msgstring.Substring(3); + builder.AppendActionPrefix(); + builder.AppendIdendityName(person, true); + } else { + builder.AppendSenderPrefix(person, true); + } + + if (msg.Html != null) { + builder.AppendHtmlMessage(msgstring); + } else { + builder.AppendMessage(msgstring); } if (msg.XDelay != null) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/src/Frontend-GNOME/Views/ChatTreeView.cs new/smuxi-0.11.1/src/Frontend-GNOME/Views/ChatTreeView.cs --- old/smuxi-0.11/src/Frontend-GNOME/Views/ChatTreeView.cs 2014-02-04 07:25:38.000000000 +0100 +++ new/smuxi-0.11.1/src/Frontend-GNOME/Views/ChatTreeView.cs 2015-03-21 10:21:44.000000000 +0100 @@ -220,6 +220,13 @@ Gtk.CellRenderer cellr, Gtk.TreeModel model, Gtk.TreeIter iter) { + if (cellr == null) { + throw new ArgumentNullException("cellr"); + } + if (model == null) { + throw new ArgumentNullException("model"); + } + var chat = (ChatView) model.GetValue(iter, 0); var renderer = (Gtk.CellRendererPixbuf) cellr; @@ -240,6 +247,13 @@ Gtk.CellRenderer cellr, Gtk.TreeModel model, Gtk.TreeIter iter) { + if (cellr == null) { + throw new ArgumentNullException("cellr"); + } + if (model == null) { + throw new ArgumentNullException("model"); + } + var chat = (ChatView) model.GetValue(iter, 0); var renderer = (Gtk.CellRendererText) cellr; @@ -274,6 +288,13 @@ Gtk.CellRenderer cellr, Gtk.TreeModel model, Gtk.TreeIter iter) { + if (cellr == null) { + throw new ArgumentNullException("cellr"); + } + if (model == null) { + throw new ArgumentNullException("model"); + } + var chat = (ChatView) model.GetValue(iter, 0); var renderer = (Gtk.CellRendererText) cellr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/src/Frontend-GNOME/Views/MenuWidget.cs new/smuxi-0.11.1/src/Frontend-GNOME/Views/MenuWidget.cs --- old/smuxi-0.11/src/Frontend-GNOME/Views/MenuWidget.cs 2014-02-16 19:28:04.000000000 +0100 +++ new/smuxi-0.11.1/src/Frontend-GNOME/Views/MenuWidget.cs 2015-03-21 10:21:44.000000000 +0100 @@ -256,6 +256,9 @@ controller.AddServer(server); controller.Save(); + + // reload server list in join bar + JoinWidget.InitNetworks(controller.GetNetworks()); } catch (InvalidOperationException ex) { Frontend.ShowError(Parent, _("Unable to add server: "), ex); } catch (Exception ex) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/src/Frontend-GNOME/Views/MessageTextView.cs new/smuxi-0.11.1/src/Frontend-GNOME/Views/MessageTextView.cs --- old/smuxi-0.11/src/Frontend-GNOME/Views/MessageTextView.cs 2014-02-04 07:25:38.000000000 +0100 +++ new/smuxi-0.11.1/src/Frontend-GNOME/Views/MessageTextView.cs 2015-03-21 10:21:44.000000000 +0100 @@ -360,6 +360,10 @@ } else if (msgPart is TextMessagePartModel) { var tags = new List<Gtk.TextTag>(); TextMessagePartModel fmsgti = (TextMessagePartModel) msgPart; + if (fmsgti.Text == null) { + // Gtk.TextBuffer.Insert*() asserts on text == NULL + continue; + } if (fmsgti.ForegroundColor != TextColor.None) { var bg = ColorConverter.GetTextColor(BackgroundColor); if (fmsgti.BackgroundColor != TextColor.None) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/src/Frontend-GNOME/Views/Tags/LinkTag.cs new/smuxi-0.11.1/src/Frontend-GNOME/Views/Tags/LinkTag.cs --- old/smuxi-0.11/src/Frontend-GNOME/Views/Tags/LinkTag.cs 2013-12-06 21:03:40.000000000 +0100 +++ new/smuxi-0.11.1/src/Frontend-GNOME/Views/Tags/LinkTag.cs 2015-03-21 10:21:44.000000000 +0100 @@ -34,5 +34,9 @@ Link = link; } + + protected LinkTag(IntPtr handle) : base(handle) + { + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/src/Frontend-GNOME/Views/Tags/PersonTag.cs new/smuxi-0.11.1/src/Frontend-GNOME/Views/Tags/PersonTag.cs --- old/smuxi-0.11/src/Frontend-GNOME/Views/Tags/PersonTag.cs 2013-12-06 21:03:40.000000000 +0100 +++ new/smuxi-0.11.1/src/Frontend-GNOME/Views/Tags/PersonTag.cs 2015-03-21 10:21:44.000000000 +0100 @@ -39,5 +39,9 @@ ID = id; IdentityName = identityName; } + + protected PersonTag(IntPtr handle) : base(handle) + { + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/src/Frontend-GNOME-IRC/IrcPersonChatView.cs new/smuxi-0.11.1/src/Frontend-GNOME-IRC/IrcPersonChatView.cs --- old/smuxi-0.11/src/Frontend-GNOME-IRC/IrcPersonChatView.cs 2014-01-11 22:41:01.000000000 +0100 +++ new/smuxi-0.11.1/src/Frontend-GNOME-IRC/IrcPersonChatView.cs 2015-03-21 10:21:44.000000000 +0100 @@ -84,6 +84,11 @@ IEnumerable<Gtk.MenuItem> CreateContextMenuItems() { + if (IrcProtocolManager == null) { + // we are not synced yet + yield break; + } + Gtk.ImageMenuItem whois_item = new Gtk.ImageMenuItem(_("Whois")); whois_item.Activated += OnMenuWhoisItemActivated; yield return whois_item; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/src/Frontend-STFL/smuxi-frontend-stfl.1 new/smuxi-0.11.1/src/Frontend-STFL/smuxi-frontend-stfl.1 --- old/smuxi-0.11/src/Frontend-STFL/smuxi-frontend-stfl.1 2014-03-09 12:59:51.000000000 +0100 +++ new/smuxi-0.11.1/src/Frontend-STFL/smuxi-frontend-stfl.1 2015-03-21 10:21:44.000000000 +0100 @@ -20,7 +20,7 @@ , and older logs are moved to the date of usage. .It Fl h , Fl \-help Show the arguments Smuxi takes. -.It Fl l , Fl \-list +.It Fl l , Fl \-list-engines List the available engines Smuxi can connect to. .It Fl e Ar engine , Fl \-engine Ns = Ns Ar engine Connect to a remote engine. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/src/Server/Main.cs new/smuxi-0.11.1/src/Server/Main.cs --- old/smuxi-0.11/src/Server/Main.cs 2012-01-03 08:51:36.000000000 +0100 +++ new/smuxi-0.11.1/src/Server/Main.cs 2015-03-21 10:21:44.000000000 +0100 @@ -1,13 +1,7 @@ /* - * $Id$ - * $URL$ - * $Rev$ - * $Author$ - * $Date$ - * * Smuxi - Smart MUltipleXed Irc * - * Copyright (c) 2005-2006, 2008, 2010 Mirco Bauer <[email protected]> + * Copyright (c) 2005-2006, 2008, 2010, 2011, 2015 Mirco Bauer <[email protected]> * Copyright (c) 2010 Clement Bourgeois <[email protected]> * * Full GPL License: <http://www.gnu.org/licenses/gpl.txt> @@ -154,6 +148,16 @@ ); parser.Add( + "version", + _("Show version"), + delegate(string val) { + Engine.Engine.Init(); + Console.WriteLine(Engine.Engine.VersionString); + Environment.Exit(0); + } + ); + + parser.Add( "<>", delegate(string val) { throw new OptionException( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smuxi-0.11/src/Server/smuxi-server.1 new/smuxi-0.11.1/src/Server/smuxi-server.1 --- old/smuxi-0.11/src/Server/smuxi-server.1 2014-03-09 12:59:51.000000000 +0100 +++ new/smuxi-0.11.1/src/Server/smuxi-server.1 2015-03-21 10:21:44.000000000 +0100 @@ -26,6 +26,8 @@ , and older logs are moved to the date of usage. .It Fl h , Fl \-help Show the arguments Smuxi takes. +.It Fl \-version +Show version information. .It Fl \-add-user Adds a user to the server. .It Fl \-delete-user -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
