Hello community, here is the log from the commit of package sushi for openSUSE:Factory checked in at 2014-05-05 21:16:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-09-27 18:30:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sushi.new/sushi.changes 2014-05-05 21:18:17.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Apr 24 07:15:14 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.12.0: + + Updated translations. + +------------------------------------------------------------------- +Thu Feb 20 10:04:33 UTC 2014 - zaitor@opensuse.org + +- Update to version 3.11.90: + + Fix compatibility with js24-based GJS. + + Update for E4X removal. + + Update FSF address. +- Drop sushi-e4x-removal.patch: Fixed upstream. + +------------------------------------------------------------------- +Thu Feb 13 21:54:06 UTC 2014 - dimstar@opensuse.org + +- Add sushi-e4x-removal.patch: Stringify the xml definitions for + E4X removal. + +------------------------------------------------------------------- Old: ---- sushi-3.10.0.tar.xz New: ---- sushi-3.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sushi.spec ++++++ --- /var/tmp/diff_new_pack.sO5hH3/_old 2014-05-05 21:18:18.000000000 +0200 +++ /var/tmp/diff_new_pack.sO5hH3/_new 2014-05-05 21:18:18.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sushi # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products 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.10.0 +Version: 3.12.0 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.10/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/sushi/3.12/%{name}-%{version}.tar.xz BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: unoconv ++++++ sushi-3.10.0.tar.xz -> sushi-3.12.0.tar.xz ++++++ ++++ 2149 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.10.0/NEWS new/sushi-3.12.0/NEWS --- old/sushi-3.10.0/NEWS 2013-09-24 12:16:21.000000000 +0200 +++ new/sushi-3.12.0/NEWS 2014-04-23 01:48:46.000000000 +0200 @@ -1,3 +1,15 @@ +3.12.0 - "Hippie Hill" +====================== + +- Translation updates + +3.11.90 - "Bandoliers" +====================== + +- Fix compatibility with js24-based GJS +- Update for E4X removal (Dominique Leuenberger, Tim Lunn) +- Update FSF address (Daniel Mustieles) + 3.10.0 ====== 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.10.0/configure.ac new/sushi-3.12.0/configure.ac --- old/sushi-3.10.0/configure.ac 2013-09-24 12:16:36.000000000 +0200 +++ new/sushi-3.12.0/configure.ac 2014-04-23 01:48:55.000000000 +0200 @@ -1,6 +1,6 @@ dnl -*- mode: m4 -*- AC_PREREQ(2.63) -AC_INIT([sushi],[3.10.0],[],[sushi]) +AC_INIT([sushi],[3.12.0],[],[sushi]) AC_CONFIG_HEADERS([config/config.h]) AC_CONFIG_SRCDIR([src/main.c]) 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.10.0/m4/libtool.m4 new/sushi-3.12.0/m4/libtool.m4 --- old/sushi-3.10.0/m4/libtool.m4 2013-09-24 12:17:42.000000000 +0200 +++ new/sushi-3.12.0/m4/libtool.m4 2014-04-23 01:15:54.000000000 +0200 @@ -1324,7 +1324,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" @@ -1688,7 +1695,8 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$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 @@ -2512,17 +2520,6 @@ 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 @@ -2639,7 +2636,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -2669,14 +2666,10 @@ # 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="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2688,6 +2681,18 @@ 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 @@ -3247,10 +3252,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3289,11 +3290,11 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) 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 @@ -4041,7 +4042,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4105,7 +4106,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4340,7 +4341,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4582,6 +4583,9 @@ ;; 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' ;; @@ -4644,6 +4648,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4865,7 +4872,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5042,6 +5049,7 @@ 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 @@ -5346,7 +5354,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) 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 @@ -6226,9 +6234,6 @@ _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 @@ -6390,7 +6395,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | 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.10.0/po/eu.po new/sushi-3.12.0/po/eu.po --- old/sushi-3.10.0/po/eu.po 2013-05-14 06:24:39.000000000 +0200 +++ new/sushi-3.12.0/po/eu.po 2014-04-23 01:14:38.000000000 +0200 @@ -2,13 +2,14 @@ # Copyright (C) 2011 sushi's COPYRIGHT HOLDER # This file is distributed under the same license as the sushi package. # Julen Ruiz Aizpuru <julenx@gmail.com>, 2011, 2013. -# Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2013. +# Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: sushi master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-01 09:29+0100\n" -"PO-Revision-Date: 2013-02-28 22:49+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=sushi&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2014-03-25 12:02+0000\n" +"PO-Revision-Date: 2014-03-25 21:25+0100\n" "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n" "Language-Team: Basque <itzulpena@euskalgnu.org>\n" "Language: eu\n" @@ -16,7 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.4\n" "X-Project-Style: gnome\n" #: ../data/org.gnome.sushi.gschema.xml.in.h:1 @@ -27,35 +28,36 @@ msgid "Whether the window draws WM decorations itself" msgstr "Leihoak leiho-kudeatzailearen dekorazioak marraztuko dituen edo ez" -#: ../src/js/ui/fallbackRenderer.js:120 +#: ../src/js/ui/fallbackRenderer.js:121 msgid "Type" msgstr "Mota" -#: ../src/js/ui/fallbackRenderer.js:121 ../src/js/ui/fallbackRenderer.js:130 -#: ../src/js/ui/fallbackRenderer.js:136 ../src/js/ui/spinnerBox.js:57 +#: ../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 "Kargatzen..." -#: ../src/js/ui/fallbackRenderer.js:129 +#: ../src/js/ui/fallbackRenderer.js:130 msgid "Size" msgstr "Tamaina" -#: ../src/js/ui/fallbackRenderer.js:135 +#: ../src/js/ui/fallbackRenderer.js:136 msgid "Modified" msgstr "Aldatuta" -#: ../src/js/viewers/audio.js:172 +#: ../src/js/viewers/audio.js:173 msgid "from" msgstr "albuma" -#: ../src/js/viewers/audio.js:174 +#: ../src/js/viewers/audio.js:175 msgid "by" msgstr "artista" -#: ../src/js/viewers/evince.js:78 -#, c-format +#: ../src/js/viewers/evince.js:79 +#, javascript-format +#| msgid "%d of %d" msgid "%d of %d" -msgstr "%2$d / %1$d" +msgstr "%d / %d" #: ../src/libsushi/sushi-file-loader.c:639 #, c-format @@ -67,3 +69,4 @@ #: ../src/libsushi/sushi-file-loader.c:651 msgid "Empty Folder" msgstr "Karpeta hutsa" + 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.10.0/po/kn.po new/sushi-3.12.0/po/kn.po --- old/sushi-3.10.0/po/kn.po 2013-01-02 12:20:46.000000000 +0100 +++ new/sushi-3.12.0/po/kn.po 2014-04-23 01:14:38.000000000 +0200 @@ -1,22 +1,22 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Shankar Prasad <svenkate@redhat.com>, 2012. msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=sushi&keywords=I18N+L10N&component=general\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=" +"sushi&keywords=I18N+L10N&component=general\n" "POT-Creation-Date: 2012-12-07 15:01+0000\n" -"PO-Revision-Date: 2012-12-10 22:51+0530\n" +"PO-Revision-Date: 2012-12-10 12:21-0500\n" "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n" "Language-Team: Kannada <kde-i18n-doc@kde.org>\n" -"Language: kn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: kn\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Zanata 3.2.3\n" #: ../data/org.gnome.sushi.gschema.xml.in.h:1 msgid "Client decoration" @@ -30,8 +30,10 @@ msgid "Type" msgstr "ಬಗೆ" -#: ../src/js/ui/fallbackRenderer.js:121 ../src/js/ui/fallbackRenderer.js:130 -#: ../src/js/ui/fallbackRenderer.js:136 ../src/js/ui/spinnerBox.js:57 +#: ../src/js/ui/fallbackRenderer.js:121 +#: ../src/js/ui/fallbackRenderer.js:130 +#: ../src/js/ui/fallbackRenderer.js:136 +#: ../src/js/ui/spinnerBox.js:57 msgid "Loading..." msgstr "ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..." @@ -51,7 +53,7 @@ msgid "by" msgstr "ಯಲ್ಲಿ" -#: ../src/js/viewers/evince.js:79 +#: ../src/js/viewers/evince.js:78 #, c-format msgid "%d of %d" msgstr "%d, %d ರಲ್ಲಿ" @@ -66,4 +68,3 @@ #: ../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.10.0/po/tg.po new/sushi-3.12.0/po/tg.po --- old/sushi-3.10.0/po/tg.po 2013-05-14 06:24:39.000000000 +0200 +++ new/sushi-3.12.0/po/tg.po 2014-04-23 01:14:38.000000000 +0200 @@ -8,8 +8,8 @@ "Project-Id-Version: Tajik Gnome\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=sushi&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-01-14 16:27+0000\n" -"PO-Revision-Date: 2013-01-21 18:06+0500\n" +"POT-Creation-Date: 2013-07-21 16:21+0000\n" +"PO-Revision-Date: 2013-10-10 13:01+0500\n" "Last-Translator: Victor Ibragimov <victor.ibragimov@gmail.com>\n" "Language-Team: \n" "Language: tg\n" @@ -17,15 +17,15 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.5.7\n" #: ../data/org.gnome.sushi.gschema.xml.in.h:1 msgid "Client decoration" -msgstr "" +msgstr "Ороиши муштарӣ" #: ../data/org.gnome.sushi.gschema.xml.in.h:2 msgid "Whether the window draws WM decorations itself" -msgstr "" +msgstr "Интихоби ороиши худкор барои равзана" #: ../src/js/ui/fallbackRenderer.js:120 msgid "Type" @@ -57,12 +57,12 @@ msgid "%d of %d" msgstr "%d аз %d" -#: ../src/libsushi/sushi-file-loader.c:639 +#: ../src/libsushi/sushi-file-loader.c:641 #, c-format msgid "%d item" msgid_plural "%d items" msgstr[0] "%d объект" -#: ../src/libsushi/sushi-file-loader.c:651 +#: ../src/libsushi/sushi-file-loader.c:653 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.10.0/src/js/ui/application.js new/sushi-3.12.0/src/js/ui/application.js --- old/sushi-3.10.0/src/js/ui/application.js 2012-10-24 02:24:13.000000000 +0200 +++ new/sushi-3.12.0/src/js/ui/application.js 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This @@ -41,15 +39,17 @@ const SUSHI_DBUS_PATH = '/org/gnome/NautilusPreviewer'; const SUSHI_DBUS_NAME = 'org.gnome.NautilusPreviewer'; -const SushiIface = <interface name={SUSHI_DBUS_NAME}> -<method name="ShowFile"> - <arg type="s" direction="in" name="uri" /> - <arg type="i" direction="in" name="xid" /> - <arg type="b" direction="in" name="closeIfAlreadyShown" /> -</method> -<method name="Close"> -</method> -</interface>; +const SushiIface = '<node> \ +<interface name="org.gnome.NautilusPreviewer"> \ +<method name="ShowFile"> \ + <arg type="s" direction="in" name="uri" /> \ + <arg type="i" direction="in" name="xid" /> \ + <arg type="b" direction="in" name="closeIfAlreadyShown" /> \ +</method> \ +<method name="Close"> \ +</method> \ +</interface> \ +</node>'; const Application = new Lang.Class({ Name: 'Application', 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.10.0/src/js/ui/fallbackRenderer.js new/sushi-3.12.0/src/js/ui/fallbackRenderer.js --- old/sushi-3.10.0/src/js/ui/fallbackRenderer.js 2012-08-06 19:33:00.000000000 +0200 +++ new/sushi-3.12.0/src/js/ui/fallbackRenderer.js 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This @@ -25,14 +23,17 @@ * */ -let Gtk = imports.gi.Gtk; -let Sushi = imports.gi.Sushi; +const Gio = imports.gi.Gio; +const Gtk = imports.gi.Gtk; +const GtkClutter = imports.gi.GtkClutter; +const Sushi = imports.gi.Sushi; + +const Gettext = imports.gettext.domain('sushi'); +const _ = Gettext.gettext; +const Lang = imports.lang; -let Gettext = imports.gettext.domain('sushi'); -let _ = Gettext.gettext; - -let Constants = imports.util.constants; -let Utils = imports.ui.utils; +const Constants = imports.util.constants; +const Utils = imports.ui.utils; function FallbackRenderer(args) { this._init(args); @@ -146,8 +147,6 @@ if (this._fileLoader.icon) this._image.set_from_pixbuf(this._fileLoader.icon); - else - this._setImageFromType(); this._applyLabels(); this._mainWindow.refreshSize(); 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.10.0/src/js/ui/main.js new/sushi-3.12.0/src/js/ui/main.js --- old/sushi-3.10.0/src/js/ui/main.js 2012-08-06 19:33:00.000000000 +0200 +++ new/sushi-3.12.0/src/js/ui/main.js 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/js/ui/mainWindow.js new/sushi-3.12.0/src/js/ui/mainWindow.js --- old/sushi-3.10.0/src/js/ui/mainWindow.js 2012-10-24 02:24:13.000000000 +0200 +++ new/sushi-3.12.0/src/js/ui/mainWindow.js 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This @@ -25,6 +23,7 @@ * */ +const Gio = imports.gi.Gio; const GLib = imports.gi.GLib; const GObject = imports.gi.GObject; const Gdk = imports.gi.Gdk; @@ -317,6 +316,7 @@ this._pendingRenderer.prepare(file, this, Lang.bind(this, this._onRendererPrepared)); } catch(e) { /* FIXME: report the error */ + logError(e, 'Error calling prepare() on viewer'); }})); }, 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.10.0/src/js/ui/mimeHandler.js new/sushi-3.12.0/src/js/ui/mimeHandler.js --- old/sushi-3.10.0/src/js/ui/mimeHandler.js 2012-08-06 19:33:00.000000000 +0200 +++ new/sushi-3.12.0/src/js/ui/mimeHandler.js 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This @@ -27,7 +25,7 @@ const FallbackRenderer = imports.ui.fallbackRenderer; -let Gio = imports.gi.Gio; +const Gio = imports.gi.Gio; let _mimeHandler = null; @@ -58,7 +56,7 @@ }, registerMimeTypes: function(mimeTypes, obj) { - for (idx in mimeTypes) + for (let idx in mimeTypes) this.registerMime(mimeTypes[idx], obj); }, @@ -70,7 +68,7 @@ /* if this fails, try to see if we have any handlers * registered for a parent type. */ - for (key in this._mimeTypes) { + for (let key in this._mimeTypes) { if (Gio.content_type_is_a (mime, key)) return this._mimeTypes[key]; } 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.10.0/src/js/ui/spinnerBox.js new/sushi-3.12.0/src/js/ui/spinnerBox.js --- old/sushi-3.10.0/src/js/ui/spinnerBox.js 2012-04-10 12:53:53.000000000 +0200 +++ new/sushi-3.12.0/src/js/ui/spinnerBox.js 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This @@ -25,11 +23,14 @@ * */ -let Clutter = imports.gi.Clutter; -let Gtk = imports.gi.Gtk; - -let Tweener = imports.ui.tweener; -let Mainloop = imports.mainloop; +const Gettext = imports.gettext.domain('sushi'); +const _ = Gettext.gettext; +const Gtk = imports.gi.Gtk; +const GtkClutter = imports.gi.GtkClutter; + +const Tweener = imports.ui.tweener; +const Lang = imports.lang; +const Mainloop = imports.mainloop; let SPINNER_SIZE = 48; let TIMEOUT = 500; @@ -108,4 +109,4 @@ transition: 'easeOutQuad' }); }, -} \ No newline at end of file +} 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.10.0/src/js/ui/tweener.js new/sushi-3.12.0/src/js/ui/tweener.js --- old/sushi-3.10.0/src/js/ui/tweener.js 2011-08-16 23:17:55.000000000 +0200 +++ new/sushi-3.12.0/src/js/ui/tweener.js 2014-04-23 01:14:38.000000000 +0200 @@ -14,9 +14,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/js/ui/utils.js new/sushi-3.12.0/src/js/ui/utils.js --- old/sushi-3.10.0/src/js/ui/utils.js 2012-08-06 19:33:00.000000000 +0200 +++ new/sushi-3.12.0/src/js/ui/utils.js 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This @@ -25,7 +23,12 @@ * */ -let Constants = imports.util.constants; +const Gdk = imports.gi.Gdk; +const Gtk = imports.gi.Gtk; + +const Lang = imports.lang; + +const Constants = imports.util.constants; let slowDownFactor = 0; 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.10.0/src/js/util/constants.js new/sushi-3.12.0/src/js/util/constants.js --- old/sushi-3.10.0/src/js/util/constants.js 2012-08-06 19:33:00.000000000 +0200 +++ new/sushi-3.12.0/src/js/util/constants.js 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/js/util/format.js new/sushi-3.12.0/src/js/util/format.js --- old/sushi-3.10.0/src/js/util/format.js 2011-08-16 23:17:55.000000000 +0200 +++ new/sushi-3.12.0/src/js/util/format.js 2014-04-23 01:14:38.000000000 +0200 @@ -14,9 +14,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/js/util/path.js.in new/sushi-3.12.0/src/js/util/path.js.in --- old/sushi-3.10.0/src/js/util/path.js.in 2012-08-06 19:33:00.000000000 +0200 +++ new/sushi-3.12.0/src/js/util/path.js.in 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/js/viewers/audio.js new/sushi-3.12.0/src/js/viewers/audio.js --- old/sushi-3.10.0/src/js/viewers/audio.js 2013-09-01 01:54:29.000000000 +0200 +++ new/sushi-3.12.0/src/js/viewers/audio.js 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This @@ -25,17 +23,20 @@ * */ -let MimeHandler = imports.ui.mimeHandler; -let Gst = imports.gi.Gst; -let Gio = imports.gi.Gio; +const Gio = imports.gi.Gio; +const Gst = imports.gi.Gst; +const Gtk = imports.gi.Gtk; +const GtkClutter = imports.gi.GtkClutter; +const Sushi = imports.gi.Sushi; -let Gettext = imports.gettext.domain('sushi'); -let _ = Gettext.gettext; +const Gettext = imports.gettext.domain('sushi'); +const _ = Gettext.gettext; +const Lang = imports.lang; -let Constants = imports.util.constants; -let TotemMimeTypes = imports.util.totemMimeTypes; - -let Utils = imports.ui.utils; +const Constants = imports.util.constants; +const MimeHandler = imports.ui.mimeHandler; +const TotemMimeTypes = imports.util.totemMimeTypes; +const Utils = imports.ui.utils; function AudioRenderer(args) { this._init(args); 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.10.0/src/js/viewers/evince.js new/sushi-3.12.0/src/js/viewers/evince.js --- old/sushi-3.10.0/src/js/viewers/evince.js 2013-09-01 01:54:29.000000000 +0200 +++ new/sushi-3.12.0/src/js/viewers/evince.js 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This @@ -25,16 +23,19 @@ * */ -let MimeHandler = imports.ui.mimeHandler; -let EvDoc = imports.gi.EvinceDocument; -let EvView = imports.gi.EvinceView; +const EvDoc = imports.gi.EvinceDocument; +const EvView = imports.gi.EvinceView; +const Gtk = imports.gi.Gtk; +const GtkClutter = imports.gi.GtkClutter; +const Sushi = imports.gi.Sushi; -let Sushi = imports.gi.Sushi; +const Gettext = imports.gettext.domain('sushi'); +const _ = Gettext.gettext; +const Lang = imports.lang; -let Gettext = imports.gettext.domain('sushi'); -let _ = Gettext.gettext; - -let Utils = imports.ui.utils; +const Constants = imports.util.constants; +const MimeHandler = imports.ui.mimeHandler; +const Utils = imports.ui.utils; function EvinceRenderer(args) { this._init(args); 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.10.0/src/js/viewers/font.js new/sushi-3.12.0/src/js/viewers/font.js --- old/sushi-3.10.0/src/js/viewers/font.js 2013-05-14 06:24:39.000000000 +0200 +++ new/sushi-3.12.0/src/js/viewers/font.js 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This @@ -25,12 +23,15 @@ * */ -let MimeHandler = imports.ui.mimeHandler; -let GtkClutter = imports.gi.GtkClutter; -let Gtk = imports.gi.Gtk; -let GLib = imports.gi.GLib; +const MimeHandler = imports.ui.mimeHandler; +const Utils = imports.ui.utils; -let Sushi = imports.gi.Sushi; +const Lang = imports.lang; + +const GtkClutter = imports.gi.GtkClutter; +const Gtk = imports.gi.Gtk; +const GLib = imports.gi.GLib; +const Sushi = imports.gi.Sushi; function FontRenderer(args) { this._init(args); 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.10.0/src/js/viewers/gst.js new/sushi-3.12.0/src/js/viewers/gst.js --- old/sushi-3.10.0/src/js/viewers/gst.js 2013-09-01 01:54:29.000000000 +0200 +++ new/sushi-3.12.0/src/js/viewers/gst.js 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This @@ -26,18 +24,19 @@ */ imports.gi.versions.ClutterGst = '2.0'; -let ClutterGst = imports.gi.ClutterGst; +const ClutterGst = imports.gi.ClutterGst; +const Clutter = imports.gi.Clutter; +const Gdk = imports.gi.Gdk; +const GObject = imports.gi.GObject; +const Gtk = imports.gi.Gtk; +const GtkClutter = imports.gi.GtkClutter; -let MimeHandler = imports.ui.mimeHandler; -let Clutter = imports.gi.Clutter; -let Gdk = imports.gi.Gdk; -let GObject = imports.gi.GObject; +const Lang = imports.lang; -let Lang = imports.lang; - -let Utils = imports.ui.utils; -let Constants = imports.util.constants; -let TotemMimeTypes = imports.util.totemMimeTypes; +const Constants = imports.util.constants; +const MimeHandler = imports.ui.mimeHandler; +const TotemMimeTypes = imports.util.totemMimeTypes; +const Utils = imports.ui.utils; function GstRenderer(args) { this._init(args); 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.10.0/src/js/viewers/html.js new/sushi-3.12.0/src/js/viewers/html.js --- old/sushi-3.10.0/src/js/viewers/html.js 2012-08-06 19:33:00.000000000 +0200 +++ new/sushi-3.12.0/src/js/viewers/html.js 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This @@ -25,15 +23,14 @@ * */ -let MimeHandler = imports.ui.mimeHandler; -let GtkClutter = imports.gi.GtkClutter; -let Gtk = imports.gi.Gtk; -let GLib = imports.gi.GLib; -let WebKit = imports.gi.WebKit; +const GtkClutter = imports.gi.GtkClutter; +const Gtk = imports.gi.Gtk; +const GLib = imports.gi.GLib; +const WebKit = imports.gi.WebKit; +const Sushi = imports.gi.Sushi; -let Sushi = imports.gi.Sushi; - -let Utils = imports.ui.utils; +const MimeHandler = imports.ui.mimeHandler; +const Utils = imports.ui.utils; function HTMLRenderer(args) { this._init(args); 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.10.0/src/js/viewers/image.js new/sushi-3.12.0/src/js/viewers/image.js --- old/sushi-3.10.0/src/js/viewers/image.js 2012-08-06 19:33:00.000000000 +0200 +++ new/sushi-3.12.0/src/js/viewers/image.js 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This @@ -25,16 +23,17 @@ * */ -let MimeHandler = imports.ui.mimeHandler; -let GdkPixbuf = imports.gi.GdkPixbuf; -let GtkClutter = imports.gi.GtkClutter; -let Gtk = imports.gi.Gtk; -let GLib = imports.gi.GLib; +const GdkPixbuf = imports.gi.GdkPixbuf; +const GtkClutter = imports.gi.GtkClutter; +const Gtk = imports.gi.Gtk; +const GLib = imports.gi.GLib; + +const Gettext = imports.gettext.domain('sushi'); +const _ = Gettext.gettext; +const Lang = imports.lang; -let Gettext = imports.gettext.domain('sushi'); -let _ = Gettext.gettext; - -let Utils = imports.ui.utils; +const MimeHandler = imports.ui.mimeHandler; +const Utils = imports.ui.utils; function ImageRenderer(args) { this._init(args); @@ -118,7 +117,7 @@ let renderer = new ImageRenderer(); let formats = GdkPixbuf.Pixbuf.get_formats(); -for (idx in formats) { +for (let idx in formats) { let mimeTypes = formats[idx].get_mime_types(); handler.registerMimeTypes(mimeTypes, renderer); } 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.10.0/src/js/viewers/text.js new/sushi-3.12.0/src/js/viewers/text.js --- old/sushi-3.10.0/src/js/viewers/text.js 2012-08-06 19:33:00.000000000 +0200 +++ new/sushi-3.12.0/src/js/viewers/text.js 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This @@ -25,16 +23,17 @@ * */ -let MimeHandler = imports.ui.mimeHandler; -let GtkClutter = imports.gi.GtkClutter; -let Gtk = imports.gi.Gtk; -let GLib = imports.gi.GLib; -let GtkSource = imports.gi.GtkSource; -let Gio = imports.gi.Gio; +const GtkClutter = imports.gi.GtkClutter; +const Gtk = imports.gi.Gtk; +const GLib = imports.gi.GLib; +const GtkSource = imports.gi.GtkSource; +const Gio = imports.gi.Gio; +const Sushi = imports.gi.Sushi; -let Sushi = imports.gi.Sushi; +const MimeHandler = imports.ui.mimeHandler; +const Utils = imports.ui.utils; -let Utils = imports.ui.utils; +const Lang = imports.lang; function TextRenderer(args) { this._init(args); @@ -60,7 +59,7 @@ let schemaName = 'org.gnome.gedit.preferences.editor'; let installedSchemas = Gio.Settings.list_schemas(); if (installedSchemas.indexOf(schemaName) > -1) { - let geditSettings = new Gio.Settings({ schema: schema_name }); + let geditSettings = new Gio.Settings({ schema: schemaName }); let geditSchemeName = geditSettings.get_string('scheme'); if (geditSchemeName != '') this._geditScheme = geditSchemeName; 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.10.0/src/libsushi/sushi-cover-art.c new/sushi-3.12.0/src/libsushi/sushi-cover-art.c --- old/sushi-3.10.0/src/libsushi/sushi-cover-art.c 2012-10-24 02:24:13.000000000 +0200 +++ new/sushi-3.12.0/src/libsushi/sushi-cover-art.c 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/libsushi/sushi-cover-art.h new/sushi-3.12.0/src/libsushi/sushi-cover-art.h --- old/sushi-3.10.0/src/libsushi/sushi-cover-art.h 2011-08-16 23:17:55.000000000 +0200 +++ new/sushi-3.12.0/src/libsushi/sushi-cover-art.h 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/libsushi/sushi-file-loader.c new/sushi-3.12.0/src/libsushi/sushi-file-loader.c --- old/sushi-3.10.0/src/libsushi/sushi-file-loader.c 2013-09-01 01:54:29.000000000 +0200 +++ new/sushi-3.12.0/src/libsushi/sushi-file-loader.c 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/libsushi/sushi-file-loader.h new/sushi-3.12.0/src/libsushi/sushi-file-loader.h --- old/sushi-3.10.0/src/libsushi/sushi-file-loader.h 2012-08-06 19:33:00.000000000 +0200 +++ new/sushi-3.12.0/src/libsushi/sushi-file-loader.h 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/libsushi/sushi-font-loader.c new/sushi-3.12.0/src/libsushi/sushi-font-loader.c --- old/sushi-3.10.0/src/libsushi/sushi-font-loader.c 2013-01-02 12:20:46.000000000 +0100 +++ new/sushi-3.12.0/src/libsushi/sushi-font-loader.c 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/libsushi/sushi-font-loader.h new/sushi-3.12.0/src/libsushi/sushi-font-loader.h --- old/sushi-3.10.0/src/libsushi/sushi-font-loader.h 2012-08-06 19:33:00.000000000 +0200 +++ new/sushi-3.12.0/src/libsushi/sushi-font-loader.h 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/libsushi/sushi-font-widget.c new/sushi-3.12.0/src/libsushi/sushi-font-widget.c --- old/sushi-3.10.0/src/libsushi/sushi-font-widget.c 2013-05-14 06:24:39.000000000 +0200 +++ new/sushi-3.12.0/src/libsushi/sushi-font-widget.c 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/libsushi/sushi-font-widget.h new/sushi-3.12.0/src/libsushi/sushi-font-widget.h --- old/sushi-3.10.0/src/libsushi/sushi-font-widget.h 2013-01-02 12:20:46.000000000 +0100 +++ new/sushi-3.12.0/src/libsushi/sushi-font-widget.h 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/libsushi/sushi-pdf-loader.c new/sushi-3.12.0/src/libsushi/sushi-pdf-loader.c --- old/sushi-3.10.0/src/libsushi/sushi-pdf-loader.c 2013-05-14 06:24:39.000000000 +0200 +++ new/sushi-3.12.0/src/libsushi/sushi-pdf-loader.c 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/libsushi/sushi-pdf-loader.h new/sushi-3.12.0/src/libsushi/sushi-pdf-loader.h --- old/sushi-3.10.0/src/libsushi/sushi-pdf-loader.h 2011-08-16 23:17:55.000000000 +0200 +++ new/sushi-3.12.0/src/libsushi/sushi-pdf-loader.h 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/libsushi/sushi-sound-player.c new/sushi-3.12.0/src/libsushi/sushi-sound-player.c --- old/sushi-3.10.0/src/libsushi/sushi-sound-player.c 2012-10-24 02:24:13.000000000 +0200 +++ new/sushi-3.12.0/src/libsushi/sushi-sound-player.c 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/libsushi/sushi-sound-player.h new/sushi-3.12.0/src/libsushi/sushi-sound-player.h --- old/sushi-3.10.0/src/libsushi/sushi-sound-player.h 2011-08-16 23:17:55.000000000 +0200 +++ new/sushi-3.12.0/src/libsushi/sushi-sound-player.h 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/libsushi/sushi-text-loader.c new/sushi-3.12.0/src/libsushi/sushi-text-loader.c --- old/sushi-3.10.0/src/libsushi/sushi-text-loader.c 2013-01-02 12:20:46.000000000 +0100 +++ new/sushi-3.12.0/src/libsushi/sushi-text-loader.c 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/libsushi/sushi-text-loader.h new/sushi-3.12.0/src/libsushi/sushi-text-loader.h --- old/sushi-3.10.0/src/libsushi/sushi-text-loader.h 2011-08-16 23:17:55.000000000 +0200 +++ new/sushi-3.12.0/src/libsushi/sushi-text-loader.h 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/libsushi/sushi-utils.c new/sushi-3.12.0/src/libsushi/sushi-utils.c --- old/sushi-3.10.0/src/libsushi/sushi-utils.c 2012-04-10 12:53:53.000000000 +0200 +++ new/sushi-3.12.0/src/libsushi/sushi-utils.c 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/libsushi/sushi-utils.h new/sushi-3.12.0/src/libsushi/sushi-utils.h --- old/sushi-3.10.0/src/libsushi/sushi-utils.h 2011-08-16 23:17:55.000000000 +0200 +++ new/sushi-3.12.0/src/libsushi/sushi-utils.h 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This 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.10.0/src/main.c new/sushi-3.12.0/src/main.c --- old/sushi-3.10.0/src/main.c 2012-08-06 19:33:00.000000000 +0200 +++ new/sushi-3.12.0/src/main.c 2014-04-23 01:14:38.000000000 +0200 @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * The Sushi project hereby grant permission for non-gpl compatible GStreamer * plugins to be used and distributed together with GStreamer and Sushi. This -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org