diff -Nru empathy-3.25.90/aclocal.m4 empathy-3.25.90+really3.12.14/aclocal.m4 --- empathy-3.25.90/aclocal.m4 2017-08-17 04:11:47.000000000 +0000 +++ empathy-3.25.90+really3.12.14/aclocal.m4 2017-08-26 00:22:50.000000000 +0000 @@ -20,6 +20,251 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) +# Configure paths for GLIB +# Owen Taylor 1997-2001 + +dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, +dnl gthread, or gio is specified in MODULES, pass to pkg-config +dnl +AC_DEFUN([AM_PATH_GLIB_2_0], +[dnl +dnl Get the cflags and libraries from pkg-config +dnl +AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], + , enable_glibtest=yes) + + pkg_config_args=glib-2.0 + for module in . $4 + do + case "$module" in + gmodule) + pkg_config_args="$pkg_config_args gmodule-2.0" + ;; + gmodule-no-export) + pkg_config_args="$pkg_config_args gmodule-no-export-2.0" + ;; + gobject) + pkg_config_args="$pkg_config_args gobject-2.0" + ;; + gthread) + pkg_config_args="$pkg_config_args gthread-2.0" + ;; + gio*) + pkg_config_args="$pkg_config_args $module-2.0" + ;; + esac + done + + PKG_PROG_PKG_CONFIG([0.16]) + + no_glib="" + + if test "x$PKG_CONFIG" = x ; then + no_glib=yes + PKG_CONFIG=no + fi + + min_glib_version=ifelse([$1], ,2.0.0,$1) + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs + if $PKG_CONFIG --uninstalled $pkg_config_args; then + echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" + enable_glibtest=no + fi + + if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then + : + else + no_glib=yes + fi + fi + + if test x"$no_glib" = x ; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` + + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_glibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" +dnl +dnl Now check if the installed GLIB is sufficiently new. (Also sanity +dnl checks the results of pkg-config to some extent) +dnl + rm -f conf.glibtest + AC_TRY_RUN([ +#include +#include +#include + +int +main () +{ + unsigned int major, minor, micro; + + fclose (fopen ("conf.glibtest", "w")); + + if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } + + if ((glib_major_version != $glib_config_major_version) || + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { + printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If pkg-config was correct, then it is best\n"); + printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration files\n"); + } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) + { + printf("*** GLIB header files (version %d.%d.%d) do not match\n", + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + glib_major_version, glib_minor_version, glib_micro_version); + } + else + { + if ((glib_major_version > major) || + ((glib_major_version == major) && (glib_minor_version > minor)) || + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", + glib_major_version, glib_minor_version, glib_micro_version); + printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", + major, minor, micro); + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); + printf("*** correct copy of pkg-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_glib" = x ; then + AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$PKG_CONFIG" = "no" ; then + echo "*** A new enough version of pkg-config was not found." + echo "*** See http://www.freedesktop.org/software/pkgconfig/" + else + if test -f conf.glibtest ; then + : + else + echo "*** Could not run GLIB test program, checking why..." + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GLIB_CFLAGS="" + GLIB_LIBS="" + GLIB_GENMARSHAL="" + GOBJECT_QUERY="" + GLIB_MKENUMS="" + GLIB_COMPILE_RESOURCES="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + AC_SUBST(GLIB_GENMARSHAL) + AC_SUBST(GOBJECT_QUERY) + AC_SUBST(GLIB_MKENUMS) + AC_SUBST(GLIB_COMPILE_RESOURCES) + rm -f conf.glibtest +]) + +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software +dnl 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. +dnl +dnl This file can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +AC_PREREQ([2.50]) + +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE([nls], + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) +]) + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 11 (pkg-config-0.29.1) @@ -364,251 +609,6 @@ [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) ])dnl PKG_HAVE_DEFINE_WITH_MODULES -# Configure paths for GLIB -# Owen Taylor 1997-2001 - -dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, -dnl gthread, or gio is specified in MODULES, pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GLIB_2_0], -[dnl -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], - , enable_glibtest=yes) - - pkg_config_args=glib-2.0 - for module in . $4 - do - case "$module" in - gmodule) - pkg_config_args="$pkg_config_args gmodule-2.0" - ;; - gmodule-no-export) - pkg_config_args="$pkg_config_args gmodule-no-export-2.0" - ;; - gobject) - pkg_config_args="$pkg_config_args gobject-2.0" - ;; - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - gio*) - pkg_config_args="$pkg_config_args $module-2.0" - ;; - esac - done - - PKG_PROG_PKG_CONFIG([0.16]) - - no_glib="" - - if test "x$PKG_CONFIG" = x ; then - no_glib=yes - PKG_CONFIG=no - fi - - min_glib_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" - enable_glibtest=no - fi - - if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then - : - else - no_glib=yes - fi - fi - - if test x"$no_glib" = x ; then - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` - GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` - - GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` - GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` - glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - unsigned int major, minor, micro; - - fclose (fopen ("conf.glibtest", "w")); - - if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://www.freedesktop.org/software/pkgconfig/" - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - GLIB_GENMARSHAL="" - GOBJECT_QUERY="" - GLIB_MKENUMS="" - GLIB_COMPILE_RESOURCES="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - AC_SUBST(GLIB_GENMARSHAL) - AC_SUBST(GOBJECT_QUERY) - AC_SUBST(GLIB_MKENUMS) - AC_SUBST(GLIB_COMPILE_RESOURCES) - rm -f conf.glibtest -]) - -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software -dnl 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. -dnl -dnl This file can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -AC_PREREQ([2.50]) - -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE([nls], - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) -]) - AC_DEFUN([YELP_HELP_INIT], [ AC_REQUIRE([AC_PROG_LN_S]) diff -Nru empathy-3.25.90/ChangeLog empathy-3.25.90+really3.12.14/ChangeLog --- empathy-3.25.90/ChangeLog 2017-08-17 04:13:20.000000000 +0000 +++ empathy-3.25.90+really3.12.14/ChangeLog 2017-08-26 00:23:01.000000000 +0000 @@ -1,107 +1,45 @@ -commit 37976f61d8dddc950a9b7d3b1417d784b331927f (HEAD -> master, tag: -3.25.90) +commit 25545e60e16c8e3dba8ef90fa4621173d44ffea7 (HEAD -> gnome-3-12) Author: Michael Catanzaro -Date: Wed Aug 16 22:57:32 2017 -0500 +Date: Fri Aug 25 19:17:52 2017 -0500 - Prepare 3.25.90 + Prepare 3.12.14 - NEWS | 30 ++++++++++++++++++++++++------ - configure.ac | 6 +++--- - 2 files changed, 27 insertions(+), 9 deletions(-) + NEWS | 19 +++++++++++++++++++ + configure.ac | 4 ++-- + 2 files changed, 21 insertions(+), 2 deletions(-) -commit 320a5e9c6f73cd8ce496a0ccb7149542648c3ccb (origin/master, -origin/HEAD) +commit cd71a62d2a106b608b4bc8c5c037e79c45f9721c Author: Michael Catanzaro -Date: Wed Aug 16 22:49:48 2017 -0500 - - Quit when window is closed, thank you - - src/empathy-roster-window.c | 4 ---- - 1 file changed, 4 deletions(-) - -commit 96c0d94bb9ecab7623a1e2cc067153a85ff26c22 -Author: Michael Catanzaro -Date: Wed Aug 16 22:32:17 2017 -0500 - - Revert "Revert "Update POTFILES.in"" - - This reverts commit 3d080d2286785374c56cce066ff0a4e7c7797c86. - - I totally removed the only translatable string in this file, so - no need - to debug what is broken here now. - - po/POTFILES.in | 1 - - 1 file changed, 1 deletion(-) - -commit 3d080d2286785374c56cce066ff0a4e7c7797c86 -Author: Michael Catanzaro -Date: Wed Aug 16 22:26:52 2017 -0500 - - Revert "Update POTFILES.in" - - This reverts commit 4803ed7c10957dd5355ba33a9aada7171cb49961. +Date: Wed Aug 16 15:03:34 2017 -0500 - This file still exists. Something is wrong here. + tests: dist certificate-authority.pem - po/POTFILES.in | 1 + + tests/certificates/Makefile.am | 1 + 1 file changed, 1 insertion(+) -commit 4ee680b59c810fdd237ec20c1e3e73606d71fcca -Author: Michael Catanzaro -Date: Wed Aug 16 22:07:45 2017 -0500 - - Remove some cruft from split empathy-chat - - src/Makefile.am | 17 ---------- - src/empathy-chat.c | 93 - ------------------------------------------------------ - 2 files changed, 110 deletions(-) - -commit 01a83d253e737c3677f7090a1aeb8d79e59bdc70 -Author: Michael Catanzaro -Date: Wed Aug 16 19:21:54 2017 -0500 - - Make it a bit less obvious that telepathy presence is broken - - Apparently this is *not* a regression from 3.12, but Empathy says you - are offline if you have no contacts (e.g. only IRC accounts, - which can't - have contacts). Make this less-obviously broken by hiding the relevant - widgets. - - src/empathy-roster-window.c | 23 ++++++++++++----------- - src/empathy-roster-window.ui | 4 ++-- - 2 files changed, 14 insertions(+), 13 deletions(-) - -commit 750add8e2a563b6ff1b5d87d10218670af311901 -Author: Michael Catanzaro -Date: Wed Aug 16 19:11:06 2017 -0500 - - Move info bars above everything else - - Info bars inside the roster window are a joke as they push the roster - window way too far into the chat window, taking up all the space - that's - really needed for the chat window. +commit 80192f7f9bd96b5f9950303544bb6dfb9652519e +Author: Debarshi Ray +Date: Mon Mar 20 19:51:42 2017 +0100 - src/empathy-roster-window.ui | 499 - ++++++++++++++++++++++--------------------- - 1 file changed, 256 insertions(+), 243 deletions(-) + tests: Retain the PEM formatted root certificate -commit cb01eb78e21911828e30a8f90ac36a4231b54046 -Author: Michael Catanzaro -Date: Wed Aug 16 19:10:41 2017 -0500 + In the subsequent commit, we will use GIO's GnuTLS backend to verify + the chain of TLS certificates instead of Gcr. This means that a + GckModule can no longer be used to feed our mock root certificates via + a PKCS#11 module. Instead we will have to create a mock GTlsDatabase, + and that needs the PEM formatted root certificate. - Improve default geometries + We will continue using the GckModule for pinned certificates. - This makes it look less bad. I think. + https://bugzilla.gnome.org/show_bug.cgi?id=780160 - data/org.gnome.Empathy.gschema.xml | 2 +- - src/empathy-roster-window.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + tests/certificates/Makefile.am | 3 +-- + tests/certificates/certificate-authority.cer | Bin 466 -> 466 bytes + tests/certificates/certificate-authority.pem | 12 ++++++++++++ + tests/certificates/server-cert.cer | Bin 448 -> 448 bytes + 4 files changed, 13 insertions(+), 2 deletions(-) -commit a6a0565bf6ce13e9386f3e486f2a45d262034749 +commit 0675aab11415799700033fe7fd0777f50dc9fe16 (origin/gnome-3-12) Author: Michael Catanzaro Date: Wed Aug 16 18:11:49 2017 -0500 @@ -113,25 +51,7 @@ data/themes/Makefile.am | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) -commit fd1c063ca4e414e067fa62f5aef1414c79a5da2e -Author: Michael Catanzaro -Date: Wed Aug 16 15:03:34 2017 -0500 - - tests: dist certificate-authority.pem - - tests/certificates/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -commit 4803ed7c10957dd5355ba33a9aada7171cb49961 -Author: Michael Catanzaro -Date: Wed Aug 16 14:57:55 2017 -0500 - - Update POTFILES.in - - po/POTFILES.in | 1 - - 1 file changed, 1 deletion(-) - -commit 3d251791576397af07a6563ecb1a56f127decd8c +commit 1040646704e72a5c2da994d9dbdf9d216146faac Author: Michael Catanzaro Date: Wed Aug 16 13:12:33 2017 -0500 @@ -143,129 +63,7 @@ configure.ac | 9 --------- 1 file changed, 9 deletions(-) -commit d68a76278f211933a5186c8604f94ad1a61be381 -Author: Мирослав Николић -Date: Wed Aug 16 17:57:54 2017 +0200 - - Updated Serbian translation - - po/sr.po | 257 - ++++++++++++++++++++------------------------------------- - po/sr@latin.po | 257 - ++++++++++++++++++++------------------------------------- - 2 files changed, 182 insertions(+), 332 deletions(-) - -commit 9f66218d6f3afb0c24ac1e2442987a0beba7fccd -Author: Fran Dieguez -Date: Sat Aug 12 14:36:54 2017 +0000 - - Update Galician translation - - po/gl.po | 129 - +++++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 72 insertions(+), 57 deletions(-) - -commit 2669efe6c932997d95f5b869f25b6b581192cf5c -Author: Piotr Drąg -Date: Wed Aug 9 23:06:19 2017 +0200 - - Update Polish translation - - po/pl.po | 42 +++++++++++++++++++++++------------------- - 1 file changed, 23 insertions(+), 19 deletions(-) - -commit 5d2eaa23068971ca979af9d388df32d6760b0d74 -Author: Kukuh Syafaat -Date: Tue Aug 8 23:50:42 2017 +0000 - - Update Indonesian translation - - po/id.po | 46 +++++++++++++++++++++++++--------------------- - 1 file changed, 25 insertions(+), 21 deletions(-) - -commit 33402f159f0f523c172f34bd0f13715f82a49021 -Author: Anish Sheela -Date: Tue Aug 8 07:03:54 2017 +0000 - - Update Malayalam translation - - po/ml.po | 3442 - ++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 1665 insertions(+), 1777 deletions(-) - -commit 0322782ccd235f4f67244846310f4de9df35887a -Author: Fabio Tomat -Date: Sun Aug 6 14:47:22 2017 +0000 - - Update Friulian translation - - po/fur.po | 40 ++++++++++++++++++++++------------------ - 1 file changed, 22 insertions(+), 18 deletions(-) - -commit 71b4943fd0ad9da35da55d33b5f1be23bacac9ea -Author: Anders Jonsson -Date: Sat Aug 5 00:27:42 2017 +0000 - - Update Swedish translation - - po/sv.po | 126 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 65 insertions(+), 61 deletions(-) - -commit 821389f4ffc8cd736b376ebff6647ec05324f6a5 -Author: Marek Cernocky -Date: Fri Aug 4 07:57:26 2017 +0200 - - Updated Czeach translation - - po/cs.po | 121 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 62 insertions(+), 59 deletions(-) - -commit cdf47c6f65bcb3f9602c889791babea2fe421c06 -Author: Matthias Klumpp -Date: Thu Aug 3 20:50:42 2017 -0400 - - trivial: Install metainfo file to the right directory - - data/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 486c663530311cb1bc56f7cc75eab1327d95f6bb -Author: Matthias Klumpp -Date: Thu Aug 3 20:43:05 2017 -0400 - - Modernize metainfo file - - data/empathy.appdata.xml.in | 34 ++++++++++++++++++++++++++-------- - 1 file changed, 26 insertions(+), 8 deletions(-) - -commit 5cd771a7a20fef217ad992f1c77b88ed005c553f -Author: Tomas Popela -Date: Wed Jul 26 16:05:38 2017 +0200 - - Contacts widget is cropped if resized to minimal size - - Don't put contacts inside the GtkRevealer as it is preventing - the label - that's inside it to be wrapped. I don't see a problem in removing the - GtkRevealer as the contacts widget can't be hidden. - - src/empathy-roster-window.ui | 474 - +++++++++++++++++++++---------------------- - 1 file changed, 230 insertions(+), 244 deletions(-) - -commit 4105988b65012c36668edab94a89ccf328555941 -Author: Pawan Chitrakar -Date: Thu Jul 27 12:51:57 2017 +0000 - - Update Nepali translation - - po/ne.po | 4696 - +++++++++++++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 3752 insertions(+), 944 deletions(-) - -commit 442b0cee0623e8e275e6da6724ccd191627d081e +commit 43685775f65415334f61f2a9800854d0cee42865 Author: Debarshi Ray Date: Wed Jul 26 15:26:32 2017 +0200 @@ -277,104 +75,89 @@ telepathy-account-widgets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 3fe046a60eb946cbf50fa1bb322ee6ec29b53e6e -Author: Tomas Popela -Date: Tue Jul 25 15:30:17 2017 +0200 - - Don't change GtkGrid's id to contain box if it's grid - - The name is not tight to the GtkBox that was touched in the previous - commit (as I mistakenly thought). - - src/empathy-roster-window.ui | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit e37549af8562e9d5c96cc1ee6a59535d7bc8cc61 -Author: Tomas Popela -Date: Tue Jul 25 15:07:01 2017 +0200 - - Warnings "GtkGrid does not have a child property called .." printed - during startup - - Based on the properties, change the object type from GtkGrid to - GtkBox. +commit 33bd6ee7a5be50bd042b74d37df6ab63f7c5af9d +Author: Fabrice Bellet +Date: Tue Dec 20 20:59:58 2016 +0100 - src/empathy-roster-window.ui | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + rounded-effect: make the rounded rectangle coarser -commit 394daa33c6ac23750ed08b0765d5e7f01f35a651 -Author: Tomas Popela -Date: Tue Jul 25 15:03:39 2017 +0200 + The effective size of the preview window allows to significantly + increase the angle step used to compute the rounded rectangle cogl + shape, without visual impact. This also gives up a nice speed + improvement, as internal cogl-path functions are rather expensive + with a fine grained angle step (parameter unit is degrees). - Use dash instead of underscore in some of the action names + https://bugzilla.gnome.org/show_bug.cgi?id=751185 - Underscore is not a valid character for action name. Fixes critical - warning during startup. + src/empathy-rounded-texture.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) - src/empathy-roster-window.c | 4 ++-- - src/empathy.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) +commit a5cd3088c9548839ca58dd628e470a319547e05a +Author: Michael Catanzaro +Date: Tue Aug 30 12:26:18 2016 -0500 -commit d433f3c20d2ca198a97f21596d8cc212bff8426c -Author: Fabio Tomat -Date: Fri May 5 15:59:16 2017 +0000 + Replace crap desktop notifications with crap GTK+ dialogs - Update Friulian translation + mcatanzaro: I am going to remove the "display events in notification + area" crap + mcatanzaro: Because the notification goes away and then you can never + see it again or join the room + mcatanzaro: It's BS + mcatanzaro: If you toggle it off, you get a GtkDialog from nowhere + instead, which is also crap but better! - po/fur.po | 88 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 44 insertions(+), 44 deletions(-) + To be clear: it's totally unacceptable to display GtkDialogs without a + parent window, and this patch makes us do that by default. But I don't + plan to spend more effort on this myself, and it's a lot better than + giving users a two second window to rush to click the buttons in the + notification before it disappears. Better hope no other notification + gets sent during that time, and you have fast reflexes, else + you're not + gonna be able to join the chat you're invited to.... -commit bce269dbed8a6d13b6505b858ab358389fa32a8c -Author: Andika Triwidada -Date: Fri May 5 13:04:18 2017 +0000 + data/org.gnome.Empathy.gschema.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) - Update Indonesian translation +commit 60e6466726841ce94f9eabb07b93c441cbf3d764 +Author: Lionel Landwerlin +Date: Mon Nov 30 15:19:39 2015 +0000 - help/id/id.po | 472 - +++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 266 insertions(+), 206 deletions(-) + call: port to clutter-gst 3.0 -commit ded4df9aa18361c2eadb131175a90afab042a434 -Author: Kukuh Syafaat -Date: Tue May 2 09:47:03 2017 +0000 + https://bugzilla.gnome.org/show_bug.cgi?id=751185 - Update Indonesian translation + configure.ac | 2 +- + src/empathy-call-window.c | 28 ++++++++++++++-------------- + 2 files changed, 15 insertions(+), 15 deletions(-) - po/id.po | 691 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 353 insertions(+), 338 deletions(-) +commit 581be902720691c4b134526afdb32c4b8a61090a +Author: Michael Catanzaro +Date: Thu Jul 21 20:28:51 2016 -0500 -commit e5e4a7008de4e6e496e6789fa455e2f0e57bddc3 -Author: Efstathios Iosifidis -Date: Wed Apr 26 14:33:40 2017 +0000 + Honor autoaway setting even in GNOME Shell - Update Greek translation + GNOME stopped handling presence ages ago... I think it was GNOME 3.8. - po/el.po | 601 - ++++++++++++++++++++++++++++----------------------------------- - 1 file changed, 265 insertions(+), 336 deletions(-) + Based on work by Christoph Lenggenhager. -commit 4a4b45b94861688a79bab5ec699f075a86977ffe -Author: Fabio Tomat -Date: Sun Apr 23 15:28:00 2017 +0000 + https://bugzilla.gnome.org/show_bug.cgi?id=742720 - Update Friulian translation + src/empathy.c | 28 ++++++++++++---------------- + 1 file changed, 12 insertions(+), 16 deletions(-) - po/fur.po | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) +commit decddabbfd758a83e454e2e038ba287714cdb970 +Author: Michael Catanzaro +Date: Thu Jul 21 20:13:45 2016 -0500 -commit 1b56ce4f2eeff0be5c59bd9904ab7de82d9a310b -Author: Piotr Drąg -Date: Mon Mar 27 21:02:14 2017 +0200 + Always notify presence manager on exit - Update Polish translation + Even when running in GNOME Shell. It's been years since this made + sense. - po/pl.po | 106 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 53 insertions(+), 53 deletions(-) + src/empathy.c | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) -commit e6e0590ec6f966f0bdac8f211817e69345fb7ca6 +commit 1e232c9a7330e5d048b89619deffa78b5db87fae Author: Debarshi Ray Date: Thu Mar 16 19:50:40 2017 +0100 @@ -391,7 +174,7 @@ tests/empathy-tls-test.c | 2 -- 5 files changed, 44 deletions(-) -commit d5b17f728038c7f474c949cbc9e9e7f6d8835253 +commit d4d8e7e854eecc6aae121fe497f131207c29c672 Author: Debarshi Ray Date: Wed Mar 15 20:24:08 2017 +0100 @@ -438,29 +221,61 @@ tests/empathy-tls-test.c | 35 +++- 4 files changed, 232 insertions(+), 231 deletions(-) -commit 526867ccf70de0d467d0a6f50d6d7e6499b860ed -Author: Debarshi Ray -Date: Mon Mar 20 19:51:42 2017 +0100 +commit d3a04cdccc750b4af180fab5be2ec0ffb251c18d +Author: Michael Catanzaro +Date: Fri Jan 27 13:12:05 2017 -0600 - tests: Retain the PEM formatted root certificate + Fix default encoding property - In the subsequent commit, we will use GIO's GnuTLS backend to verify - the chain of TLS certificates instead of Gcr. This means that a - GckModule can no longer be used to feed our mock root certificates via - a PKCS#11 module. Instead we will have to create a mock GTlsDatabase, - and that needs the PEM formatted root certificate. + libempathy-gtk/empathy-log-window.c | 4 ++-- + libempathy-gtk/empathy-theme-adium.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) - We will continue using the GckModule for pinned certificates. +commit 01f753fa5768f854695f57e1e920fe2d342c21e0 +Author: György Balló +Date: Wed Jan 25 19:56:00 2017 -0600 - https://bugzilla.gnome.org/show_bug.cgi?id=780160 + Incomplete port to WebKit2 - tests/certificates/Makefile.am | 3 +-- - tests/certificates/certificate-authority.cer | Bin 466 -> 466 bytes - tests/certificates/certificate-authority.pem | 12 ++++++++++++ - tests/certificates/server-cert.cer | Bin 448 -> 448 bytes - 4 files changed, 13 insertions(+), 2 deletions(-) + The work is mostly done by Carlos Garcia, rebase by György. It's got + FIXMEs and serious bugs, but it's better than no Empathy at all once + WebKit1 is removed from Fedora in two short months. + + https://bugzilla.gnome.org/show_bug.cgi?id=749001 + + configure.ac | 4 +- + libempathy-gtk/empathy-chat.c | 61 ++++++--- + libempathy-gtk/empathy-log-window.c | 180 +++++++++++++++---------- + libempathy-gtk/empathy-search-bar.c | 73 ++++------ + libempathy-gtk/empathy-theme-adium.c | 246 + ++++++++++++++-------------------- + libempathy-gtk/empathy-theme-adium.h | 23 ++-- + libempathy-gtk/empathy-webkit-utils.c | 227 + ++++++++++++------------------- + libempathy-gtk/empathy-webkit-utils.h | 17 ++- + src/empathy-chat-window.c | 17 ++- + src/empathy-preferences.c | 14 +- + 10 files changed, 407 insertions(+), 455 deletions(-) + +commit ee743e56e09a2af03b5644f8aa4690a8e5b16b94 +Author: Fabio Tomat +Date: Sun Apr 23 14:29:09 2017 +0000 -commit 61deb1e7d915783c939233169d8fe65360e23984 + Update Friulian translation + + po/fur.po | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 4bba6354fb20ef5f7ff4728fe526ebc30039ed92 +Author: Piotr Drąg +Date: Mon Mar 27 21:05:18 2017 +0200 + + Update Polish translation + + po/pl.po | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit 05d86a3f6e599207918a8d5b871bc3a89660dbab Author: Debarshi Ray Date: Mon Mar 20 19:31:39 2017 +0100 @@ -482,7 +297,7 @@ tests/empathy-tls-test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -commit 29cee6ff6d7dba8a39adce03b16d6798fe8e863e +commit 5cdb6ee13b5c82283c93477af29eca2dd2ee28eb Author: Debarshi Ray Date: Mon Mar 20 19:20:11 2017 +0100 @@ -500,7 +315,7 @@ tests/empathy-tls-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -commit 5c74cc1525cc2ff92239f8bc81dff45ce561cb55 +commit adf7b886fae28a604a59c1032dc5bae2881ce477 Author: Debarshi Ray Date: Wed Mar 15 20:23:43 2017 +0100 @@ -513,1127 +328,105 @@ libempathy/empathy-tls-verifier.c | 2 ++ 1 file changed, 2 insertions(+) -commit 9f6ce6194ae2b045627e2b1fe32b81254b091be1 -Author: Rūdolfs Mazurs -Date: Sat Mar 18 09:22:22 2017 +0200 - - Update Latvian translation +commit ee8023763edb37e8d694121a1ee61a9476b3229b +Author: Fabio Tomat +Date: Sun Mar 19 21:39:03 2017 +0000 - po/lv.po | 680 - ++++++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 391 insertions(+), 289 deletions(-) + Update Friulian translation -commit 3300c6deb7be1209ca38657c03e15ea729df2ae9 -Author: Yuri Myasoedov -Date: Sun Mar 12 19:09:18 2017 +0400 + po/fur.po | 82 + +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 40 insertions(+), 42 deletions(-) - Updated Russian translation +commit 0416c6c049085160424e966e9d76693aa78f0888 +Author: Debarshi Ray +Date: Mon Mar 13 18:52:58 2017 +0100 - po/ru.po | 593 - ++++++++++++++++++++++++++++++--------------------------------- - 1 file changed, 279 insertions(+), 314 deletions(-) + remove released flag -commit 392442de04519f1f46b35dca625a1fcf30f782d6 -Author: Changwoo Ryu -Date: Sat Mar 11 13:35:22 2017 +0000 + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) - Update Korean translation +commit 90ce49a9c37d01d9861476cc9c5b03e9287d0760 (tag: EMPATHY_3_12_13) +Author: Debarshi Ray +Date: Mon Mar 13 17:52:28 2017 +0100 - po/ko.po | 626 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 319 insertions(+), 307 deletions(-) + 3.12.13 -commit b890dc4d9e1250bf0207e621dd381474fabfae09 -Author: Fran Dieguez -Date: Sat Mar 11 00:34:36 2017 +0000 + NEWS | 27 +++++++++++++++++++++++---- + configure.ac | 4 ++-- + 2 files changed, 25 insertions(+), 6 deletions(-) - Update Galician translation +commit 32b085f285b3d4e03a07b79331e7ab021182c908 +Author: Anders Jonsson +Date: Wed Feb 1 21:02:08 2017 +0000 - po/gl.po | 125 - +++++++++++++++++++++++---------------------------------------- - 1 file changed, 45 insertions(+), 80 deletions(-) + Update Swedish translation -commit 2717a0cc1ad2c1b3a0657e18800d023f811de1f3 -Author: Alan Mortensen -Date: Mon Mar 6 12:45:45 2017 +0100 + help/sv/sv.po | 2066 + ++++++++++++++++++++++++--------------------------------- + 1 file changed, 872 insertions(+), 1194 deletions(-) - Updated Danish translation +commit 27de2c6f036b1e2f1d8882ca249755bf33ac1e2f +Author: Daniel Boles +Date: Thu Dec 1 04:10:54 2016 +0000 - po/da.po | 396 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 192 insertions(+), 204 deletions(-) + roster-window: Fix the GActions not working -commit dcf23be28e71355ff4857a003eaf4f33ce115f1d -Author: Yuras Shumovich -Date: Fri Mar 3 17:58:34 2017 +0000 + Underscores are not allowed in GAction names. This led to a pile of + warnings during startup and ultimately none of these actions working. + Fix by substituting the underscores with hyphens, an allowed + character. - Update Belarusian translation + We can also omit the NULLs in the GActionEntries, as they are implied: + struct fields not explicitly initialised are zero-initialised anyway. - po/be.po | 680 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 348 insertions(+), 332 deletions(-) + src/empathy-roster-window-menubar.ui | 30 +++++++++---------- + src/empathy-roster-window.c | 56 + ++++++++++++++++++------------------ + 2 files changed, 43 insertions(+), 43 deletions(-) -commit 5a8a7021c5b8c13ede1d0fbfdaf95f9f1d9b82d5 -Author: Milo Casagrande -Date: Thu Mar 2 08:29:28 2017 +0000 +commit 3f8b1552fbb88139c948fc536171c8ba77befedb +Author: Daniel Boles +Date: Wed Nov 30 23:47:23 2016 +0000 - Update Italian translation + Update telepathy-account-widgets to fix IRC button - po/it.po | 909 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 461 insertions(+), 448 deletions(-) + https://bugzilla.gnome.org/show_bug.cgi?id=738315 -commit f4095ce380f3cf8b857cefb64c710ffc0dbb7449 -Author: Fran Dieguez -Date: Sun Feb 26 23:30:28 2017 +0100 + telepathy-account-widgets | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) - Updated Galician translations +commit ce75b8661996adfe42730f852745d771c90a8b63 +Author: Piotr Drąg +Date: Wed Jan 25 21:55:49 2017 +0100 - po/gl.po | 646 - ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 348 insertions(+), 298 deletions(-) + Update Polish translation -commit fe9ff1d11755561319b2e3627fe47e15d6cde9f1 -Author: Balázs Úr -Date: Sun Feb 26 11:31:44 2017 +0000 + help/pl/pl.po | 5409 + ++++++++++++++++++++++++++++++--------------------------- + po/pl.po | 310 ++-- + 2 files changed, 3002 insertions(+), 2717 deletions(-) - Update Hungarian translation +commit 8d710ed06f3cee2ac5406855c5e11be1b8b17a32 +Author: Charles Monzat +Date: Fri Nov 18 10:05:51 2016 +0000 - po/hu.po | 1085 - +++++++++++++------------------------------------------------- - 1 file changed, 217 insertions(+), 868 deletions(-) + Update French translation -commit 9fcd2f6080849d7b80f057432b248f717a5ea00a -Author: Мирослав Николић -Date: Sun Feb 26 07:38:58 2017 +0100 + help/fr/fr.po | 27 +++++++++++++++++++-------- + 1 file changed, 19 insertions(+), 8 deletions(-) - Updated Serbian translation +commit b386b32ff3562932d36697f8ae27d7b7cb3baecf +Author: Michael Catanzaro +Date: Sun Aug 7 12:30:52 2016 -0500 - po/sr.po | 697 - ++++++++++++++++++++++++++++++++------------------------ - po/sr@latin.po | 699 - +++++++++++++++++++++++++++++++++------------------------ - 2 files changed, 801 insertions(+), 595 deletions(-) - -commit a3b4fb58a23d6d93092410a3b8aa4d5b40b83932 -Author: Aurimas Černius -Date: Sat Feb 25 18:35:25 2017 +0200 - - Updated Lithuanian translation - - po/lt.po | 667 - +++++++++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 388 insertions(+), 279 deletions(-) - -commit 1e164f362b1e7386012a5ba26ee3c9f528509c0b -Author: Chao-Hsiung Liao -Date: Thu Feb 23 11:00:04 2017 +0000 - - Update Chinese (Taiwan) translation - - po/zh_TW.po | 211 - +++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 115 insertions(+), 96 deletions(-) - -commit b17da756dc9581544fd7ee4a134bd83440427a93 -Author: Rafael Fontenelle -Date: Tue Feb 21 11:07:18 2017 +0000 - - Update Brazilian Portuguese translation - - po/pt_BR.po | 529 - ++++++++++++++++++++++++++---------------------------------- - 1 file changed, 229 insertions(+), 300 deletions(-) - -commit e666b4c514d08de2b8c50cb8c38fff72cef75537 -Author: Guillaume Desmottes -Date: Mon Feb 20 09:45:47 2017 +0100 - - update doap file - - - remove myself as maintainer - - add description (to make GNOME's pre-push hook happy) - - empathy.doap | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -commit 758ae52ffbadffd5b9b2350808ef29085388d82a -Author: Claude Paroz -Date: Sat Feb 18 14:37:51 2017 +0100 - - Updated French translation - - po/fr.po | 1328 - ++++++++++++++------------------------------------------------ - 1 file changed, 293 insertions(+), 1035 deletions(-) - -commit 6aa3ce28123553453cd46bef01a2e465212a060d -Author: Anders Jonsson -Date: Sat Feb 18 11:33:11 2017 +0000 - - Update Swedish translation - - po/sv.po | 1275 - +++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 679 insertions(+), 596 deletions(-) - -commit 931b08596baac1648b3668bf38bd0b56666b17c1 -Author: Chao-Hsiung Liao -Date: Sat Feb 18 07:01:26 2017 +0000 - - Update Chinese (Taiwan) translation - - po/zh_TW.po | 528 - ++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 260 insertions(+), 268 deletions(-) - -commit cabd2cdc5b7416785795512e73ae9a1ff3d47620 -Author: Baurzhan Muftakhidinov -Date: Fri Feb 17 08:17:07 2017 +0000 - - Update Kazakh translation - - po/kk.po | 457 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 233 insertions(+), 224 deletions(-) - -commit e1ea60143f1ec11f54fce502126d9bd70c4ba882 -Author: Ask Hjorth Larsen -Date: Thu Feb 16 13:42:58 2017 +0100 - - Updated Danish translation - - po/da.po | 1022 - ++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 523 insertions(+), 499 deletions(-) - -commit 0090058161c0998c8cb747a6317902a238115fbb -Author: Daniel Mustieles -Date: Tue Feb 14 20:28:20 2017 +0100 - - Updated Spanish translation - - po/es.po | 527 - +++++++++++++++++++++++++++------------------------------------ - 1 file changed, 228 insertions(+), 299 deletions(-) - -commit 1eabf36302473fb22de75f754568a77e24fc6562 -Author: Alberts Muktupāvels -Date: Mon Jul 25 15:13:27 2016 +0300 - - empathy: don't detect GNOME Flashback as GNOME Shell - - https://bugzilla.gnome.org/show_bug.cgi?id=754956 - - configure.ac | 4 ++-- - src/empathy.c | 11 ++++------- - 2 files changed, 6 insertions(+), 9 deletions(-) - -commit 5e33509ab17c36ea7f93869c862ae5eae73fbb92 -Author: Kjartan Maraas -Date: Sun Feb 12 12:03:39 2017 +0100 - - Updated Norwegian bokmål translation. - - po/nb.po | 441 - +++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 228 insertions(+), 213 deletions(-) - -commit 6bd9dc7653c437c2664150945568fe95e639520f -Author: Marek Černocký -Date: Sat Feb 11 15:28:28 2017 +0100 - - Updated Czech translation - - po/cs.po | 425 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 216 insertions(+), 209 deletions(-) - -commit 0ae95bcff6c05ce27d7212673e433b5f8a2fa6e7 -Author: Inaki Larranaga Murgoitio -Date: Sun Feb 5 17:22:02 2017 +0100 - - Update Basque language - - po/eu.po | 613 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 312 insertions(+), 301 deletions(-) - -commit 2db93c20b8127380f1143704c3ca362a3f3c0407 -Author: Mario Blättermann -Date: Sat Feb 4 19:52:05 2017 +0000 - - Update German translation - - po/de.po | 434 - +++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 225 insertions(+), 209 deletions(-) - -commit 46bf9f5560a3686afb86f9ae6fd8dfb1c5c887c9 -Author: Jiri Grönroos -Date: Sat Feb 4 17:12:18 2017 +0000 - - Update Finnish translation - - po/fi.po | 517 - ++++++++++++++++++++++++++++----------------------------------- - 1 file changed, 229 insertions(+), 288 deletions(-) - -commit 686f4d8b9a39fc9202118ea3c725819e17b77258 -Author: Anders Jonsson -Date: Wed Feb 1 22:46:38 2017 +0100 - - Update Swedish help images - - help/sv/figures/empathy-main-window.png | Bin 8084 -> 16180 bytes - help/sv/figures/empathy-new-account.png | Bin 16448 -> 0 bytes - 2 files changed, 0 insertions(+), 0 deletions(-) - -commit a088d46563da8a929f15ac4abf95607eeef1db3c -Author: Erik Sköldås -Date: Wed Feb 1 20:53:50 2017 +0000 - - Update Swedish translation - - help/sv/sv.po | 2066 - ++++++++++++++++++++++++--------------------------------- - 1 file changed, 870 insertions(+), 1196 deletions(-) - -commit 9e07e1182b114c15a373b07ca2deb1bbab38f3aa -Author: Jordi Mas -Date: Mon Jan 30 21:55:38 2017 +0100 - - Update Catalan translation - - help/ca/ca.po | 6 +- - po/ca.po | 583 - ++++++++++++++++++++++++++++++---------------------------- - 2 files changed, 301 insertions(+), 288 deletions(-) - -commit a7b8ebb7b35c614e3e26b201dc0a1b18ac30c9f7 -Author: Piotr Drąg -Date: Mon Jan 30 02:51:12 2017 +0100 - - Update Polish translation - - po/pl.po | 441 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 224 insertions(+), 217 deletions(-) - -commit 1ec0a34f08ce8dce95953381a49203fbe6413783 -Author: Dušan Kazik -Date: Sun Jan 29 08:21:05 2017 +0000 - - Update Slovak translation - - po/sk.po | 435 - +++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 227 insertions(+), 208 deletions(-) - -commit d0637ab6dd377225fb1d61a42d786b1ee6551ccd -Author: Fabio Tomat -Date: Sat Jan 28 09:15:58 2017 +0000 - - Update Friulian translation - - po/fur.po | 434 - ++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 225 insertions(+), 209 deletions(-) - -commit 115e65f7bb930a27920140d3f68a3669f86f669c -Author: Piotr Drąg -Date: Fri Jan 27 22:41:58 2017 +0100 - - Update POTFILES.in - - po/POTFILES.in | 1 + - 1 file changed, 1 insertion(+) - -commit fc58c06ba639c5d8c2295c41cb40a4264dbeb796 (origin/wip/ui-refresh, -wip/ui-refresh) -Author: Michael Catanzaro -Date: Fri Jan 27 13:09:03 2017 -0600 - - Disable broken CSS - - data/empathy.css | 4 ++++ - 1 file changed, 4 insertions(+) - -commit 57b57dedac871558e71bb1c8a80cbacb02e076d4 -Author: Michael Catanzaro -Date: Fri Jan 27 13:08:49 2017 -0600 - - Fix rebase mistake in roster-window.ui - - src/empathy-roster-window.ui | 1 - - 1 file changed, 1 deletion(-) - -commit 4f5a61fab2b3982be2ba87ca2e7db00c5eda4746 -Author: Michael Catanzaro -Date: Fri Jan 27 12:58:19 2017 -0600 - - Reindent -roster-window.ui - - src/empathy-roster-window.ui | 460 - +++++++++++++++++++++---------------------- - 1 file changed, 227 insertions(+), 233 deletions(-) - -commit 259380b71c76e8e3c6801ab0ad1b74a489d88e6a -Author: Frédéric Péters -Date: Sun May 3 14:35:29 2015 +0200 - - view: sort contacts by most recent event - - libempathy-gtk/empathy-roster-contact.c | 121 - ++++++++++++++++++++++++++++++++ - libempathy-gtk/empathy-roster-contact.h | 5 ++ - libempathy-gtk/empathy-roster-view.c | 22 +++++- - src/empathy-roster-window.c | 42 ++++------- - 4 files changed, 161 insertions(+), 29 deletions(-) - -commit 4ce63fa3bf4ef505f84c2ebc1e216fb35f526a28 -Author: Frédéric Péters -Date: Fri May 1 16:32:27 2015 +0200 - - window: display all contacts in a flat list - - src/empathy-roster-window.c | 14 +++++--------- - 1 file changed, 5 insertions(+), 9 deletions(-) - -commit cb3852df479c2edefedbc6d8e3ef9862e1aa4f12 -Author: Frédéric Péters -Date: Sun Apr 19 16:10:02 2015 +0200 - - chat: use a single window, with tabs - - src/Makefile.am | 5 +- - src/empathy-chat-window.c | 91 +++++++++++++----- - src/empathy-chat-window.h | 9 +- - src/empathy-chat-window.ui | 25 +++-- - src/empathy-chat.c | 2 + - src/empathy-roster-window.c | 52 ++++++++++- - src/empathy-roster-window.ui | 160 ++++++++++++++++++++++++++------ - src/empathy.c | 6 +- - src/polari-fixed-size-frame.c | 209 - ++++++++++++++++++++++++++++++++++++++++++ - src/polari-fixed-size-frame.h | 51 +++++++++++ - 10 files changed, 537 insertions(+), 73 deletions(-) - -commit d117678350f7eadb8ee8a7d008544448bdab9d22 -Author: Frédéric Péters -Date: Sun Apr 19 15:31:03 2015 +0200 - - window: add a header bar to the main window - - src/empathy-roster-window.c | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -commit 5ea45e54a743c69f865d7d6e15beeb9daed34c72 -Author: Frédéric Péters -Date: Sun Apr 19 14:40:05 2015 +0200 - - new-message-dialog: switch to use an header bar - - libempathy-gtk/empathy-contact-chooser.c | 10 +++++++--- - libempathy-gtk/empathy-new-message-dialog.c | 25 - +++++++++++++++---------- - 2 files changed, 22 insertions(+), 13 deletions(-) - -commit 25cdb529503e9e32b71ea08ff4d460f325d7b57d -Author: Frédéric Péters -Date: Fri May 1 16:08:37 2015 +0200 - - Adium theme: add timestamp to classic style - - .../Contents/Resources/Content.html | 1 + - .../Contents/Resources/main.css | 17 - +++++++++++++++++ - 2 files changed, 18 insertions(+) - -commit f1a3ac9a0e9df3c167bbd61a5d6b4c91e640d747 -Author: Michael Catanzaro -Date: Fri Jan 27 13:12:05 2017 -0600 - - Fix default encoding property - - libempathy-gtk/empathy-log-window.c | 2 +- - libempathy-gtk/empathy-theme-adium.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 841af5f329c37fd36fa4104c8a430e4ec03f1448 -Author: Piotr Drąg -Date: Thu Jan 26 04:10:42 2017 +0100 - - Fix translator comments - - They need to be exactly one line above a string to show up in - .po files. - - libempathy-gtk/empathy-individual-widget.c | 4 ++-- - src/empathy-chat-window.c | 6 +++--- - src/empathy-ft-manager.c | 8 ++++---- - src/empathy-new-chatroom-dialog.c | 4 ++-- - 4 files changed, 11 insertions(+), 11 deletions(-) - -commit ce10e4ed0f0677419167db1bc81f0b291644ce73 -Author: György Balló -Date: Wed Jan 25 19:56:00 2017 -0600 - - Incomplete port to WebKit2 - - The work is mostly done by Carlos Garcia, rebase by György. It's got - FIXMEs and serious bugs, but it's better than no Empathy at all once - WebKit1 is removed from Fedora in two short months. - - https://bugzilla.gnome.org/show_bug.cgi?id=749001 - - configure.ac | 4 +- - libempathy-gtk/empathy-chat.c | 61 ++++++--- - libempathy-gtk/empathy-log-window.c | 176 ++++++++++++++---------- - libempathy-gtk/empathy-search-bar.c | 73 ++++------ - libempathy-gtk/empathy-theme-adium.c | 243 - +++++++++++++--------------------- - libempathy-gtk/empathy-theme-adium.h | 23 ++-- - libempathy-gtk/empathy-webkit-utils.c | 227 - ++++++++++++------------------- - libempathy-gtk/empathy-webkit-utils.h | 17 ++- - src/empathy-chat-window.c | 17 ++- - src/empathy-preferences.c | 14 +- - 10 files changed, 399 insertions(+), 456 deletions(-) - -commit f527694630a64b2310b40ea1b70b092c1eb8a4f7 -Author: Efstathios Iosifidis -Date: Wed Jan 25 22:17:38 2017 +0000 - - Update Greek translation - - po/el.po | 437 - ++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 263 insertions(+), 174 deletions(-) - -commit 6eca83a56cd9fa0af5f5b2d946828a8b9fa27e1f -Author: Piotr Drąg -Date: Wed Jan 25 21:42:01 2017 +0100 - - Update Polish help translation - - Fixes https://bugzilla.gnome.org/show_bug.cgi?id=777764 - - help/pl/pl.po | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -commit eb6e3334030e79eba5e09a503926124834b79530 -Author: Alexandre Franke -Date: Wed Jan 25 11:19:44 2017 +0000 - - Update French translation - - help/fr/fr.po | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 8b5c733a654517a7a44c49a21a60afec35d28c62 -Author: Dušan Kazik -Date: Sun Jan 22 14:53:21 2017 +0000 - - Update Slovak translation - - po/sk.po | 273 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 136 insertions(+), 137 deletions(-) - -commit 6bd44fb4c94c0d741cdd474ca64222ad6494e6b1 -Author: Rafael Fontenelle -Date: Wed Jan 4 02:51:32 2017 +0000 - - Update Brazilian Portuguese translation - - po/pt_BR.po | 850 - +++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 468 insertions(+), 382 deletions(-) - -commit f89883c57e57942553ea35a7f18a33b7e7679fd5 -Author: Jiri Grönroos -Date: Sun Dec 25 16:05:23 2016 +0000 - - Update Finnish translation - - po/fi.po | 408 - ++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 249 insertions(+), 159 deletions(-) - -commit ca4942c2ce0e20d9e930d40f03335ab060645ee1 -Author: Fabrice Bellet -Date: Tue Dec 20 20:59:58 2016 +0100 - - rounded-effect: make the rounded rectangle coarser - - The effective size of the preview window allows to significantly - increase the angle step used to compute the rounded rectangle cogl - shape, without visual impact. This also gives up a nice speed - improvement, as internal cogl-path functions are rather expensive - with a fine grained angle step (parameter unit is degrees). - - https://bugzilla.gnome.org/show_bug.cgi?id=751185 - - src/empathy-rounded-effect.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -commit fddeee2d8257a72a701e766dc221afb55c09c2a6 -Author: Baurzhan Muftakhidinov -Date: Wed Dec 14 10:54:50 2016 +0000 - - Update Kazakh translation - - po/kk.po | 363 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 181 insertions(+), 182 deletions(-) - -commit 6879d7a6aa0c64a3dde72ca41321178de93035e7 -Author: Daniel Boles -Date: Thu Dec 1 05:05:53 2016 +0000 - - Revert "roster-window: Fix enabling add-contact action" - - This reverts commit 8abd8c8c9a9eaaf446f46800c0775b3140af5070. - - Ah, oops. I hadn't noticed that chat-add-contact is an element in - priv->actions_connected. That means my change potentially breaks the - sense of whatever this cryptic machinery is doing. So, never mind. - - src/empathy-roster-window.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -commit 8abd8c8c9a9eaaf446f46800c0775b3140af5070 -Author: Daniel Boles -Date: Thu Dec 1 04:25:13 2016 +0000 - - roster-window: Fix enabling add-contact action - - This was commented "update widget sensibilities [action - sensitivities]', - yet it could only ever disable the action. Not sure where/if this - action - gets enabled, but either way, let's make the code do the sensible - thing. - - src/empathy-roster-window.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -commit ee5517b3a1efebb2fe5fef0d8eb1a29d33d88397 -Author: Daniel Boles -Date: Thu Dec 1 04:10:54 2016 +0000 - - roster-window: Fix the GActions not working - - Underscores are not allowed in GAction names. This led to a pile of - warnings during startup and ultimately none of these actions working. - Fix by substituting the underscores with hyphens, an allowed - character. - - We can also omit the NULLs in the GActionEntries, as they are implied: - struct fields not explicitly initialised are zero-initialised anyway. - - src/empathy-roster-window-menubar.ui | 30 +++++++++---------- - src/empathy-roster-window.c | 56 - ++++++++++++++++++------------------ - 2 files changed, 43 insertions(+), 43 deletions(-) - -commit 8784881f26c51eec659cae32f44a08927979d5cd -Author: Daniel Boles -Date: Thu Dec 1 03:44:44 2016 +0000 - - roster-window: improve spacing of list and spinner - - src/empathy-roster-window.ui | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -commit d439f6812b1bcd6375ddd25dafddf7a2e1d70ae7 -Author: Daniel Boles -Date: Thu Dec 1 03:25:30 2016 +0000 - - Trivial cleanups to recent commits - - * roster-window.ui: Fix indentation of the added line - * accounts-dialog: Move border-width from .c to .ui, since when we - have a .ui file, it seems better to keep the declarative stuff - there. - - src/empathy-accounts-dialog.c | 1 - - src/empathy-accounts-dialog.ui | 1 + - src/empathy-roster-window.ui | 2 +- - 3 files changed, 2 insertions(+), 2 deletions(-) - -commit 34598006776416771e651c2058ae7998f843a420 -Author: Daniel Boles -Date: Thu Dec 1 00:46:19 2016 +0000 - - Give "Go Online" button the suggested-action class - - Thus highlighting it nicely. This seems like a perfect suggested - action, - as without going online, an IM client isn't a tremendous amount - of use! - - src/empathy-roster-window.ui | 3 +++ - 1 file changed, 3 insertions(+) - -commit 5ad66def030024d3bb826916fa9a1a3d10fb02dc -Author: Daniel Boles -Date: Thu Dec 1 00:47:15 2016 +0000 - - accounts-dialog: Add various missing UI spacing - - * 12 px border around content stops action area's buttons hitting - frame - * 12 px border around details does the same for the Edit button there - * 18 px margin for better separation between details and action area - * Remove a no-op VBox - - My guess is the whole thing needs a redesign, but for now, this is a - freebie that I think makes it look considerably less clumsy than - before. - - src/empathy-accounts-dialog.c | 4 ++-- - src/empathy-accounts-dialog.ui | 50 - ++++++++++++++++-------------------------- - 2 files changed, 21 insertions(+), 33 deletions(-) - -commit c633f5013bfa15c18ae77f8971e64a586dbc8dba -Author: Daniel Boles -Date: Thu Dec 1 00:45:33 2016 +0000 - - roster-window: Add missing border around content - - This stops child widgets, especially the big "Go online to..." label, - from running right into the edge of the window, which looks pretty - bad. - - src/empathy-roster-window.ui | 1 + - 1 file changed, 1 insertion(+) - -commit 38d8eb60f302febe9c76843bc4a8e2c418e533e6 -Author: Daniel Boles -Date: Wed Nov 30 23:47:23 2016 +0000 - - Update telepathy-account-widgets to fix IRC button - - https://bugzilla.gnome.org/show_bug.cgi?id=738315 - - telepathy-account-widgets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 83141ce2791e5e6aac589c337532f537f5cd1fd3 -Author: Daniel Boles -Date: Wed Nov 30 23:18:22 2016 +0000 - - empathy-log-window: add missing cast to fix build - - This arose in commit d28a6772cfdaf1539b09b8744791c2d448737f8a. - - libempathy-gtk/empathy-log-window.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 66eed876fef198fc588ef3fc1e1d09c1fb037cb1 -Author: Balázs Meskó -Date: Wed Nov 23 12:29:28 2016 +0000 - - Update Hungarian translation - - po/hu.po | 454 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 226 insertions(+), 228 deletions(-) - -commit 9cbcf1de02b6dab83d24f68f9881faf7c5d64eae -Author: Fabrice Bellet -Date: Fri Nov 18 14:57:29 2016 +0100 - - call: fix the video preview - - The port to clutter-gst 3.0 broke the video preview window. - The rounded texture effect is now provided by a ClutterEffect - sub-class, and the horizontal flip of the preview is done - directly with a cogl transformation. This last modification - using cogl_push_matrix()/cogl_pop_matrix(), the deprecation - warning of cogl has been lowered from 1.14 to 1.8. - - https://bugzilla.gnome.org/show_bug.cgi?id=751185 - - configure.ac | 4 +- - src/Makefile.am | 4 +- - src/empathy-call-window.c | 17 +++--- - ...-rounded-texture.c => empathy-rounded-effect.c} | 44 ++++++++------- - src/empathy-rounded-effect.h | 62 - ++++++++++++++++++++++ - src/empathy-rounded-texture.h | 62 - ---------------------- - 6 files changed, 102 insertions(+), 91 deletions(-) - -commit de65bd1a511fedc05367ef7c36570d46c8a3b973 -Author: Sjoerd Simons -Date: Mon Nov 21 00:33:00 2016 +0100 - - Expand the mission-control acronym - - README | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -commit c47c69441bbd20d49d4e3afbbdc9e54d6ecf4235 -Author: Kjartan Maraas -Date: Sun Nov 20 17:24:00 2016 +0100 - - Updated Norwegian bokmål translation. - - po/nb.po | 528 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 264 insertions(+), 264 deletions(-) - -commit 272b00334127c866e7b24dc75abe229b61511e9d -Author: Daniel Mustieles -Date: Thu Nov 17 14:19:35 2016 +0000 - - Update Spanish translation - - po/es.po | 232 - ++++++++++++++++++++++++++++++++++++++++++++------------------- - 1 file changed, 162 insertions(+), 70 deletions(-) - -commit a5904c769fbbac116423fbeeeba1c981b20e43d1 -Author: Philip Chimento -Date: Wed Nov 16 19:22:49 2016 -0800 - - Update telepathy-account-widgets to latest master - - https://bugzilla.gnome.org/show_bug.cgi?id=774176 - - telepathy-account-widgets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit d28a6772cfdaf1539b09b8744791c2d448737f8a -Author: Michael Catanzaro -Date: Tue Nov 15 13:23:35 2016 -0600 - - Use UTF-8 encoding for webview - - It would be nice to see UTF-8 characters. - - This is untested because of various problems: - - * I have no clue how I ever managed to run empathy-chat in the - past. It - seems designed to be as difficult to test in JHBuild as possible, - and - I'm not about to install it into /usr - * It doesn't support srcdir != builddir, so some hacks were - required to - even build it. - - So if this is broken and blows up, that's why. Just revert it. - - libempathy-gtk/empathy-log-window.c | 4 ++++ - libempathy-gtk/empathy-theme-adium.c | 4 ++++ - 2 files changed, 8 insertions(+) - -commit c7180829e32ef962393e05da4babcf2c92e086c0 -Author: Fabio Tomat -Date: Tue Nov 15 08:32:25 2016 +0000 - - Update Friulian translation - - po/fur.po | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 565a079dce1071ec8d47251d3b1b4227608968b4 -Author: Marek Černocký -Date: Sat Nov 12 11:32:50 2016 +0100 - - Updated Czech translation - - po/cs.po | 619 - ++++++++++++++++++++++++++++++--------------------------------- - 1 file changed, 294 insertions(+), 325 deletions(-) - -commit 7c95c22b3ea13a7fedd04a745c0f7ace8cf4c29c -Author: Mario Blättermann -Date: Fri Nov 11 20:12:28 2016 +0000 - - Update German translation - - po/de.po | 965 - ++++++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 551 insertions(+), 414 deletions(-) - -commit f44bc06b08d1c99544a94cf1eb5f8d50fd03f4b5 -Author: Fabio Tomat -Date: Thu Nov 10 21:08:48 2016 +0000 - - Update Friulian translation - - po/fur.po | 191 - +++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 95 insertions(+), 96 deletions(-) - -commit a9143c9f11c44dc39525ac2cfec19c2da598824a -Author: Piotr Drąg -Date: Thu Nov 10 20:17:12 2016 +0100 - - Update Polish translation - - po/pl.po | 126 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 63 insertions(+), 63 deletions(-) - -commit 2d92c7a780553b47a99830475d807e0815735237 -Author: Piotr Drąg -Date: Thu Nov 10 16:52:46 2016 +0100 - - Use Unicode in translatable strings - - See https://developer.gnome.org/hig/stable/typography.html - - https://bugzilla.gnome.org/show_bug.cgi?id=774216 - - data/org.gnome.Empathy.gschema.xml | 18 +++++++++--------- - libempathy-gtk/empathy-call-utils.c | 4 ++-- - libempathy-gtk/empathy-chat.c | 14 +++++++------- - libempathy-gtk/empathy-contact-search-dialog.c | 2 +- - libempathy-gtk/empathy-individual-dialogs.c | 2 +- - libempathy-gtk/empathy-individual-menu.c | 6 +++--- - libempathy-gtk/empathy-individual-view.c | 2 +- - libempathy-gtk/empathy-new-message-dialog.c | 2 +- - libempathy-gtk/empathy-subscription-dialog.c | 2 +- - libempathy-gtk/empathy-tls-dialog.c | 4 ++-- - libempathy/empathy-utils.c | 2 +- - src/empathy-accounts.c | 6 +++--- - src/empathy-auth-client.c | 2 +- - src/empathy-call-window.c | 16 ++++++++-------- - src/empathy-call.c | 2 +- - src/empathy-chat.c | 2 +- - src/empathy-debug-window.c | 4 ++-- - src/empathy-debugger.c | 2 +- - src/empathy-ft-manager.c | 26 - +++++++++++++------------- - src/empathy-new-chatroom-dialog.ui | 4 ++-- - src/empathy-preferences.c | 2 +- - src/empathy-roster-window.c | 2 +- - src/empathy.c | 6 +++--- - 23 files changed, 66 insertions(+), 66 deletions(-) - -commit 47e1a1538e3c9d58e6c565f43d3d7e418a195179 -Author: Fabio Tomat -Date: Mon Oct 17 14:54:54 2016 +0000 - - Update Friulian translation - - po/fur.po | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -commit 8311b765895d092c178ba81a36dd3956503ef351 -Author: Alexandre Franke -Date: Mon Sep 26 09:46:26 2016 +0000 - - Updated French translation - - help/fr/fr.po | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -commit ca6b43b6d76ac317de618beeed07c7edc2946212 -Author: Alexandre Franke -Date: Mon Sep 19 08:21:58 2016 +0000 - - Updated French translation - - help/fr/fr.po | 20 +++++++++++--------- - 1 file changed, 11 insertions(+), 9 deletions(-) - -commit 91480467ddf92f42fabdf42f3b5f1539167c736f -Author: Piotr Drąg -Date: Thu Sep 8 02:05:21 2016 +0200 - - Updated Polish translation - - help/pl/pl.po | 5411 - ++++++++++++++++++++++++++++++--------------------------- - po/pl.po | 10 +- - 2 files changed, 2855 insertions(+), 2566 deletions(-) - -commit ebd0953b78743ce0a6943c9dd0457e30a69e8f8a -Author: Fabio Tomat -Date: Wed Sep 7 14:36:41 2016 +0000 - - Updated Friulian translation - - po/fur.po | 74 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 37 insertions(+), 37 deletions(-) - -commit 04ee1eee5fa23eb4def0ae3a223910b86979b099 -Author: Mario Blättermann -Date: Mon Sep 5 11:59:46 2016 +0000 - - Updated German translation - - help/de/de.po | 27 +++++++++++++-------------- - 1 file changed, 13 insertions(+), 14 deletions(-) - -commit 3e2cbda37330c67623b9203cac72ed4c3465e682 -Author: Marek Černocký -Date: Sun Sep 4 22:33:58 2016 +0200 - - Updated Czech translation - - help/cs/cs.po | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -commit 73e5f2283c1b2582dfd039913b454e5e0763cfe1 -Author: David King -Date: Sun Sep 4 12:22:42 2016 +0200 - - Update British English translation - - po/en_GB.po | 2952 - +++++++++++++++++++++++++++-------------------------------- - 1 file changed, 1341 insertions(+), 1611 deletions(-) - -commit ab4274f6747f424420f4d9591103b46167a2c059 -Author: Michael Catanzaro -Date: Tue Aug 30 12:26:18 2016 -0500 - - Replace crap desktop notifications with crap GTK+ dialogs - - mcatanzaro: I am going to remove the "display events in notification - area" crap - mcatanzaro: Because the notification goes away and then you can never - see it again or join the room - mcatanzaro: It's BS - mcatanzaro: If you toggle it off, you get a GtkDialog from nowhere - instead, which is also crap but better! - - To be clear: it's totally unacceptable to display GtkDialogs without a - parent window, and this patch makes us do that by default. But I don't - plan to spend more effort on this myself, and it's a lot better than - giving users a two second window to rush to click the buttons in the - notification before it disappears. Better hope no other notification - gets sent during that time, and you have fast reflexes, else - you're not - gonna be able to join the chat you're invited to.... - - data/org.gnome.Empathy.gschema.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 216c60d9c18e7af4a00703e3e3c95033e68a7751 -Author: Daniel Mustieles -Date: Wed Aug 24 10:12:19 2016 +0000 - - Updated Spanish translation - - help/es/es.po | 23 +++++++++-------------- - 1 file changed, 9 insertions(+), 14 deletions(-) - -commit 6cfa773057bb9a8cc820ec4f4873e8db3769f2ab -Author: Piotr Drąg -Date: Mon Aug 22 15:45:01 2016 +0200 - - Updated Polish translation - - po/pl.po | 312 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 154 insertions(+), 158 deletions(-) - -commit 406f44225911ac2f36848016d0809acb7a5f3cb7 -Author: Balázs Úr -Date: Fri Aug 19 20:34:12 2016 +0000 - - Updated Hungarian translation - - help/hu/hu.po | 40 +++++++++++++++++++--------------------- - 1 file changed, 19 insertions(+), 21 deletions(-) - -commit 29dad613a4684498ed18df94e50d34a29362c720 -Author: Michael Catanzaro -Date: Sun Aug 7 12:30:52 2016 -0500 - - Leave note in NEWS regarding GNU make-ism + Leave note in NEWS regarding GNU make-ism NEWS | 9 +++++++++ 1 file changed, 9 insertions(+) -commit 17e875067821ced750352ec3c18bdf4118017fcb -Author: Daniel Mustieles -Date: Tue Aug 2 16:42:44 2016 +0200 - - Updated Spanish translation - - po/es.po | 509 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 252 insertions(+), 257 deletions(-) - -commit cc8d464c083d97558e48e0d6240a83ecd741f9fe -Author: Piotr Drąg -Date: Sat Jul 23 15:29:21 2016 +0200 - - Run optipng -o7 on help figures - - help/C/figures/conf_overview.png | Bin 605142 -> 528748 bytes - help/C/figures/croom_overview.png | Bin 397448 -> 396014 bytes - help/C/figures/empathy-main-window.png | Bin 27421 -> 22736 bytes - help/C/figures/video_overview.png | Bin 221887 -> 185108 bytes - help/ca/figures/empathy-main-window.png | Bin 9515 -> 7891 bytes - help/ca/figures/empathy-new-account.png | Bin 22569 -> 19414 bytes - help/de/figures/empathy-main-window.png | Bin 49766 -> 44400 bytes - help/el/figures/empathy-main-window.png | Bin 10969 -> 9137 bytes - help/el/figures/empathy-new-account.png | Bin 24577 -> 21787 bytes - help/es/figures/empathy-main-window.png | Bin 10432 -> 9366 bytes - help/es/figures/empathy-new-account.png | Bin 19056 -> 15888 bytes - help/eu/figures/empathy-main-window.png | Bin 10261 -> 8144 bytes - help/fi/figures/empathy-main-window.png | Bin 7821 -> 6785 bytes - help/fi/figures/empathy-new-account.png | Bin 18664 -> 16765 bytes - help/fr/figures/empathy-main-window.png | Bin 48810 -> 48750 bytes - help/it/figures/empathy-main-window.png | Bin 10232 -> 9127 bytes - help/sv/figures/empathy-main-window.png | Bin 9240 -> 8084 bytes - help/sv/figures/empathy-new-account.png | Bin 20700 -> 16448 bytes - 18 files changed, 0 insertions(+), 0 deletions(-) - -commit 4d003245d9fcef0799657dd8255d0fb1593b8aa1 -Author: Michael Catanzaro -Date: Fri Jul 22 21:31:48 2016 -0500 - - Fix function parameter alignment - - I'm pretty sure I hate Empathy coding style, but let's not mess it up. - - libempathy-gtk/empathy-location-manager.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -commit 8ae80c01fbdfbfe23f04943b89d3889a995d91a0 -Author: Kevin Haller -Date: Thu Feb 5 06:41:35 2015 +0100 - - Ctrl-L (Clear) blanks the current window. - - Problems: - * Bug#709811 https://bugzilla.gnome.org/show_bug.cgi?id=709811 - * Bug#550885 https://bugzilla.gnome.org/show_bug.cgi?id=550885 - - Will Thompson (last bug report) has proposed to design the clearance - of the - chat window like in a linux terminal. I think, thats a good idea - and it - solves also the upper problem (that some parts of the history - are deleted - and older ones, which were not displayed before the clearance - command, show - up by scrolling up) - - I changed empathy_theme_adium_clear() so that the Javascript function - 'clearPage()' is exectued instead of re-loading the template. The - Javascipt function is implemented in the data/Template html file. - - data/Template.html | 55 - ++++++++++++++++++++++++++++++++++++ - libempathy-gtk/empathy-theme-adium.c | 3 +- - 2 files changed, 57 insertions(+), 1 deletion(-) - -commit 395d59b74006a2c1f15947338d4ca6adcc3e40f1 +commit e07685ff5e93346a86690fcf1b8449bf934c8da4 Author: Fabrice Bellet Date: Wed Jul 13 16:00:05 2016 +0200 @@ -1649,7 +442,7 @@ src/empathy-call-window.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) -commit 1edc54e044de3bd6d67fca803e1f5fde3b2b3062 +commit f1b1b75e6772502290cbff5be2c8f31b61bdb6df Author: Fabrice Bellet Date: Mon Mar 23 01:30:50 2015 +0100 @@ -1660,25 +453,7 @@ libempathy-gtk/empathy-location-manager.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) -commit 0866484ffb1b3185ecc290f3d903a161f7fd458f -Author: twoscomplement -Date: Fri Sep 6 22:13:48 2013 -0700 - - Move "Clear" to end of context menu - - Having the "Clear" option at the top of the menu is user-unfriendly, - as - it is easy to click it accidentally, thereby inadvertently clearing - their chat history. This moves the Clear option to the end of the - right-click context menu, as well as in the toolbar options. - - https://bugzilla.gnome.org/show_bug.cgi?id=641337 - - libempathy-gtk/empathy-webkit-utils.c | 4 ++-- - src/empathy-chat-window.ui | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit bd8196180974c732eb9adff9c3b017e80a3c643d +commit 9f0d8a6e7444dd59729bac2c24717ea72aea5080 Author: Michael Catanzaro Date: Thu Jul 21 20:48:12 2016 -0500 @@ -1697,46 +472,7 @@ src/empathy-call.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -commit f781ba2aa3c5e7b95efabed1ed01ec0aecf57b22 -Author: Lionel Landwerlin -Date: Mon Nov 30 15:19:39 2015 +0000 - - call: port to clutter-gst 3.0 - - https://bugzilla.gnome.org/show_bug.cgi?id=751185 - - configure.ac | 2 +- - src/empathy-call-window.c | 28 ++++++++++++++-------------- - 2 files changed, 15 insertions(+), 15 deletions(-) - -commit f334edc237633dcd28c2680b9e6a1bb0d9c54e20 -Author: Michael Catanzaro -Date: Thu Jul 21 20:28:51 2016 -0500 - - Honor autoaway setting even in GNOME Shell - - GNOME stopped handling presence ages ago... I think it was GNOME 3.8. - - Based on work by Christoph Lenggenhager. - - https://bugzilla.gnome.org/show_bug.cgi?id=742720 - - src/empathy.c | 28 ++++++++++++---------------- - 1 file changed, 12 insertions(+), 16 deletions(-) - -commit 9235fecad3bce392f1b2b3c53a070937689995b2 -Author: Michael Catanzaro -Date: Thu Jul 21 20:13:45 2016 -0500 - - Always notify presence manager on exit - - Even when running in GNOME Shell. It's been years since this made - sense. - - src/empathy.c | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -commit 03ad9867f02aeb337d61b0b26ba687593bede9f0 +commit fd624644340af9e14435f66d09979a6ed0f4c7a8 Author: Rémi Cardona Date: Sun Nov 30 22:10:59 2014 +0100 @@ -1776,7 +512,7 @@ extensions/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -commit 5dc16e2a2c1d3f6fcbe318c1c67a3b02dc58f6c0 +commit 746b5b52c8469d5156a0a94fff4361ec3378246c Author: Hussam Al-Tayeb Date: Thu Oct 22 16:25:00 2015 -0500 @@ -1789,102 +525,6 @@ libempathy-gtk/empathy-log-window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 7677c9326c982cc10d3e10b69d1c7d22fe3c3621 -Author: Piotr Drąg -Date: Fri Jul 15 20:39:45 2016 +0200 - - Add Language headers to po files - - Future versions of gettext will fail if this header is missing. - - po/as.po | 2 +- - po/az.po | 1 + - po/be@latin.po | 1 + - po/bn.po | 1 + - po/bn_IN.po | 2 +- - po/br.po | 1 + - po/ca@valencia.po | 2 +- - po/crh.po | 2 +- - po/cy.po | 1 + - po/de.po | 2 +- - po/dz.po | 1 + - po/en@shaw.po | 1 + - po/es.po | 2 +- - po/eu.po | 2 +- - po/fr.po | 2 +- - po/gu.po | 2 +- - po/hr.po | 1 + - po/id.po | 2 +- - po/km.po | 2 +- - po/ko.po | 2 +- - po/mai.po | 1 + - po/mk.po | 1 + - po/ms.po | 1 + - po/my.po | 1 + - po/nb.po | 2 +- - po/ne.po | 1 + - po/nn.po | 1 + - po/oc.po | 2 +- - po/ps.po | 1 + - po/ru.po | 2 +- - po/si.po | 1 + - po/sl.po | 2 +- - po/sq.po | 1 + - po/sr@latin.po | 2 +- - po/ug.po | 2 +- - po/zh_HK.po | 2 +- - 36 files changed, 36 insertions(+), 19 deletions(-) - -commit a72ecabfd7911589ce24335a896b241594ab51bb -Author: Fabio Tomat -Date: Fri Jul 8 06:59:14 2016 +0000 - - Updated Friulian translation - - po/fur.po | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 077f9d502a24947127e6466b44b7bc6f4775a2eb -Author: Fabio Tomat -Date: Thu Jul 7 23:44:17 2016 +0000 - - Updated Friulian translation - - po/fur.po | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit c0ee3128402cf3bcab15cd91d54c03af0e31442d -Author: Fabio Tomat -Date: Thu Jul 7 15:03:28 2016 +0000 - - Updated Friulian translation - - po/fur.po | 26 ++++++++++++-------------- - 1 file changed, 12 insertions(+), 14 deletions(-) - -commit f9b4c66cc8f871cbe5e64462b6ecdb39ebb5ffb0 -Author: Diane Trout -Date: Thu Jun 23 22:45:30 2016 -0700 - - debug-window: Replace deprecated soup_session_async_new - - ... with soup_session_new. - - https://bugzilla.gnome.org/show_bug.cgi?id=767992 - - configure.ac | 3 ++- - src/empathy-debug-window.c | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -commit 3ad59b560417522e64f0c5140ade81b7610a34e0 -Author: Debarshi Ray -Date: Mon Jun 27 14:29:11 2016 +0200 - - Post-branch version bump - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - commit cb4d5c2b8023c2f2a9df1b8a9fb19f2af7d392be Author: Cédric Valmary Date: Sat Jun 4 13:19:34 2016 +0000 diff -Nru empathy-3.25.90/config.h.in empathy-3.25.90+really3.12.14/config.h.in --- empathy-3.25.90/config.h.in 2017-08-17 04:11:48.000000000 +0000 +++ empathy-3.25.90+really3.12.14/config.h.in 2017-08-26 00:22:56.000000000 +0000 @@ -6,10 +6,10 @@ /* Ignore post 1.8 deprecations */ #undef CLUTTER_VERSION_MIN_REQUIRED -/* Prevent post 1.14 APIs */ +/* Ignore post 1.14 deprecations */ #undef COGL_VERSION_MAX_ALLOWED -/* Ignore post 1.8 deprecations */ +/* Ignore post 1.14 deprecations */ #undef COGL_VERSION_MIN_REQUIRED /* Name of provider for accounts imported from GOA */ diff -Nru empathy-3.25.90/configure empathy-3.25.90+really3.12.14/configure --- empathy-3.25.90/configure 2017-08-17 04:11:47.000000000 +0000 +++ empathy-3.25.90+really3.12.14/configure 2017-08-26 00:22:50.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Empathy 3.25.90. +# Generated by GNU Autoconf 2.69 for Empathy 3.12.14. # # Report bugs to . # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='Empathy' PACKAGE_TARNAME='empathy' -PACKAGE_VERSION='3.25.90' -PACKAGE_STRING='Empathy 3.25.90' +PACKAGE_VERSION='3.12.14' +PACKAGE_STRING='Empathy 3.12.14' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/browse.cgi?product=empathy' PACKAGE_URL='https://live.gnome.org/Empathy' @@ -1492,7 +1492,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 Empathy 3.25.90 to adapt to many kinds of systems. +\`configure' configures Empathy 3.12.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1566,7 +1566,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Empathy 3.25.90:";; + short | recursive ) echo "Configuration of Empathy 3.12.14:";; esac cat <<\_ACEOF @@ -1751,7 +1751,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Empathy configure 3.25.90 +Empathy configure 3.12.14 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2034,7 +2034,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Empathy $as_me 3.25.90, which was +It was created by Empathy $as_me 3.12.14, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2433,7 +2433,7 @@ COGL_REQUIRED=1.14 -$as_echo "#define COGL_VERSION_MIN_REQUIRED COGL_VERSION_1_8" >>confdefs.h +$as_echo "#define COGL_VERSION_MIN_REQUIRED COGL_VERSION_1_14" >>confdefs.h $as_echo "#define COGL_VERSION_MAX_ALLOWED COGL_VERSION_1_14" >>confdefs.h @@ -2445,7 +2445,6 @@ GCR_REQUIRED=2.91.4 LIBCANBERRA_GTK_REQUIRED=0.25 LIBNOTIFY_REQUIRED=0.7.0 -LIBSOUP_REQUIRED=2.42.0 TELEPATHY_LOGGER=0.8.0 WEBKIT_REQUIRED=2.10.0 GOA_REQUIRED=3.5.1 @@ -3349,7 +3348,7 @@ # Define the identity of the package. PACKAGE='empathy' - VERSION='3.25.90' + VERSION='3.12.14' # Some tools Automake needs. @@ -15011,7 +15010,7 @@ libpulse libpulse-mainloop-glib webkit2gtk-4.0 >= \$WEBKIT_REQUIRED - libsoup-2.4 >= \$LIBSOUP_REQUIRED + libsoup-2.4 gee-0.8 \""; } >&5 ($PKG_CONFIG --exists --print-errors " @@ -15036,7 +15035,7 @@ libpulse libpulse-mainloop-glib webkit2gtk-4.0 >= $WEBKIT_REQUIRED - libsoup-2.4 >= $LIBSOUP_REQUIRED + libsoup-2.4 gee-0.8 ") 2>&5 ac_status=$? @@ -15064,7 +15063,7 @@ libpulse libpulse-mainloop-glib webkit2gtk-4.0 >= $WEBKIT_REQUIRED - libsoup-2.4 >= $LIBSOUP_REQUIRED + libsoup-2.4 gee-0.8 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -15100,7 +15099,7 @@ libpulse libpulse-mainloop-glib webkit2gtk-4.0 >= \$WEBKIT_REQUIRED - libsoup-2.4 >= \$LIBSOUP_REQUIRED + libsoup-2.4 gee-0.8 \""; } >&5 ($PKG_CONFIG --exists --print-errors " @@ -15125,7 +15124,7 @@ libpulse libpulse-mainloop-glib webkit2gtk-4.0 >= $WEBKIT_REQUIRED - libsoup-2.4 >= $LIBSOUP_REQUIRED + libsoup-2.4 gee-0.8 ") 2>&5 ac_status=$? @@ -15153,7 +15152,7 @@ libpulse libpulse-mainloop-glib webkit2gtk-4.0 >= $WEBKIT_REQUIRED - libsoup-2.4 >= $LIBSOUP_REQUIRED + libsoup-2.4 gee-0.8 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -15198,7 +15197,7 @@ libpulse libpulse-mainloop-glib webkit2gtk-4.0 >= $WEBKIT_REQUIRED - libsoup-2.4 >= $LIBSOUP_REQUIRED + libsoup-2.4 gee-0.8 " 2>&1` else @@ -15224,7 +15223,7 @@ libpulse libpulse-mainloop-glib webkit2gtk-4.0 >= $WEBKIT_REQUIRED - libsoup-2.4 >= $LIBSOUP_REQUIRED + libsoup-2.4 gee-0.8 " 2>&1` fi @@ -15253,7 +15252,7 @@ libpulse libpulse-mainloop-glib webkit2gtk-4.0 >= $WEBKIT_REQUIRED - libsoup-2.4 >= $LIBSOUP_REQUIRED + libsoup-2.4 gee-0.8 ) were not met: @@ -18021,7 +18020,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Empathy $as_me 3.25.90, which was +This file was extended by Empathy $as_me 3.12.14, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18088,7 +18087,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Empathy config.status 3.25.90 +Empathy config.status 3.12.14 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru empathy-3.25.90/configure.ac empathy-3.25.90+really3.12.14/configure.ac --- empathy-3.25.90/configure.ac 2017-08-17 04:10:20.000000000 +0000 +++ empathy-3.25.90+really3.12.14/configure.ac 2017-08-26 00:22:43.000000000 +0000 @@ -2,8 +2,8 @@ m4_define(empathy_released, 1) m4_define([empathy_major_version], [3]) -m4_define([empathy_minor_version], [25]) -m4_define([empathy_micro_version], [90]) +m4_define([empathy_minor_version], [12]) +m4_define([empathy_micro_version], [14]) m4_define([empathy_nano_version], [0]) dnl Display the nano_version only if it's not '0' @@ -57,8 +57,8 @@ AC_DEFINE(TP_DISABLE_SINGLE_INCLUDE, 1, [Disable single include header]) COGL_REQUIRED=1.14 -AC_DEFINE(COGL_VERSION_MIN_REQUIRED, COGL_VERSION_1_8, [Ignore post 1.8 deprecations]) -AC_DEFINE(COGL_VERSION_MAX_ALLOWED, COGL_VERSION_1_14, [Prevent post 1.14 APIs]) +AC_DEFINE(COGL_VERSION_MIN_REQUIRED, COGL_VERSION_1_14, [Ignore post 1.14 deprecations]) +AC_DEFINE(COGL_VERSION_MAX_ALLOWED, COGL_VERSION_1_14, [Ignore post 1.14 deprecations]) GSTREAMER_REQUIRED=0.10.32 TP_FS_REQUIRED=0.6.0 @@ -66,7 +66,6 @@ GCR_REQUIRED=2.91.4 LIBCANBERRA_GTK_REQUIRED=0.25 LIBNOTIFY_REQUIRED=0.7.0 -LIBSOUP_REQUIRED=2.42.0 TELEPATHY_LOGGER=0.8.0 WEBKIT_REQUIRED=2.10.0 GOA_REQUIRED=3.5.1 @@ -224,7 +223,7 @@ libpulse libpulse-mainloop-glib webkit2gtk-4.0 >= $WEBKIT_REQUIRED - libsoup-2.4 >= $LIBSOUP_REQUIRED + libsoup-2.4 gee-0.8 ]) diff -Nru empathy-3.25.90/data/empathy.appdata.xml.in empathy-3.25.90+really3.12.14/data/empathy.appdata.xml.in --- empathy-3.25.90/data/empathy.appdata.xml.in 2017-08-16 19:58:15.000000000 +0000 +++ empathy-3.25.90+really3.12.14/data/empathy.appdata.xml.in 2017-08-25 22:06:07.000000000 +0000 @@ -1,38 +1,20 @@ - - org.gnome.empathy - CC0 - - <_name>Empathy - <_summary>Chat on Google Talk, Facebook, MSN and many other chat services + + empathy.desktop + CC0 <_p> - Empathy is the official instant messaging application of the GNOME desktop environment. - Empathy can connect to AIM, MSN, Jabber (including Facebook and Google Talk), IRC, and many other messaging networks. + Empathy is the official instant messaging application of the GNOME desktop environment.  Empathy can connect to AIM, MSN, Jabber (including Facebook and Google Talk), IRC, and many other messaging networks. You can chat with text, make audio and video calls, or even transfer files, depending on what your contact’s chat application allows. <_p> - You can chat with text, make audio and video calls, or even transfer files, depending on what your contact’s chat application allows. - - <_p> - Empathy provides integrated messaging for the GNOME desktop, so you’ll never miss a message. - You can respond to your contacts without even having to open Empathy! + Empathy provides integrated messaging for the GNOME desktop, so you’ll never miss a message.  You can respond to your contacts without even having to open Empathy! - - empathy.desktop - https://wiki.gnome.org/Empathy - - https://wiki.gnome.org/Empathy?action=AttachFile&do=get&target=empathy.png - + https://wiki.gnome.org/Empathy?action=AttachFile&do=get&target=empathy.png - - telepathy@lists.freedesktop.org + telepathy@lists.freedesktop.org GNOME empathy - - - empathy.desktop - - + diff -Nru empathy-3.25.90/data/empathy.css empathy-3.25.90+really3.12.14/data/empathy.css --- empathy-3.25.90/data/empathy.css 2017-07-25 14:29:53.000000000 +0000 +++ empathy-3.25.90+really3.12.14/data/empathy.css 2017-08-25 22:06:07.000000000 +0000 @@ -1,6 +1,3 @@ -/* -FIXME: Update for GTK+ 3.20 - .empathy-tab-close-button { -GtkButton-default-border : 0; -GtkButton-default-outside-border : 0; @@ -17,7 +14,6 @@ -GtkButtonBox-child-internal-pad-x: 0; -GtkButtonBox-child-internal-pad-y: 0; } -*/ .empathy-smiley-menu-item { diff -Nru empathy-3.25.90/data/empathy.desktop empathy-3.25.90+really3.12.14/data/empathy.desktop --- empathy-3.25.90/data/empathy.desktop 2017-08-17 04:11:55.000000000 +0000 +++ empathy-3.25.90+really3.12.14/data/empathy.desktop 2017-08-26 00:23:01.000000000 +0000 @@ -52,7 +52,6 @@ Name[ms]=Empathy Name[my]=အမ်ပသီ Name[nb]=Empathy -Name[ne]=एमप्याथि Name[nl]=Empathy Name[nn]=Empathy Name[oc]=Empathy @@ -133,7 +132,6 @@ GenericName[mr]=IM क्लाएंट GenericName[my]=အိုင်အမ်ဆော့ဝဲ သုံးသူများ GenericName[nb]=Lynmeldingsklient -GenericName[ne]=आईएम ग्राहक GenericName[nl]=Chatprogramma GenericName[nn]=Lynmeldingsklient GenericName[oc]=Client de messatjariá instantanèa @@ -210,7 +208,6 @@ X-GNOME-FullName[mr]=एम्पथि इंटरनेट मेसेजिंग X-GNOME-FullName[my]=အမ်ပသီ အင်တာနက် ဆက်သွယ်ရေး X-GNOME-FullName[nb]=Empathy internettmeldinger -X-GNOME-FullName[ne]=एमप्याथि इन्टरनेट सन्देश X-GNOME-FullName[nl]=Empathy-chatprogramma X-GNOME-FullName[nn]=Empathy Internettprat X-GNOME-FullName[oc]=Messatjariá Internet Empathy @@ -382,4 +379,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=empathy X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=3.25.90 +X-GNOME-Bugzilla-Version=3.12.14 diff -Nru empathy-3.25.90/data/empathy.desktop.in empathy-3.25.90+really3.12.14/data/empathy.desktop.in --- empathy-3.25.90/data/empathy.desktop.in 2017-08-17 04:11:53.000000000 +0000 +++ empathy-3.25.90+really3.12.14/data/empathy.desktop.in 2017-08-26 00:22:55.000000000 +0000 @@ -15,4 +15,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=empathy X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=3.25.90 +X-GNOME-Bugzilla-Version=3.12.14 diff -Nru empathy-3.25.90/data/Makefile.am empathy-3.25.90+really3.12.14/data/Makefile.am --- empathy-3.25.90/data/Makefile.am 2017-08-16 19:58:15.000000000 +0000 +++ empathy-3.25.90+really3.12.14/data/Makefile.am 2017-08-25 22:06:07.000000000 +0000 @@ -60,7 +60,7 @@ empathy.css \ $(NULL) -appdatadir = $(datadir)/metainfo +appdatadir = $(datadir)/appdata appdata_in_files = empathy.appdata.xml.in appdata_DATA = $(appdata_in_files:.xml.in=.xml) @INTLTOOL_XML_RULE@ diff -Nru empathy-3.25.90/data/Makefile.in empathy-3.25.90+really3.12.14/data/Makefile.in --- empathy-3.25.90/data/Makefile.in 2017-08-17 04:11:48.000000000 +0000 +++ empathy-3.25.90+really3.12.14/data/Makefile.in 2017-08-26 00:22:51.000000000 +0000 @@ -458,7 +458,7 @@ empathy.css \ $(NULL) -appdatadir = $(datadir)/metainfo +appdatadir = $(datadir)/appdata appdata_in_files = empathy.appdata.xml.in appdata_DATA = $(appdata_in_files:.xml.in=.xml) EXTRA_DIST = \ diff -Nru empathy-3.25.90/data/org.gnome.Empathy.gschema.xml empathy-3.25.90+really3.12.14/data/org.gnome.Empathy.gschema.xml --- empathy-3.25.90/data/org.gnome.Empathy.gschema.xml 2017-08-16 23:51:04.000000000 +0000 +++ empathy-3.25.90+really3.12.14/data/org.gnome.Empathy.gschema.xml 2017-08-25 22:10:07.000000000 +0000 @@ -75,7 +75,7 @@ present them to the user immediately. - 400 + 0 The position for the chat window side pane The stored position (in pixels) of the chat window side pane. @@ -145,7 +145,7 @@ true - Pop up notifications if the chat isn’t focused + Pop up notifications if the chat isn't focused Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused. @@ -193,7 +193,7 @@ true Inform other users when you are typing to them - Whether to send the “composing” or “paused” chat states. Does not currently affect the “gone” state. + Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state. true @@ -203,7 +203,7 @@ 'en' Spell checking languages - Comma-separated list of spell checker languages to use (e.g. “en, fr, nl”). + Comma-separated list of spell checker languages to use (e.g. "en, fr, nl"). true @@ -240,26 +240,26 @@ true Echo cancellation support - Whether to enable PulseAudio’s echo cancellation filter. + Whether to enable Pulseaudio's echo cancellation filter. true Show hint about closing the main window - Whether to show the message dialog about closing the main window with the “x” button in the title bar. + Whether to show the message dialog about closing the main window with the 'x' button in the title bar. false - Empathy can publish the user’s location - Whether Empathy can publish the user’s location to their contacts. + Empathy can publish the user's location + Whether Empathy can publish the user's location to their contacts. true - Empathy should reduce the location’s accuracy - Whether Empathy should reduce the location’s accuracy for privacy reasons. + Empathy should reduce the location's accuracy + Whether Empathy should reduce the location's accuracy for privacy reasons. diff -Nru empathy-3.25.90/data/Template.html empathy-3.25.90+really3.12.14/data/Template.html --- empathy-3.25.90/data/Template.html 2017-01-26 02:18:49.000000000 +0000 +++ empathy-3.25.90+really3.12.14/data/Template.html 2017-08-25 22:06:07.000000000 +0000 @@ -26,7 +26,6 @@ this.isCoalescing = false; this.isConsecutive = undefined; this.shouldScroll = undefined; - this.interdiv = undefined; var appendElement = function (elem) { document.getElementById("Chat").appendChild(elem); @@ -102,22 +101,6 @@ } } - // This method is called, if the size of the chat window - // changes or after new messages have been appended. - // Adjusts the size of the interleaving page (if existing) - this.onchange = function() { - if (self.interdiv !== undefined){ - var old_padding = parseInt(self.interdiv.style.paddingTop, 10); - var diff = document.height - - (self.interdiv.offsetTop + old_padding); - new_padding = window.innerHeight - diff; - - if (new_padding <= 0) - removePage(); - else - self.interdiv.style.paddingTop = new_padding + "px"; - } - } // coalased analogs to the global functions @@ -135,7 +118,6 @@ node = null; setShouldScroll(shouldScroll); - self.onchange(); self.coalesce(); } @@ -151,7 +133,6 @@ } node = null; setShouldScroll(shouldScroll); - self.onchange(); self.coalesce(); } @@ -324,7 +305,6 @@ window.onresize = function windowDidResize(){ alignChat(true/*nearBottom()*/); //nearBottom buggy with inactive tabs - window.onresize = coalescedHTML.onchange; } function initStyle() { @@ -332,41 +312,6 @@ if(!coalescedHTML) coalescedHTML = new CoalescedHTML(); } - - /* Implementation of the CTRL-L command to clear the chat - * window. (Similar to a linux terminal) - */ - function clearPage(){ - removePage(); - if (checkForAndRemoveInsertNodes()){ - var interdiv = document.createElement('div'); - interdiv.id = 'interleaving_page'; - interdiv.style.paddingTop = window.innerHeight + 'px'; - chat.appendChild(interdiv); - coalescedHTML.interdiv = interdiv; - } - } - - function checkForAndRemoveInsertNodes() { - var inserts = chat.querySelectorAll("#insert"); - if (inserts.length <= 0){ - return false; - } - for (var n = 0; n < inserts.length-1; n++) { - var rm = inserts[n]; - rm.parentNode.removeChild(rm); - } - return true; - } - - function removePage(){ - var interdivs = chat.querySelectorAll("#interleaving_page"); - if (interdivs.length > 0){ - var rm = interdivs[0]; - rm.parentNode.removeChild(rm); - } - coalescedHTML.interdiv = undefined; - } + False + vertical - + + True False - False - vertical + 1 + 1 + avatar-default-symbolic + 6 + + + True + True + 0 + + + + True + False + 0.30000001192092896 + + + True + True + 1 + + + + + True + False + 0 + 0 + 0 - + + Account settings True True - False - False - True - - - True - True - True - never - - - - - - - - True - False - vertical - - - True - False - 1 - 1 - avatar-default-symbolic - 6 - - - True - True - 0 - - - - - True - False - 0.30000001192092896 - 35 - - - True - True - 1 - - - - - True - False - 0 - 0 - 0 - - - Account settings - True - True - True - 6 - 6 - False - - - - - True - True - 2 - - - - - True - False - 0 - 0 - 0 - - - True - False - - - - - True - True - 2 - - - - - - True - False - 0 - 0 - 0 - - - Show _Offline Contacts - True - True - True - 6 - 6 - False - True - - - - - True - True - 2 - - - - - True - False - 0 - 0 - 0 - - - _Add Contact… - True - True - True - 6 - 6 - False - True - - - - - True - True - 2 - - - - - 1 - - + True + 6 + 6 + False + + + True + True + 2 + + + + + True + False + 0 + 0 + 0 - + + True False + + + + + True + True + 2 + + + + + True + False + 0 + 0 + 0 + + + Go _Online True - - - - False - True - horizontal - False - True - - - False - True - vertical - False - True - - - True - False - 3 - 3 - True - - - - - False - end - start - True - True - center - True - False - - - - - False - 3 - True - horizontal - False - False - - - False - 1 - False - - - - - False - end - start - True - center - True - False - - - - - - - - + True + True + 6 + 6 + False + True + + True + True + 2 + - - - - - True - + + True + False + 0 + 0 + 0 + + + Show _Offline Contacts + True + True + True + 6 + 6 + False + True + + + + + True + True + 2 + + + + + True + False + 0 + 0 + 0 + + + _Add Contact… + True + True + True + 6 + 6 + False + True + + + + + True + True + 2 + - True - True 1 @@ -347,7 +252,7 @@ True True - 4 + 6 diff -Nru empathy-3.25.90/src/empathy-rounded-effect.c empathy-3.25.90+really3.12.14/src/empathy-rounded-effect.c --- empathy-3.25.90/src/empathy-rounded-effect.c 2017-01-27 18:54:20.000000000 +0000 +++ empathy-3.25.90+really3.12.14/src/empathy-rounded-effect.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -/* - * empathy-rounded-effect.c - Source for EmpathyRoundedEffect - * Copyright (C) 2011 Collabora Ltd. - * @author Emilio Pozuelo Monfort - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "config.h" -#include "empathy-rounded-effect.h" - -G_DEFINE_TYPE (EmpathyRoundedEffect, - empathy_rounded_effect, - CLUTTER_TYPE_EFFECT) - -static void -empathy_rounded_effect_paint (ClutterEffect *effect, - ClutterEffectPaintFlags flags) -{ - EmpathyRoundedEffect *self = EMPATHY_ROUNDED_EFFECT (effect); - ClutterActor *actor; - ClutterActorBox allocation = { 0, }; - gfloat width, height; - - actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (self)); - clutter_actor_get_allocation_box (actor, &allocation); - clutter_actor_box_get_size (&allocation, &width, &height); - - cogl_path_new (); - - /* Create and store a path describing a rounded rectangle. The small - * size of the preview window makes the radius of the rounded corners - * very small too, so we can safely use a very coarse angle step - * without loosing rendering accuracy. It also significantly reduces - * the time spent in the underlying internal cogl path functions */ - cogl_path_round_rectangle (0, 0, width, height, height / 16., 15); - - cogl_clip_push_from_path (); - - /* Flip */ - cogl_push_matrix (); - cogl_translate (width, 0, 0); - cogl_scale (-1, 1, 1); - - clutter_actor_continue_paint (actor); - - cogl_pop_matrix (); - cogl_clip_pop (); -} - -static void -empathy_rounded_effect_init (EmpathyRoundedEffect *self) -{ -} - -static void -empathy_rounded_effect_class_init (EmpathyRoundedEffectClass *klass) -{ - ClutterEffectClass *effect_class = CLUTTER_EFFECT_CLASS (klass); - - effect_class->paint = empathy_rounded_effect_paint; -} - -ClutterEffect * -empathy_rounded_effect_new (void) -{ - return CLUTTER_EFFECT ( - g_object_new (EMPATHY_TYPE_ROUNDED_EFFECT, NULL)); -} diff -Nru empathy-3.25.90/src/empathy-rounded-effect.h empathy-3.25.90+really3.12.14/src/empathy-rounded-effect.h --- empathy-3.25.90/src/empathy-rounded-effect.h 2017-01-27 18:54:20.000000000 +0000 +++ empathy-3.25.90+really3.12.14/src/empathy-rounded-effect.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -/* - * empathy-rounded-effect.h - Header for EmpathyRoundedEffect - * Copyright (C) 2011 Collabora Ltd. - * @author Emilio Pozuelo Monfort - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef __EMPATHY_ROUNDED_EFFECT_H__ -#define __EMPATHY_ROUNDED_EFFECT_H__ - -#include - -G_BEGIN_DECLS - -typedef struct _EmpathyRoundedEffect EmpathyRoundedEffect; -typedef struct _EmpathyRoundedEffectClass EmpathyRoundedEffectClass; - -struct _EmpathyRoundedEffectClass { - ClutterEffectClass parent_class; -}; - -struct _EmpathyRoundedEffect { - ClutterEffect parent; -}; - -GType empathy_rounded_effect_get_type (void); - -/* TYPE MACROS */ -#define EMPATHY_TYPE_ROUNDED_EFFECT \ - (empathy_rounded_effect_get_type ()) -#define EMPATHY_ROUNDED_EFFECT(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_ROUNDED_EFFECT, \ - EmpathyRoundedEffect)) -#define EMPATHY_ROUNDED_EFFECT_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_ROUNDED_EFFECT, \ - EmpathyRoundedEffectClass)) -#define EMPATHY_IS_ROUNDED_EFFECT(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_ROUNDED_EFFECT)) -#define EMPATHY_IS_ROUNDED_EFFECT_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_ROUNDED_EFFECT)) -#define EMPATHY_ROUNDED_EFFECT_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_ROUNDED_EFFECT, \ - EmpathyRoundedEffectClass)) - -ClutterEffect *empathy_rounded_effect_new (void); - -G_END_DECLS - -#endif /* #ifndef __EMPATHY_ROUNDED_EFFECT_H__*/ diff -Nru empathy-3.25.90/src/empathy-rounded-texture.c empathy-3.25.90+really3.12.14/src/empathy-rounded-texture.c --- empathy-3.25.90/src/empathy-rounded-texture.c 1970-01-01 00:00:00.000000000 +0000 +++ empathy-3.25.90+really3.12.14/src/empathy-rounded-texture.c 2017-08-25 22:12:24.000000000 +0000 @@ -0,0 +1,75 @@ +/* + * empathy-rounded-texture.c - Source for EmpathyRoundedTexture + * Copyright (C) 2011 Collabora Ltd. + * @author Emilio Pozuelo Monfort + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" +#include "empathy-rounded-texture.h" + +G_DEFINE_TYPE (EmpathyRoundedTexture, + empathy_rounded_texture, + CLUTTER_TYPE_TEXTURE) + +static void +empathy_rounded_texture_paint (ClutterActor *texture) +{ + ClutterActorBox allocation = { 0, }; + gfloat width, height; + + clutter_actor_get_allocation_box (texture, &allocation); + clutter_actor_box_get_size (&allocation, &width, &height); + + cogl_path_new (); + + /* Create and store a path describing a rounded rectangle. The small + * size of the preview window makes the radius of the rounded corners + * very small too, so we can safely use a very coarse angle step + * without loosing rendering accuracy. It also significantly reduces + * the time spent in the underlying internal cogl path functions */ + cogl_path_round_rectangle (0, 0, width, height, height / 16., 15); + + cogl_clip_push_from_path (); + + CLUTTER_ACTOR_CLASS (empathy_rounded_texture_parent_class)->paint (texture); + + /* Flip */ + cogl_rectangle_with_texture_coords (0, 0, width, height, + 1., 0., 0., 1.); + + cogl_clip_pop (); +} + +static void +empathy_rounded_texture_init (EmpathyRoundedTexture *self) +{ +} + +static void +empathy_rounded_texture_class_init (EmpathyRoundedTextureClass *klass) +{ + ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass); + + actor_class->paint = empathy_rounded_texture_paint; +} + +ClutterActor * +empathy_rounded_texture_new (void) +{ + return CLUTTER_ACTOR ( + g_object_new (EMPATHY_TYPE_ROUNDED_TEXTURE, NULL)); +} diff -Nru empathy-3.25.90/src/empathy-rounded-texture.h empathy-3.25.90+really3.12.14/src/empathy-rounded-texture.h --- empathy-3.25.90/src/empathy-rounded-texture.h 1970-01-01 00:00:00.000000000 +0000 +++ empathy-3.25.90+really3.12.14/src/empathy-rounded-texture.h 2017-08-25 22:06:07.000000000 +0000 @@ -0,0 +1,62 @@ +/* + * empathy-rounded-texture.h - Header for EmpathyRoundedTexture + * Copyright (C) 2011 Collabora Ltd. + * @author Emilio Pozuelo Monfort + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __EMPATHY_ROUNDED_TEXTURE_H__ +#define __EMPATHY_ROUNDED_TEXTURE_H__ + +#include + +G_BEGIN_DECLS + +typedef struct _EmpathyRoundedTexture EmpathyRoundedTexture; +typedef struct _EmpathyRoundedTextureClass EmpathyRoundedTextureClass; + +struct _EmpathyRoundedTextureClass { + ClutterTextureClass parent_class; +}; + +struct _EmpathyRoundedTexture { + ClutterTexture parent; +}; + +GType empathy_rounded_texture_get_type (void); + +/* TYPE MACROS */ +#define EMPATHY_TYPE_ROUNDED_TEXTURE \ + (empathy_rounded_texture_get_type ()) +#define EMPATHY_ROUNDED_TEXTURE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_ROUNDED_TEXTURE, \ + EmpathyRoundedTexture)) +#define EMPATHY_ROUNDED_TEXTURE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_ROUNDED_TEXTURE, \ + EmpathyRoundedTextureClass)) +#define EMPATHY_IS_ROUNDED_TEXTURE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_ROUNDED_TEXTURE)) +#define EMPATHY_IS_ROUNDED_TEXTURE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_ROUNDED_TEXTURE)) +#define EMPATHY_ROUNDED_TEXTURE_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_ROUNDED_TEXTURE, \ + EmpathyRoundedTextureClass)) + +ClutterActor *empathy_rounded_texture_new (void); + +G_END_DECLS + +#endif /* #ifndef __EMPATHY_ROUNDED_TEXTURE_H__*/ diff -Nru empathy-3.25.90/src/Makefile.am empathy-3.25.90+really3.12.14/src/Makefile.am --- empathy-3.25.90/src/Makefile.am 2017-08-17 03:07:19.000000000 +0000 +++ empathy-3.25.90+really3.12.14/src/Makefile.am 2017-08-25 22:06:07.000000000 +0000 @@ -58,7 +58,8 @@ libexec_PROGRAMS = \ empathy-auth-client \ - empathy-call + empathy-call \ + empathy-chat empathy_accounts_SOURCES = \ empathy-accounts.c empathy-accounts.h \ @@ -84,6 +85,20 @@ empathy-auth-client.c \ $(NULL) +empathy_chat_SOURCES = \ + chat-manager-interface.c chat-manager-interface.h \ + empathy-about-dialog.c empathy-about-dialog.h \ + empathy-chat-manager.c empathy-chat-manager.h \ + empathy-chat-window.c empathy-chat-window.h \ + empathy-invite-participant-dialog.c empathy-invite-participant-dialog.h \ + empathy-chat.c \ + $(NULL) + +nodist_empathy_chat_SOURCES = \ + empathy-chat-resources.c \ + empathy-chat-resources.h \ + $(NULL) + empathy_call_SOURCES = \ empathy-call.c \ empathy-call-factory.c \ @@ -114,8 +129,8 @@ empathy-rounded-actor.h \ empathy-rounded-rectangle.c \ empathy-rounded-rectangle.h \ - empathy-rounded-effect.c \ - empathy-rounded-effect.h \ + empathy-rounded-texture.c \ + empathy-rounded-texture.h \ empathy-mic-monitor.c \ empathy-mic-monitor.h @@ -136,7 +151,6 @@ empathy-preferences.c empathy-preferences.h \ empathy-status-icon.c empathy-status-icon.h \ empathy-chat-manager.c empathy-chat-manager.h \ - polari-fixed-size-frame.c polari-fixed-size-frame.h \ empathy.c empathy_SOURCES = \ @@ -160,6 +174,7 @@ $(empathy_accounts_SOURCES) \ $(empathy_debugger_SOURCES) \ $(empathy_auth_client_SOURCES) \ + $(empathy_chat_SOURCES) \ $(empathy_call_SOURCES) include $(top_srcdir)/tools/check-coding-style.mk @@ -200,6 +215,7 @@ Chat_Manager.xml BUILT_SOURCES = \ + $(nodist_empathy_chat_SOURCES) \ chat-manager-interface.c \ chat-manager-interface.h \ $(NULL) diff -Nru empathy-3.25.90/src/Makefile.in empathy-3.25.90+really3.12.14/src/Makefile.in --- empathy-3.25.90/src/Makefile.in 2017-08-17 04:11:48.000000000 +0000 +++ empathy-3.25.90+really3.12.14/src/Makefile.in 2017-08-26 00:22:51.000000000 +0000 @@ -92,7 +92,8 @@ host_triplet = @host@ bin_PROGRAMS = empathy$(EXEEXT) empathy-accounts$(EXEEXT) \ empathy-debugger$(EXEEXT) -libexec_PROGRAMS = empathy-auth-client$(EXEEXT) empathy-call$(EXEEXT) +libexec_PROGRAMS = empathy-auth-client$(EXEEXT) empathy-call$(EXEEXT) \ + empathy-chat$(EXEEXT) subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ @@ -138,7 +139,7 @@ empathy-notifications-approver.$(OBJEXT) \ empathy-call-observer.$(OBJEXT) empathy-preferences.$(OBJEXT) \ empathy-status-icon.$(OBJEXT) empathy-chat-manager.$(OBJEXT) \ - polari-fixed-size-frame.$(OBJEXT) empathy.$(OBJEXT) + empathy.$(OBJEXT) am_empathy_OBJECTS = $(am__objects_1) chat-manager-interface.$(OBJEXT) empathy_OBJECTS = $(am_empathy_OBJECTS) empathy_DEPENDENCIES = libempathy-accounts-common.la \ @@ -181,7 +182,7 @@ empathy_call-empathy-mic-menu.$(OBJEXT) \ empathy_call-empathy-rounded-actor.$(OBJEXT) \ empathy_call-empathy-rounded-rectangle.$(OBJEXT) \ - empathy_call-empathy-rounded-effect.$(OBJEXT) \ + empathy_call-empathy-rounded-texture.$(OBJEXT) \ empathy_call-empathy-mic-monitor.$(OBJEXT) empathy_call_OBJECTS = $(am_empathy_call_OBJECTS) empathy_call_LDADD = $(LDADD) @@ -194,6 +195,21 @@ empathy_call_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(empathy_call_CFLAGS) \ $(CFLAGS) $(empathy_call_LDFLAGS) $(LDFLAGS) -o $@ +am_empathy_chat_OBJECTS = chat-manager-interface.$(OBJEXT) \ + empathy-about-dialog.$(OBJEXT) empathy-chat-manager.$(OBJEXT) \ + empathy-chat-window.$(OBJEXT) \ + empathy-invite-participant-dialog.$(OBJEXT) \ + empathy-chat.$(OBJEXT) +nodist_empathy_chat_OBJECTS = empathy-chat-resources.$(OBJEXT) +empathy_chat_OBJECTS = $(am_empathy_chat_OBJECTS) \ + $(nodist_empathy_chat_OBJECTS) +empathy_chat_LDADD = $(LDADD) +empathy_chat_DEPENDENCIES = \ + $(top_builddir)/libempathy-gtk/libempathy-gtk.la \ + $(top_builddir)/libempathy/libempathy.la \ + $(top_builddir)/extensions/libemp-extensions.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_empathy_debugger_OBJECTS = empathy-debug-window.$(OBJEXT) \ empathy-debugger.$(OBJEXT) empathy_debugger_OBJECTS = $(am_empathy_debugger_OBJECTS) @@ -240,11 +256,12 @@ am__v_CCLD_1 = SOURCES = $(libempathy_accounts_common_la_SOURCES) $(empathy_SOURCES) \ $(empathy_accounts_SOURCES) $(empathy_auth_client_SOURCES) \ - $(empathy_call_SOURCES) $(empathy_debugger_SOURCES) + $(empathy_call_SOURCES) $(empathy_chat_SOURCES) \ + $(nodist_empathy_chat_SOURCES) $(empathy_debugger_SOURCES) DIST_SOURCES = $(libempathy_accounts_common_la_SOURCES) \ $(empathy_SOURCES) $(empathy_accounts_SOURCES) \ $(empathy_auth_client_SOURCES) $(empathy_call_SOURCES) \ - $(empathy_debugger_SOURCES) + $(empathy_chat_SOURCES) $(empathy_debugger_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -578,6 +595,20 @@ empathy-auth-client.c \ $(NULL) +empathy_chat_SOURCES = \ + chat-manager-interface.c chat-manager-interface.h \ + empathy-about-dialog.c empathy-about-dialog.h \ + empathy-chat-manager.c empathy-chat-manager.h \ + empathy-chat-window.c empathy-chat-window.h \ + empathy-invite-participant-dialog.c empathy-invite-participant-dialog.h \ + empathy-chat.c \ + $(NULL) + +nodist_empathy_chat_SOURCES = \ + empathy-chat-resources.c \ + empathy-chat-resources.h \ + $(NULL) + empathy_call_SOURCES = \ empathy-call.c \ empathy-call-factory.c \ @@ -608,8 +639,8 @@ empathy-rounded-actor.h \ empathy-rounded-rectangle.c \ empathy-rounded-rectangle.h \ - empathy-rounded-effect.c \ - empathy-rounded-effect.h \ + empathy-rounded-texture.c \ + empathy-rounded-texture.h \ empathy-mic-monitor.c \ empathy-mic-monitor.h @@ -629,7 +660,6 @@ empathy-preferences.c empathy-preferences.h \ empathy-status-icon.c empathy-status-icon.h \ empathy-chat-manager.c empathy-chat-manager.h \ - polari-fixed-size-frame.c polari-fixed-size-frame.h \ empathy.c empathy_SOURCES = \ @@ -653,6 +683,7 @@ $(empathy_accounts_SOURCES) \ $(empathy_debugger_SOURCES) \ $(empathy_auth_client_SOURCES) \ + $(empathy_chat_SOURCES) \ $(empathy_call_SOURCES) uidir = $(datadir)/empathy @@ -682,6 +713,7 @@ empathy-accounts.1 BUILT_SOURCES = \ + $(nodist_empathy_chat_SOURCES) \ chat-manager-interface.c \ chat-manager-interface.h \ $(NULL) @@ -851,6 +883,10 @@ @rm -f empathy-call$(EXEEXT) $(AM_V_CCLD)$(empathy_call_LINK) $(empathy_call_OBJECTS) $(empathy_call_LDADD) $(LIBS) +empathy-chat$(EXEEXT): $(empathy_chat_OBJECTS) $(empathy_chat_DEPENDENCIES) $(EXTRA_empathy_chat_DEPENDENCIES) + @rm -f empathy-chat$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(empathy_chat_OBJECTS) $(empathy_chat_LDADD) $(LIBS) + empathy-debugger$(EXEEXT): $(empathy_debugger_OBJECTS) $(empathy_debugger_DEPENDENCIES) $(EXTRA_empathy_debugger_DEPENDENCIES) @rm -f empathy-debugger$(EXEEXT) $(AM_V_CCLD)$(LINK) $(empathy_debugger_OBJECTS) $(empathy_debugger_LDADD) $(LIBS) @@ -868,7 +904,9 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-auth-client.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-call-observer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-chat-manager.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-chat-resources.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-chat-window.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-chat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-chatrooms-window.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-debug-window.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-debugger.Po@am__quote@ @@ -901,10 +939,9 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy_call-empathy-mic-monitor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy_call-empathy-preferences.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy_call-empathy-rounded-actor.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy_call-empathy-rounded-effect.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy_call-empathy-rounded-rectangle.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy_call-empathy-rounded-texture.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy_call-empathy-video-src.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polari-fixed-size-frame.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1151,19 +1188,19 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(empathy_call_CFLAGS) $(CFLAGS) -c -o empathy_call-empathy-rounded-rectangle.obj `if test -f 'empathy-rounded-rectangle.c'; then $(CYGPATH_W) 'empathy-rounded-rectangle.c'; else $(CYGPATH_W) '$(srcdir)/empathy-rounded-rectangle.c'; fi` -empathy_call-empathy-rounded-effect.o: empathy-rounded-effect.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(empathy_call_CFLAGS) $(CFLAGS) -MT empathy_call-empathy-rounded-effect.o -MD -MP -MF $(DEPDIR)/empathy_call-empathy-rounded-effect.Tpo -c -o empathy_call-empathy-rounded-effect.o `test -f 'empathy-rounded-effect.c' || echo '$(srcdir)/'`empathy-rounded-effect.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/empathy_call-empathy-rounded-effect.Tpo $(DEPDIR)/empathy_call-empathy-rounded-effect.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='empathy-rounded-effect.c' object='empathy_call-empathy-rounded-effect.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(empathy_call_CFLAGS) $(CFLAGS) -c -o empathy_call-empathy-rounded-effect.o `test -f 'empathy-rounded-effect.c' || echo '$(srcdir)/'`empathy-rounded-effect.c - -empathy_call-empathy-rounded-effect.obj: empathy-rounded-effect.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(empathy_call_CFLAGS) $(CFLAGS) -MT empathy_call-empathy-rounded-effect.obj -MD -MP -MF $(DEPDIR)/empathy_call-empathy-rounded-effect.Tpo -c -o empathy_call-empathy-rounded-effect.obj `if test -f 'empathy-rounded-effect.c'; then $(CYGPATH_W) 'empathy-rounded-effect.c'; else $(CYGPATH_W) '$(srcdir)/empathy-rounded-effect.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/empathy_call-empathy-rounded-effect.Tpo $(DEPDIR)/empathy_call-empathy-rounded-effect.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='empathy-rounded-effect.c' object='empathy_call-empathy-rounded-effect.obj' libtool=no @AMDEPBACKSLASH@ +empathy_call-empathy-rounded-texture.o: empathy-rounded-texture.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(empathy_call_CFLAGS) $(CFLAGS) -MT empathy_call-empathy-rounded-texture.o -MD -MP -MF $(DEPDIR)/empathy_call-empathy-rounded-texture.Tpo -c -o empathy_call-empathy-rounded-texture.o `test -f 'empathy-rounded-texture.c' || echo '$(srcdir)/'`empathy-rounded-texture.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/empathy_call-empathy-rounded-texture.Tpo $(DEPDIR)/empathy_call-empathy-rounded-texture.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='empathy-rounded-texture.c' object='empathy_call-empathy-rounded-texture.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(empathy_call_CFLAGS) $(CFLAGS) -c -o empathy_call-empathy-rounded-texture.o `test -f 'empathy-rounded-texture.c' || echo '$(srcdir)/'`empathy-rounded-texture.c + +empathy_call-empathy-rounded-texture.obj: empathy-rounded-texture.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(empathy_call_CFLAGS) $(CFLAGS) -MT empathy_call-empathy-rounded-texture.obj -MD -MP -MF $(DEPDIR)/empathy_call-empathy-rounded-texture.Tpo -c -o empathy_call-empathy-rounded-texture.obj `if test -f 'empathy-rounded-texture.c'; then $(CYGPATH_W) 'empathy-rounded-texture.c'; else $(CYGPATH_W) '$(srcdir)/empathy-rounded-texture.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/empathy_call-empathy-rounded-texture.Tpo $(DEPDIR)/empathy_call-empathy-rounded-texture.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='empathy-rounded-texture.c' object='empathy_call-empathy-rounded-texture.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(empathy_call_CFLAGS) $(CFLAGS) -c -o empathy_call-empathy-rounded-effect.obj `if test -f 'empathy-rounded-effect.c'; then $(CYGPATH_W) 'empathy-rounded-effect.c'; else $(CYGPATH_W) '$(srcdir)/empathy-rounded-effect.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(empathy_call_CFLAGS) $(CFLAGS) -c -o empathy_call-empathy-rounded-texture.obj `if test -f 'empathy-rounded-texture.c'; then $(CYGPATH_W) 'empathy-rounded-texture.c'; else $(CYGPATH_W) '$(srcdir)/empathy-rounded-texture.c'; fi` empathy_call-empathy-mic-monitor.o: empathy-mic-monitor.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(empathy_call_CFLAGS) $(CFLAGS) -MT empathy_call-empathy-mic-monitor.o -MD -MP -MF $(DEPDIR)/empathy_call-empathy-mic-monitor.Tpo -c -o empathy_call-empathy-mic-monitor.o `test -f 'empathy-mic-monitor.c' || echo '$(srcdir)/'`empathy-mic-monitor.c diff -Nru empathy-3.25.90/src/polari-fixed-size-frame.c empathy-3.25.90+really3.12.14/src/polari-fixed-size-frame.c --- empathy-3.25.90/src/polari-fixed-size-frame.c 2017-01-27 19:51:46.000000000 +0000 +++ empathy-3.25.90+really3.12.14/src/polari-fixed-size-frame.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,209 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* - * Copyright (C) 2013 Red Hat, Inc. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see ."; - */ - -#include "polari-fixed-size-frame.h" - -struct _PolariFixedSizeFramePrivate { - int width; - int height; -}; - -enum -{ - PROP_0, - - PROP_WIDTH, - PROP_HEIGHT, - - LAST_PROP -}; - -static GParamSpec *props[LAST_PROP]; - -static void -polari_fixed_size_frame_buildable_init (GtkBuildableIface *iface); - -G_DEFINE_TYPE_WITH_CODE (PolariFixedSizeFrame, polari_fixed_size_frame, - GTK_TYPE_FRAME, - G_ADD_PRIVATE (PolariFixedSizeFrame) - G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, - polari_fixed_size_frame_buildable_init)) - -static void -polari_fixed_size_frame_buildable_init (GtkBuildableIface *iface) -{ -} - -static void -queue_redraw (PolariFixedSizeFrame *self) -{ - GtkWidget *child = gtk_bin_get_child (GTK_BIN (self)); - - if (child) - gtk_widget_queue_resize (child); - - gtk_widget_queue_draw (GTK_WIDGET (self)); -} - -static void -polari_fixed_size_frame_set_width (PolariFixedSizeFrame *self, - int width) -{ - if (self->priv->width != width) - { - self->priv->width = width; - g_object_notify_by_pspec (G_OBJECT (self), props[PROP_WIDTH]); - - queue_redraw (self); - } -} - -static void -polari_fixed_size_frame_set_height (PolariFixedSizeFrame *self, - int height) -{ - if (self->priv->height != height) - { - self->priv->height = height; - g_object_notify_by_pspec (G_OBJECT (self), props[PROP_HEIGHT]); - - queue_redraw (self); - } -} - -static void -polari_fixed_size_frame_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - PolariFixedSizeFrame *self = POLARI_FIXED_SIZE_FRAME (object); - - switch (prop_id) - { - case PROP_WIDTH: - polari_fixed_size_frame_set_width(self, g_value_get_int (value)); - break; - case PROP_HEIGHT: - polari_fixed_size_frame_set_height(self, g_value_get_int (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - } -} - -static void -polari_fixed_size_frame_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - PolariFixedSizeFrame *self = POLARI_FIXED_SIZE_FRAME (object); - - switch (prop_id) - { - case PROP_WIDTH: - g_value_set_int (value, self->priv->width); - break; - case PROP_HEIGHT: - g_value_set_int (value, self->priv->height); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - } -} - -static void -polari_fixed_size_frame_get_preferred_width (GtkWidget *widget, - int *minimum_size, - int *natural_size) -{ - PolariFixedSizeFrame *self = POLARI_FIXED_SIZE_FRAME (widget); - - if (self->priv->width == -1) - { - GTK_WIDGET_CLASS (polari_fixed_size_frame_parent_class)->get_preferred_width (widget, minimum_size, natural_size); - } - else - { - *minimum_size = *natural_size = self->priv->width; - } -} - -static void -polari_fixed_size_frame_get_preferred_height (GtkWidget *widget, - int *minimum_size, - int *natural_size) -{ - PolariFixedSizeFrame *self = POLARI_FIXED_SIZE_FRAME (widget); - - if (self->priv->height == -1) - { - GTK_WIDGET_CLASS (polari_fixed_size_frame_parent_class)->get_preferred_height (widget, minimum_size, natural_size); - } - else - { - *minimum_size = *natural_size = self->priv->height; - } -} - -static void -polari_fixed_size_frame_class_init (PolariFixedSizeFrameClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass); - - object_class->get_property = polari_fixed_size_frame_get_property; - object_class->set_property = polari_fixed_size_frame_set_property; - widget_class->get_preferred_width = - polari_fixed_size_frame_get_preferred_width; - widget_class->get_preferred_height = - polari_fixed_size_frame_get_preferred_height; - gtk_container_class_handle_border_width (container_class); - - props[PROP_WIDTH] = - g_param_spec_int ("width", - "Width", - "Fixed width of the widget, or -1 to use the child's " - "width", - -1, - G_MAXINT, - -1, - G_PARAM_READWRITE); - - props[PROP_HEIGHT] = - g_param_spec_int ("height", - "Height", - "Fixed height of the widget, or -1 to use the child's " - "height", - -1, - G_MAXINT, - -1, - G_PARAM_READWRITE); - - g_object_class_install_properties (object_class, LAST_PROP, props); -} - -static void -polari_fixed_size_frame_init (PolariFixedSizeFrame *self) -{ - self->priv = polari_fixed_size_frame_get_instance_private (self), - self->priv->width = -1; - self->priv->height = -1; -} diff -Nru empathy-3.25.90/src/polari-fixed-size-frame.h empathy-3.25.90+really3.12.14/src/polari-fixed-size-frame.h --- empathy-3.25.90/src/polari-fixed-size-frame.h 2017-01-27 19:51:46.000000000 +0000 +++ empathy-3.25.90+really3.12.14/src/polari-fixed-size-frame.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* - * Copyright (C) 2013 Red Hat, Inc. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see ."; - */ - -#ifndef __POLARI_FIXED_SIZE_FRAME_H__ -#define __POLARI_FIXED_SIZE_FRAME_H__ - -#include - -G_BEGIN_DECLS - -typedef struct _PolariFixedSizeFrame PolariFixedSizeFrame; -typedef struct _PolariFixedSizeFrameClass PolariFixedSizeFrameClass; -typedef struct _PolariFixedSizeFramePrivate PolariFixedSizeFramePrivate; - -#define POLARI_TYPE_FIXED_SIZE_FRAME (polari_fixed_size_frame_get_type()) -#define POLARI_FIXED_SIZE_FRAME(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), POLARI_TYPE_FIXED_SIZE_FRAME, PolariFixedSizeFrame)) -#define POLARI_IS_FIXED_SIZE_FRAME(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), POLARI_TYPE_FIXED_SIZE_FRAME)) -#define POLARI_FIXED_SIZE_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), POLARI_TYPE_FIXED_SIZE_FRAME, PolariFixedSizeFrameClass)) -#define POLARI_IS_FIXED_SIZE_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), POLARI_TYPE_FIXED_SIZE_FRAME)) -#define POLARI_FIXED_SIZE_FRAME_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), POLARI_TYPE_FIXED_SIZE_FRAME, PolariFixedSizeFrameClass)) - -struct _PolariFixedSizeFrame { - GtkFrame parent_instance; - - PolariFixedSizeFramePrivate *priv; -}; - -struct _PolariFixedSizeFrameClass { - GtkFrameClass parent_class; -}; - -GType polari_fixed_size_frame_get_type (void) G_GNUC_CONST; - -G_END_DECLS - -#endif diff -Nru empathy-3.25.90/telepathy-account-widgets/aclocal.m4 empathy-3.25.90+really3.12.14/telepathy-account-widgets/aclocal.m4 --- empathy-3.25.90/telepathy-account-widgets/aclocal.m4 2017-08-17 04:11:37.000000000 +0000 +++ empathy-3.25.90+really3.12.14/telepathy-account-widgets/aclocal.m4 2017-08-26 00:18:10.000000000 +0000 @@ -20,6 +20,251 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) +# Configure paths for GLIB +# Owen Taylor 1997-2001 + +dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, +dnl gthread, or gio is specified in MODULES, pass to pkg-config +dnl +AC_DEFUN([AM_PATH_GLIB_2_0], +[dnl +dnl Get the cflags and libraries from pkg-config +dnl +AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], + , enable_glibtest=yes) + + pkg_config_args=glib-2.0 + for module in . $4 + do + case "$module" in + gmodule) + pkg_config_args="$pkg_config_args gmodule-2.0" + ;; + gmodule-no-export) + pkg_config_args="$pkg_config_args gmodule-no-export-2.0" + ;; + gobject) + pkg_config_args="$pkg_config_args gobject-2.0" + ;; + gthread) + pkg_config_args="$pkg_config_args gthread-2.0" + ;; + gio*) + pkg_config_args="$pkg_config_args $module-2.0" + ;; + esac + done + + PKG_PROG_PKG_CONFIG([0.16]) + + no_glib="" + + if test "x$PKG_CONFIG" = x ; then + no_glib=yes + PKG_CONFIG=no + fi + + min_glib_version=ifelse([$1], ,2.0.0,$1) + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs + if $PKG_CONFIG --uninstalled $pkg_config_args; then + echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" + enable_glibtest=no + fi + + if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then + : + else + no_glib=yes + fi + fi + + if test x"$no_glib" = x ; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` + + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_glibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" +dnl +dnl Now check if the installed GLIB is sufficiently new. (Also sanity +dnl checks the results of pkg-config to some extent) +dnl + rm -f conf.glibtest + AC_TRY_RUN([ +#include +#include +#include + +int +main () +{ + unsigned int major, minor, micro; + + fclose (fopen ("conf.glibtest", "w")); + + if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } + + if ((glib_major_version != $glib_config_major_version) || + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { + printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If pkg-config was correct, then it is best\n"); + printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration files\n"); + } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) + { + printf("*** GLIB header files (version %d.%d.%d) do not match\n", + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + glib_major_version, glib_minor_version, glib_micro_version); + } + else + { + if ((glib_major_version > major) || + ((glib_major_version == major) && (glib_minor_version > minor)) || + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", + glib_major_version, glib_minor_version, glib_micro_version); + printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", + major, minor, micro); + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); + printf("*** correct copy of pkg-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_glib" = x ; then + AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$PKG_CONFIG" = "no" ; then + echo "*** A new enough version of pkg-config was not found." + echo "*** See http://www.freedesktop.org/software/pkgconfig/" + else + if test -f conf.glibtest ; then + : + else + echo "*** Could not run GLIB test program, checking why..." + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GLIB_CFLAGS="" + GLIB_LIBS="" + GLIB_GENMARSHAL="" + GOBJECT_QUERY="" + GLIB_MKENUMS="" + GLIB_COMPILE_RESOURCES="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + AC_SUBST(GLIB_GENMARSHAL) + AC_SUBST(GOBJECT_QUERY) + AC_SUBST(GLIB_MKENUMS) + AC_SUBST(GLIB_COMPILE_RESOURCES) + rm -f conf.glibtest +]) + +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software +dnl 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. +dnl +dnl This file can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +AC_PREREQ([2.50]) + +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE([nls], + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) +]) + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 11 (pkg-config-0.29.1) @@ -364,251 +609,6 @@ [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) ])dnl PKG_HAVE_DEFINE_WITH_MODULES -# Configure paths for GLIB -# Owen Taylor 1997-2001 - -dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, -dnl gthread, or gio is specified in MODULES, pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GLIB_2_0], -[dnl -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], - , enable_glibtest=yes) - - pkg_config_args=glib-2.0 - for module in . $4 - do - case "$module" in - gmodule) - pkg_config_args="$pkg_config_args gmodule-2.0" - ;; - gmodule-no-export) - pkg_config_args="$pkg_config_args gmodule-no-export-2.0" - ;; - gobject) - pkg_config_args="$pkg_config_args gobject-2.0" - ;; - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - gio*) - pkg_config_args="$pkg_config_args $module-2.0" - ;; - esac - done - - PKG_PROG_PKG_CONFIG([0.16]) - - no_glib="" - - if test "x$PKG_CONFIG" = x ; then - no_glib=yes - PKG_CONFIG=no - fi - - min_glib_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" - enable_glibtest=no - fi - - if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then - : - else - no_glib=yes - fi - fi - - if test x"$no_glib" = x ; then - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` - GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` - - GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` - GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` - glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - unsigned int major, minor, micro; - - fclose (fopen ("conf.glibtest", "w")); - - if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://www.freedesktop.org/software/pkgconfig/" - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - GLIB_GENMARSHAL="" - GOBJECT_QUERY="" - GLIB_MKENUMS="" - GLIB_COMPILE_RESOURCES="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - AC_SUBST(GLIB_GENMARSHAL) - AC_SUBST(GOBJECT_QUERY) - AC_SUBST(GLIB_MKENUMS) - AC_SUBST(GLIB_COMPILE_RESOURCES) - rm -f conf.glibtest -]) - -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software -dnl 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. -dnl -dnl This file can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -AC_PREREQ([2.50]) - -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE([nls], - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) -]) - # Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation