Hello community, here is the log from the commit of package sushi for openSUSE:Factory checked in at 2015-03-30 19:14:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sushi (Old) and /work/SRC/openSUSE:Factory/.sushi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sushi" Changes: -------- --- /work/SRC/openSUSE:Factory/sushi/sushi.changes 2015-02-03 11:40:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sushi.new/sushi.changes 2015-03-30 19:14:15.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Mar 10 08:56:24 UTC 2015 - dims...@opensuse.org + +- Update to version 3.15.90: + + Fix deadlock with recent clutter/clutter-gtk. + + Don't require a parent window. + + Port HTML viewer to WebKit2. + + Fix margins in RTL. + + Fix toolbar icons for RTL. +- Replace pkgconfig(webkitgtk-3.0) BuildRequires with + pkgconfig(webkit2gtk-4.0): follow upstreams port to WebKit2. + +------------------------------------------------------------------- Old: ---- sushi-3.12.0.tar.xz New: ---- sushi-3.15.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sushi.spec ++++++ --- /var/tmp/diff_new_pack.a9Wvt3/_old 2015-03-30 19:14:16.000000000 +0200 +++ /var/tmp/diff_new_pack.a9Wvt3/_new 2015-03-30 19:14:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sushi # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: sushi -Version: 3.12.0 +Version: 3.15.90 Release: 0 Summary: Quick Previewer for Nautilus License: SUSE-GPL-2.0-with-plugin-exception Group: Productivity/File utilities Url: http://www.gnome.org -Source0: http://download.gnome.org/sources/sushi/3.12/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/sushi/3.15/%{name}-%{version}.tar.xz BuildRequires: gobject-introspection-devel BuildRequires: intltool %ifnarch ppc || ppc64 || ppc64le @@ -41,10 +41,10 @@ BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-pbutils-1.0) BuildRequires: pkgconfig(gstreamer-tag-1.0) -BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.13.2 BuildRequires: pkgconfig(gtksourceview-3.0) BuildRequires: pkgconfig(libmusicbrainz5) -BuildRequires: pkgconfig(webkitgtk-3.0) +BuildRequires: pkgconfig(webkit2gtk-4.0) Recommends: %{name}-lang Recommends: unoconv Supplements: nautilus ++++++ sushi-3.12.0.tar.xz -> sushi-3.15.90.tar.xz ++++++ ++++ 5842 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/Makefile.am new/sushi-3.15.90/Makefile.am --- old/sushi-3.12.0/Makefile.am 2014-04-23 01:14:38.000000000 +0200 +++ new/sushi-3.15.90/Makefile.am 2015-03-09 22:59:37.000000000 +0100 @@ -13,6 +13,10 @@ MAINTAINERCLEANFILES = \ INSTALL \ aclocal.m4 \ + config \ config.log \ config.status \ - configure + configure \ + m4 + +-include $(top_srcdir)/git.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/NEWS new/sushi-3.15.90/NEWS --- old/sushi-3.12.0/NEWS 2014-04-23 01:48:46.000000000 +0200 +++ new/sushi-3.15.90/NEWS 2015-03-09 22:59:37.000000000 +0100 @@ -1,3 +1,12 @@ +3.15.90 - "Mexican Bus" +======================= + +- Fix deadlock with recent clutter/clutter-gtk +- Don't require a parent window +- Port HTML viewer to WebKit2 (Marcos Chavarría Teijeiro) +- Fix margins in RTL (Yosef Or Boczko) +- Fix toolbar icons for RTL (Yosef Or Boczko) + 3.12.0 - "Hippie Hill" ====================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/config/config.h.in new/sushi-3.15.90/config/config.h.in --- old/sushi-3.12.0/config/config.h.in 2014-04-23 01:49:36.000000000 +0200 +++ new/sushi-3.15.90/config/config.h.in 2015-03-09 22:59:58.000000000 +0100 @@ -37,9 +37,6 @@ */ #undef LT_OBJDIR -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/config/missing new/sushi-3.15.90/config/missing --- old/sushi-3.12.0/config/missing 2014-04-23 01:15:07.000000000 +0200 +++ new/sushi-3.15.90/config/missing 2015-03-09 22:56:21.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/configure.ac new/sushi-3.15.90/configure.ac --- old/sushi-3.12.0/configure.ac 2014-04-23 01:48:55.000000000 +0200 +++ new/sushi-3.15.90/configure.ac 2015-03-09 22:59:37.000000000 +0100 @@ -1,6 +1,6 @@ dnl -*- mode: m4 -*- AC_PREREQ(2.63) -AC_INIT([sushi],[3.12.0],[],[sushi]) +AC_INIT([sushi],[3.15.90],[],[sushi]) AC_CONFIG_HEADERS([config/config.h]) AC_CONFIG_SRCDIR([src/main.c]) @@ -48,7 +48,7 @@ CLUTTER_MIN_VERSION=1.11.4 GLIB_MIN_VERSION=2.29.14 -GTK_MIN_VERSION=3.4.0 +GTK_MIN_VERSION=3.13.2 GJS_MIN_VERSION=1.34.0 CLUTTER_GTK_MIN_VERSION=1.0.1 GOBJECT_INTROSPECTION_MIN_VERSION=0.9.6 @@ -72,7 +72,7 @@ evince-document-3.0 evince-view-3.0 gtksourceview-3.0 - webkitgtk-3.0) + webkit2gtk-4.0) GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` AC_SUBST(GLIB_MKENUMS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/data/Makefile.am new/sushi-3.15.90/data/Makefile.am --- old/sushi-3.12.0/data/Makefile.am 2014-04-23 01:14:38.000000000 +0200 +++ new/sushi-3.15.90/data/Makefile.am 2015-03-09 22:59:37.000000000 +0100 @@ -21,3 +21,5 @@ CLEANFILES = \ $(service_DATA) \ $(gsettings_SCHEMAS) + +-include $(top_srcdir)/git.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/data/style/Makefile.am new/sushi-3.15.90/data/style/Makefile.am --- old/sushi-3.12.0/data/style/Makefile.am 2014-04-23 01:14:38.000000000 +0200 +++ new/sushi-3.15.90/data/style/Makefile.am 2015-03-09 22:59:37.000000000 +0100 @@ -1,4 +1,5 @@ styledir = $(pkgdatadir)/style dist_style_DATA = \ - gtk-style.css \ No newline at end of file + gtk-style.css +-include $(top_srcdir)/git.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/m4/libtool.m4 new/sushi-3.15.90/m4/libtool.m4 --- old/sushi-3.12.0/m4/libtool.m4 2014-04-23 01:15:54.000000000 +0200 +++ new/sushi-3.15.90/m4/libtool.m4 2015-03-09 22:56:16.000000000 +0100 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1324,16 +1324,12 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac + LD="${LD-ld} -m elf_i386" + ;; + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1352,7 +1348,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1695,8 +1694,7 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2520,6 +2518,17 @@ esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2636,7 +2645,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -2666,10 +2675,14 @@ # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2681,18 +2694,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -3252,6 +3253,10 @@ fi ;; +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3290,11 +3295,11 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4042,7 +4047,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4106,7 +4111,7 @@ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4341,7 +4346,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4583,9 +4588,6 @@ ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4648,9 +4650,6 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4872,7 +4871,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5049,7 +5048,6 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5354,7 +5352,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6234,6 +6232,9 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; + gnu*) + ;; + haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6395,7 +6396,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/po/LINGUAS new/sushi-3.15.90/po/LINGUAS --- old/sushi-3.12.0/po/LINGUAS 2014-04-23 01:14:38.000000000 +0200 +++ new/sushi-3.15.90/po/LINGUAS 2014-11-20 18:17:19.000000000 +0100 @@ -29,6 +29,7 @@ id it ja +kk kn ko lt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/po/kk.po new/sushi-3.15.90/po/kk.po --- old/sushi-3.12.0/po/kk.po 1970-01-01 01:00:00.000000000 +0100 +++ new/sushi-3.15.90/po/kk.po 2014-11-20 18:17:19.000000000 +0100 @@ -0,0 +1,68 @@ +# Kazakh translation for sushi. +# Copyright (C) 2014 sushi's COPYRIGHT HOLDER +# This file is distributed under the same license as the sushi package. +# Baurzhan Muftakhidinov <baurthefi...@gmail.com>, 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: sushi master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; +"product=sushi&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2014-10-06 22:51+0000\n" +"PO-Revision-Date: 2014-10-24 09:23+0600\n" +"Last-Translator: Baurzhan Muftakhidinov <baurthefi...@gmail.com>\n" +"Language-Team: Kazakh <k...@li.org>\n" +"Language: kk\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 1.6.9\n" + +#: ../data/org.gnome.sushi.gschema.xml.in.h:1 +msgid "Client decoration" +msgstr "Клиент безендіруі" + +#: ../data/org.gnome.sushi.gschema.xml.in.h:2 +msgid "Whether the window draws WM decorations itself" +msgstr "Терезе ТБ безендіруін өздігінен салу керек пе" + +#: ../src/js/ui/fallbackRenderer.js:121 +msgid "Type" +msgstr "Түрі" + +#: ../src/js/ui/fallbackRenderer.js:122 ../src/js/ui/fallbackRenderer.js:131 +#: ../src/js/ui/fallbackRenderer.js:137 ../src/js/ui/spinnerBox.js:58 +msgid "Loading..." +msgstr "Жүктеу..." + +#: ../src/js/ui/fallbackRenderer.js:130 +msgid "Size" +msgstr "Өлшемі" + +#: ../src/js/ui/fallbackRenderer.js:136 +msgid "Modified" +msgstr "Өзгертілген" + +#: ../src/js/viewers/audio.js:173 +msgid "from" +msgstr "альбомнан" + +#: ../src/js/viewers/audio.js:175 +msgid "by" +msgstr "орындайтын" + +#: ../src/js/viewers/evince.js:79 +#, javascript-format +msgid "%d of %d" +msgstr "%d, барлығы %d" + +#: ../src/libsushi/sushi-file-loader.c:639 +#, c-format +msgid "%d item" +msgid_plural "%d items" +msgstr[0] "%d нәрсе" + +#: ../src/libsushi/sushi-file-loader.c:651 +msgid "Empty Folder" +msgstr "Бос бума" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/po/pa.po new/sushi-3.15.90/po/pa.po --- old/sushi-3.12.0/po/pa.po 2014-04-23 01:14:38.000000000 +0200 +++ new/sushi-3.15.90/po/pa.po 2014-11-20 18:17:19.000000000 +0100 @@ -2,22 +2,22 @@ # Copyright (C) 2011 sushi's COPYRIGHT HOLDER # This file is distributed under the same license as the sushi package. # -# A S Alam <aa...@users.sf.net>, 2011, 2012. +# A S Alam <aa...@users.sf.net>, 2011, 2012, 2014. msgid "" msgstr "" "Project-Id-Version: sushi master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; "product=sushi&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-04-12 19:27+0000\n" -"PO-Revision-Date: 2012-08-22 07:40+0530\n" +"POT-Creation-Date: 2014-09-21 10:28+0000\n" +"PO-Revision-Date: 2014-09-21 08:45-0500\n" "Last-Translator: A S Alam <aa...@users.sf.net>\n" "Language-Team: Punjabi/Panjabi <punjabi-us...@lists.sf.net>\n" +"Language: pa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Language: pa\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" #: ../data/org.gnome.sushi.gschema.xml.in.h:1 msgid "Client decoration" @@ -27,45 +27,46 @@ msgid "Whether the window draws WM decorations itself" msgstr "ਕੀ ਵਿੰਡੋ ਖੁਦ WM ਸਜਾਵਟ ਕਰੇ" -#: ../src/js/ui/fallbackRenderer.js:117 +#: ../src/js/ui/fallbackRenderer.js:121 msgid "Type" msgstr "ਕਿਸਮ" -#: ../src/js/ui/fallbackRenderer.js:118 ../src/js/ui/fallbackRenderer.js:123 -#: ../src/js/ui/fallbackRenderer.js:128 ../src/js/ui/spinnerBox.js:57 -#: ../src/js/viewers/folder.js:124 ../src/js/viewers/folder.js:129 +#: ../src/js/ui/fallbackRenderer.js:122 ../src/js/ui/fallbackRenderer.js:131 +#: ../src/js/ui/fallbackRenderer.js:137 ../src/js/ui/spinnerBox.js:58 msgid "Loading..." msgstr "ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../src/js/ui/fallbackRenderer.js:122 ../src/js/viewers/folder.js:123 +#: ../src/js/ui/fallbackRenderer.js:130 msgid "Size" msgstr "ਅਕਾਰ" -#: ../src/js/ui/fallbackRenderer.js:127 ../src/js/viewers/folder.js:128 +#: ../src/js/ui/fallbackRenderer.js:136 msgid "Modified" msgstr "ਸੋਧ ਕੀਤੀ" -#: ../src/js/viewers/audio.js:171 +#: ../src/js/viewers/audio.js:173 msgid "from" msgstr "ਵਿੱਚੋਂ" -#: ../src/js/viewers/audio.js:173 +#: ../src/js/viewers/audio.js:175 msgid "by" msgstr "ਵਲੋਂ" #: ../src/js/viewers/evince.js:79 -#, c-format +#, javascript-format +#| msgid "%d of %d" msgid "%d of %d" -msgstr "%2$d ਵਿੱਚੋਂ %1$d" +msgstr "%d, %d ਵਿੱਚੋ" -#: ../src/libsushi/sushi-file-loader.c:640 +#: ../src/libsushi/sushi-file-loader.c:639 #, c-format msgid "%d item" msgid_plural "%d items" msgstr[0] "%d ਆਈਟਮ" msgstr[1] "%d ਆਈਟਮਾਂ" -#: ../src/libsushi/sushi-file-loader.c:652 +#: ../src/libsushi/sushi-file-loader.c:651 msgid "Empty Folder" msgstr "ਖਾਲੀ ਫੋਲਡਰ" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/po/tr.po new/sushi-3.15.90/po/tr.po --- old/sushi-3.12.0/po/tr.po 2014-04-23 01:14:38.000000000 +0200 +++ new/sushi-3.15.90/po/tr.po 2014-11-20 18:17:19.000000000 +0100 @@ -8,55 +8,62 @@ "Project-Id-Version: sushi master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; "product=sushi&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-10 09:54+0000\n" -"PO-Revision-Date: 2011-09-10 19:29+0300\n" -"Last-Translator: Muhammet Kara <muhamme...@gmail.com>\n" +"POT-Creation-Date: 2014-11-09 11:33+0000\n" +"PO-Revision-Date: 2014-11-09 17:43+0000\n" +"Last-Translator: Necdet Yücel <necdetyu...@gmail.com>\n" "Language-Team: Turkish <gnome-t...@gnome.org>\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"Language: tr\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Pootle 2.5.1.1\n" +"X-POOTLE-MTIME: 1415555003.000000\n" -#: ../src/libsushi/sushi-file-loader.c:641 -#, c-format -msgid "%d item" -msgid_plural "%d items" -msgstr[0] "%d öge" - -#: ../src/libsushi/sushi-file-loader.c:653 -msgid "Empty Folder" -msgstr "Boş Klasör" +#: ../data/org.gnome.sushi.gschema.xml.in.h:1 +msgid "Client decoration" +msgstr "İstemci dekorasyonu" + +#: ../data/org.gnome.sushi.gschema.xml.in.h:2 +msgid "Whether the window draws WM decorations itself" +msgstr "Pencerenin WM dekorasyonlarını kendisi çizip çizmeyeceği" -#: ../src/js/ui/fallbackRenderer.js:120 +#: ../src/js/ui/fallbackRenderer.js:121 msgid "Type" msgstr "Tür" -#: ../src/js/ui/fallbackRenderer.js:121 ../src/js/ui/fallbackRenderer.js:126 -#: ../src/js/ui/fallbackRenderer.js:131 ../src/js/ui/spinnerBox.js:54 -#: ../src/js/viewers/folder.js:127 ../src/js/viewers/folder.js:132 +#: ../src/js/ui/fallbackRenderer.js:122 ../src/js/ui/fallbackRenderer.js:131 +#: ../src/js/ui/fallbackRenderer.js:137 ../src/js/ui/spinnerBox.js:58 msgid "Loading..." msgstr "Yükleniyor..." -#: ../src/js/ui/fallbackRenderer.js:125 ../src/js/viewers/folder.js:126 +#: ../src/js/ui/fallbackRenderer.js:130 msgid "Size" msgstr "Boyut" -#: ../src/js/ui/fallbackRenderer.js:130 ../src/js/viewers/folder.js:131 +#: ../src/js/ui/fallbackRenderer.js:136 msgid "Modified" msgstr "Değiştirildi" -#: ../src/js/viewers/audio.js:163 +#: ../src/js/viewers/audio.js:173 msgid "from" -msgstr "nereden:" +msgstr "gönderen" -#: ../src/js/viewers/audio.js:165 +#: ../src/js/viewers/audio.js:175 msgid "by" -msgstr "sahibi:" +msgstr "sahibi" -#: ../src/js/viewers/evince.js:75 -#, c-format +#: ../src/js/viewers/evince.js:79 +#, javascript-format msgid "%d of %d" msgstr "%d / %d" +#: ../src/libsushi/sushi-file-loader.c:639 +#, c-format +msgid "%d item" +msgid_plural "%d items" +msgstr[0] "%d öge" + +#: ../src/libsushi/sushi-file-loader.c:651 +msgid "Empty Folder" +msgstr "Boş Klasör" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/src/Makefile.am new/sushi-3.15.90/src/Makefile.am --- old/sushi-3.12.0/src/Makefile.am 2014-04-23 01:14:38.000000000 +0200 +++ new/sushi-3.15.90/src/Makefile.am 2015-03-09 22:59:37.000000000 +0100 @@ -62,3 +62,5 @@ CLEANFILES += sushi EXTRA_DIST += sushi.in + +-include $(top_srcdir)/git.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/src/js/ui/fallbackRenderer.js new/sushi-3.15.90/src/js/ui/fallbackRenderer.js --- old/sushi-3.12.0/src/js/ui/fallbackRenderer.js 2014-04-23 01:14:38.000000000 +0200 +++ new/sushi-3.15.90/src/js/ui/fallbackRenderer.js 2014-11-20 18:17:19.000000000 +0100 @@ -68,8 +68,8 @@ let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, spacing: 1, margin_top: 48, - margin_left: 12, - margin_right: 12 }); + margin_start: 12, + margin_end: 12 }); this._box.pack_start(vbox, false, false, 0); let hbox = new Gtk.Box({ orientation: Gtk.Orientation.HORIZONTAL, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/src/js/ui/mainWindow.js new/sushi-3.15.90/src/js/ui/mainWindow.js --- old/sushi-3.12.0/src/js/ui/mainWindow.js 2014-04-23 01:14:38.000000000 +0200 +++ new/sushi-3.15.90/src/js/ui/mainWindow.js 2015-03-09 18:41:16.000000000 +0100 @@ -122,10 +122,10 @@ new Clutter.BindConstraint({ coordinate: Clutter.BindCoordinate.SIZE, source: this._stage })); this._stage.add_actor(this._mainGroup); - this._mainGroup.set_opacity(0); - this._stage.connect('key-press-event', - Lang.bind(this, this._onStageKeyPressEvent)); + this._gtkWindow.connect('key-press-event', + Lang.bind(this, this._onKeyPressEvent)); + this._stage.connect('button-press-event', Lang.bind(this, this._onButtonPressEvent)); this._stage.connect('motion-event', @@ -174,17 +174,19 @@ this._clearAndQuit(); }, - _onStageKeyPressEvent : function(actor, event) { - let key = event.get_key_symbol(); + _onKeyPressEvent : function(actor, event) { + let key = event.get_keyval()[1]; - if (key == Clutter.KEY_Escape || - key == Clutter.KEY_space || - key == Clutter.KEY_q) - this._fadeOutWindow(); + if (key == Gdk.KEY_Escape || + key == Gdk.KEY_space || + key == Gdk.KEY_q) + this._clearAndQuit(); - if (key == Clutter.KEY_f || - key == Clutter.KEY_F11) + if (key == Gdk.KEY_f || + key == Gdk.KEY_F11) this.toggleFullScreen(); + + return false; }, _onButtonPressEvent : function(actor, event) { @@ -506,8 +508,8 @@ this._toolbarActor.set_opacity(0); this._toolbarActor.margin_bottom = Constants.TOOLBAR_SPACING; - this._toolbarActor.margin_left = Constants.TOOLBAR_SPACING; - this._toolbarActor.margin_right = Constants.TOOLBAR_SPACING; + this._toolbarActor.margin_start = Constants.TOOLBAR_SPACING; + this._toolbarActor.margin_end = Constants.TOOLBAR_SPACING; this._mainLayout.add(this._toolbarActor, Clutter.BinAlignment.CENTER, Clutter.BinAlignment.END); @@ -561,8 +563,7 @@ } this._titleGroupLayout = new Clutter.BoxLayout(); - this._titleGroup = new Clutter.Box({ layout_manager: this._titleGroupLayout, - opacity: 0 }); + this._titleGroup = new Clutter.Box({ layout_manager: this._titleGroupLayout }); this._stage.add_actor(this._titleGroup); this._titleGroup.add_constraint( @@ -611,42 +612,6 @@ /************************************************************************** *********************** Window move/fade helpers ************************* **************************************************************************/ - _fadeInWindow : function() { - this._mainGroup.set_opacity(0); - this._titleGroup.set_opacity(0); - - this._gtkWindow.show_all(); - - Tweener.addTween(this._mainGroup, - { opacity: 255, - time: 0.3, - transition: 'easeOutQuad' }); - Tweener.addTween(this._titleGroup, - { opacity: 255, - time: 0.3, - transition: 'easeOutQuad' }); - }, - - _fadeOutWindow : function() { - this._removeToolbarTimeout(); - - Tweener.addTween(this._titleGroup, - { opacity: 0, - time: 0.15, - transition: 'easeOutQuad' - }); - - Tweener.addTween(this._mainGroup, - { opacity: 0, - time: 0.15, - transition: 'easeOutQuad', - onComplete: function () { - this._clearAndQuit(); - }, - onCompleteScope: this - }); - }, - _clearAndQuit : function() { if (this._renderer.clear) this._renderer.clear(); @@ -660,7 +625,8 @@ setParent : function(xid) { this._parent = Sushi.create_foreign_window(xid); this._gtkWindow.realize(); - this._gtkWindow.get_window().set_transient_for(this._parent); + if (this._parent) + this._gtkWindow.get_window().set_transient_for(this._parent); this._gtkWindow.show_all(); this._gtkWindow.get_window().move_to_current_desktop(); @@ -674,7 +640,7 @@ this._createToolbar(); this._createTitle(); - this._fadeInWindow(); + this._gtkWindow.show_all(); }, setTitle : function(label) { @@ -700,6 +666,6 @@ }, close : function() { - this._fadeOutWindow(); + this._clearAndQuit(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/src/js/viewers/audio.js new/sushi-3.15.90/src/js/viewers/audio.js --- old/sushi-3.12.0/src/js/viewers/audio.js 2014-04-23 01:14:38.000000000 +0200 +++ new/sushi-3.15.90/src/js/viewers/audio.js 2014-11-20 18:17:19.000000000 +0100 @@ -64,8 +64,8 @@ let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, spacing: 1, margin_top: 48, - margin_left: 12, - margin_right: 12 }); + margin_start: 12, + margin_end: 12 }); this._box.pack_start(vbox, false, false, 0); this._titleLabel = new Gtk.Label(); @@ -237,9 +237,7 @@ this._toolbarPlay.set_icon_name('media-playback-pause-symbolic'); break; default: - let iconName = - (this._toolbarPlay.get_direction() == Gtk.TextDirection.RTL) ? - 'media-playback-start-rtl-symbolic' : 'media-playback-start-symbolic'; + let iconName = 'media-playback-start-symbolic'; this._toolbarPlay.set_icon_name(iconName); } }, @@ -271,8 +269,8 @@ this._toolbarPlay.show(); this._mainToolbar.insert(this._toolbarPlay, 0); - this._currentLabel = new Gtk.Label({ margin_left: 6, - margin_right: 3 }); + this._currentLabel = new Gtk.Label({ margin_start: 6, + margin_end: 3 }); let item = new Gtk.ToolItem(); item.add(this._currentLabel); item.show_all(); @@ -301,7 +299,7 @@ item.show_all(); this._mainToolbar.insert(item, 2); - this._durationLabel = new Gtk.Label({ margin_left: 3 }); + this._durationLabel = new Gtk.Label({ margin_start: 3 }); item = new Gtk.ToolItem(); item.add(this._durationLabel); item.show_all(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/src/js/viewers/evince.js new/sushi-3.15.90/src/js/viewers/evince.js --- old/sushi-3.12.0/src/js/viewers/evince.js 2014-04-23 01:14:38.000000000 +0200 +++ new/sushi-3.15.90/src/js/viewers/evince.js 2014-11-20 18:17:19.000000000 +0100 @@ -114,8 +114,8 @@ }, _createLabelItem : function() { - this._pageLabel = new Gtk.Label({ margin_left: 10, - margin_right: 10 }); + this._pageLabel = new Gtk.Label({ margin_start: 10, + margin_end: 10 }); let item = new Gtk.ToolItem(); item.set_expand(true); @@ -133,12 +133,8 @@ this._toolbarActor = new GtkClutter.Actor({ contents: this._mainToolbar }); - let isRtl = (this._mainToolbar.get_direction() == Gtk.TextDirection.RTL); - let prevIconName = isRtl ? 'go-previous-rtl-symbolic' : 'go-previous-symbolic'; - let nextIconName = isRtl ? 'go-next-rtl-symbolic' : 'go-next-symbolic'; - this._toolbarBack = new Gtk.ToolButton({ expand: false, - icon_name: prevIconName }); + icon_name: 'go-previous-symbolic' }); this._toolbarBack.show(); this._mainToolbar.insert(this._toolbarBack, -1); @@ -151,7 +147,7 @@ this._mainToolbar.insert(labelItem, -1); this._toolbarForward = new Gtk.ToolButton({ expand: false, - icon_name: nextIconName }); + icon_name: 'go-next-symbolic' }); this._toolbarForward.show(); this._mainToolbar.insert(this._toolbarForward, -1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/src/js/viewers/gst.js new/sushi-3.15.90/src/js/viewers/gst.js --- old/sushi-3.12.0/src/js/viewers/gst.js 2014-04-23 01:14:38.000000000 +0200 +++ new/sushi-3.15.90/src/js/viewers/gst.js 2014-11-20 18:17:19.000000000 +0100 @@ -129,9 +129,7 @@ this._toolbarPlay.set_icon_name('media-playback-pause-symbolic'); else { - let iconName = - (this._toolbarPlay.get_direction() == Gtk.TextDirection.RTL) ? - 'media-playback-start-rtl-symbolic' : 'media-playback-start-symbolic'; + let iconName = 'media-playback-start-symbolic'; this._toolbarPlay.set_icon_name(iconName); } }, @@ -161,8 +159,8 @@ this._toolbarPlay.show(); this._mainToolbar.insert(this._toolbarPlay, 0); - this._currentLabel = new Gtk.Label({ margin_left: 6, - margin_right: 3 }); + this._currentLabel = new Gtk.Label({ margin_start: 6, + margin_end: 3 }); let item = new Gtk.ToolItem(); item.add(this._currentLabel); item.show_all(); @@ -191,8 +189,8 @@ item.show_all(); this._mainToolbar.insert(item, 2); - this._durationLabel = new Gtk.Label({ margin_left: 3, - margin_right: 6 }); + this._durationLabel = new Gtk.Label({ margin_start: 3, + margin_end: 6 }); item = new Gtk.ToolItem(); item.add(this._durationLabel); item.show_all(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/src/js/viewers/html.js new/sushi-3.15.90/src/js/viewers/html.js --- old/sushi-3.12.0/src/js/viewers/html.js 2014-04-23 01:14:38.000000000 +0200 +++ new/sushi-3.15.90/src/js/viewers/html.js 2014-11-20 18:40:33.000000000 +0100 @@ -26,7 +26,7 @@ const GtkClutter = imports.gi.GtkClutter; const Gtk = imports.gi.Gtk; const GLib = imports.gi.GLib; -const WebKit = imports.gi.WebKit; +const WebKit = imports.gi.WebKit2; const Sushi = imports.gi.Sushi; const MimeHandler = imports.ui.mimeHandler; @@ -47,18 +47,16 @@ this._file = file; this._callback = callback; - this._webView = WebKit.WebView.new(); - this._scrolledWin = Gtk.ScrolledWindow.new (null, null); - this._scrolledWin.add(this._webView); - this._scrolledWin.show_all(); + this._webView = new WebKit.WebView(); + this._webView.show_all(); /* disable the default context menu of the web view */ - let settings = this._webView.settings; - settings.enable_default_context_menu = false; + this._webView.connect ("context-menu", + function() {return true;}); this._webView.load_uri(file.get_uri()); - this._actor = new GtkClutter.Actor({ contents: this._scrolledWin }); + this._actor = new GtkClutter.Actor({ contents: this._webView }); this._actor.set_reactive(true); this._callback(); @@ -92,7 +90,7 @@ return this._toolbarActor; } -} +}; let handler = new MimeHandler.MimeHandler(); let renderer = new HTMLRenderer(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sushi-3.12.0/src/libsushi/sushi-font-loader.c new/sushi-3.15.90/src/libsushi/sushi-font-loader.c --- old/sushi-3.12.0/src/libsushi/sushi-font-loader.c 2014-04-23 01:14:38.000000000 +0200 +++ new/sushi-3.15.90/src/libsushi/sushi-font-loader.c 2015-01-19 23:23:18.000000000 +0100 @@ -35,7 +35,6 @@ FT_Library library; FT_Long face_index; GFile *file; - GSimpleAsyncResult *result; gchar *face_contents; gsize face_length; @@ -52,11 +51,6 @@ job->library = library; job->face_index = 0; job->file = g_file_new_for_uri (uri); - job->result = g_simple_async_result_new - (NULL, callback, user_data, - sushi_new_ft_face_from_uri_async); - - g_simple_async_result_set_op_res_gpointer (job->result, job, NULL); return job; } @@ -64,7 +58,6 @@ static void font_load_job_free (FontLoadJob *job) { - g_clear_object (&job->result); g_clear_object (&job->file); g_slice_free (FontLoadJob, job); @@ -99,17 +92,6 @@ return retval; } -static gboolean -font_load_job_callback (gpointer user_data) -{ - FontLoadJob *job = user_data; - - g_simple_async_result_complete (job->result); - font_load_job_free (job); - - return FALSE; -} - static void font_load_job_do_load (FontLoadJob *job, GError **error) @@ -126,10 +108,11 @@ } } -static gboolean -font_load_job (GIOSchedulerJob *sched_job, - GCancellable *cancellable, - gpointer user_data) +static void +font_load_job (GTask *task, + gpointer source_object, + gpointer user_data, + GCancellable *cancellable) { FontLoadJob *job = user_data; GError *error = NULL; @@ -137,13 +120,9 @@ font_load_job_do_load (job, &error); if (error != NULL) - g_simple_async_result_take_error (job->result, error); - - g_io_scheduler_job_send_to_mainloop_async (sched_job, - font_load_job_callback, - job, NULL); - - return FALSE; + g_task_return_error (task, error); + else + g_task_return_boolean (task, TRUE); } /** @@ -184,10 +163,12 @@ gpointer user_data) { FontLoadJob *job = font_load_job_new (library, uri, callback, user_data); - g_io_scheduler_push_job (font_load_job, - job, NULL, - G_PRIORITY_DEFAULT, - NULL); + GTask *task; + + task = g_task_new (NULL, NULL, callback, user_data); + g_task_set_task_data (task, job, (GDestroyNotify) font_load_job_free); + g_task_run_in_thread (task, font_load_job); + g_object_unref (task); } /** @@ -201,11 +182,10 @@ { FontLoadJob *job; - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), - error)) + if (!g_task_propagate_boolean (G_TASK (result), error)) return NULL; - job = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result)); + job = g_task_get_task_data (G_TASK (result)); return create_face_from_contents (job, contents, error); }
