Hello community, here is the log from the commit of package sushi for openSUSE:Factory checked in at 2013-04-05 17:29:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sushi (Old) and /work/SRC/openSUSE:Factory/.sushi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sushi", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/sushi/sushi.changes 2012-11-25 14:25:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sushi.new/sushi.changes 2013-04-05 17:29:14.000000000 +0200 @@ -1,0 +2,39 @@ +Mon Mar 25 15:51:47 UTC 2013 - dims...@opensuse.org + +- Update to version 3.8.0: + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 5 09:45:38 UTC 2013 - dims...@opensuse.org + +- Update to version 3.7.91: + + Call gtk_render_background when drawing SushiFontWidget. + + Updated translations. + +------------------------------------------------------------------- +Fri Feb 8 14:49:34 UTC 2013 - dims...@opensuse.org + +- Update to version 3.7.5: + + Use a better padding for the font preview. + + Remove custom CSS styling for SushiFontWidget. + + Fix the build with automake 1.13. + +------------------------------------------------------------------- +Mon Jan 14 18:11:32 UTC 2013 - zai...@opensuse.org + +- Update to version 3.7.4: + + Use PackageKit to install unoconv if not detected at runtime. + + Drop gjs-dbus dependency. + + Updated translations. +- Drop pkgconfig(gjs-dbus-1.0) BuildRequires, no longer needed. + +------------------------------------------------------------------- +Tue Jan 8 11:32:49 UTC 2013 - dims...@opensuse.org + +- Update to version 3.7.3: + + Use the single-include header for GtkSourceView. + + Add some convenience functions to SushiFontWidget. + + Use a better error message in SushiFontLoader. + + Updated translations. + +------------------------------------------------------------------- Old: ---- sushi-3.6.1.tar.xz New: ---- sushi-3.8.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sushi.spec ++++++ --- /var/tmp/diff_new_pack.HfIdNT/_old 2013-04-05 17:29:16.000000000 +0200 +++ /var/tmp/diff_new_pack.HfIdNT/_new 2013-04-05 17:29:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sushi # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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.6.1 +Version: 3.8.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.6/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/sushi/3.8/%{name}-%{version}.tar.xz BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: unoconv @@ -35,7 +35,6 @@ BuildRequires: pkgconfig(evince-view-3.0) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gjs-1.0) -BuildRequires: pkgconfig(gjs-dbus-1.0) BuildRequires: pkgconfig(glib-2.0) >= 2.29.14 BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-pbutils-1.0) ++++++ sushi-3.6.1.tar.xz -> sushi-3.8.0.tar.xz ++++++ ++++ 2751 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.6.1/NEWS new/sushi-3.8.0/NEWS --- old/sushi-3.6.1/NEWS 2012-11-12 23:01:30.000000000 +0100 +++ new/sushi-3.8.0/NEWS 2013-03-25 16:25:32.000000000 +0100 @@ -1,8 +1,36 @@ -3.6.1 -===== +3.8.0 - "Bla" +============= - Translation updates +3.7.91 - "Asleep" +================= + +- Call gtk_render_background when drawing SushiFontWidget +- Translation updates + +3.7.5 - "It's a New Day" +======================== + +- Use a better padding for the font preview +- Remove custom CSS styling for SushiFontWidget +- Fix the build with automake 1.13 (Nuno Araujo) + +3.7.4 - "Wilderness" +==================== + +- Use PackageKit to install unoconv if not detected at runtime +- Drop gjs-dbus dependency (Rico Tzschichholz) +- Translation updates + +3.7.3 - "Invisible" +=================== + +- Use the single-include header for GtkSourceView (Ryan Lortie) +- Add some convenience functions to SushiFontWidget +- Use a better error message in SushiFontLoader +- Translation updates + 3.6.0 - "Laughing" ================== 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.6.1/configure.ac new/sushi-3.8.0/configure.ac --- old/sushi-3.6.1/configure.ac 2012-11-12 23:02:16.000000000 +0100 +++ new/sushi-3.8.0/configure.ac 2013-03-25 16:25:43.000000000 +0100 @@ -1,8 +1,8 @@ dnl -*- mode: m4 -*- AC_PREREQ(2.63) -AC_INIT([sushi],[3.6.1],[],[sushi]) +AC_INIT([sushi],[3.8.0],[],[sushi]) -AM_CONFIG_HEADER(config/config.h) +AC_CONFIG_HEADERS([config/config.h]) AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([config]) @@ -51,18 +51,17 @@ CLUTTER_MIN_VERSION=1.11.4 GLIB_MIN_VERSION=2.29.14 -GTK_MIN_VERSION=3.0.0 -GJS_MIN_VERSION=0.7.7 +GTK_MIN_VERSION=3.4.0 +GJS_MIN_VERSION=1.34.0 CLUTTER_GTK_MIN_VERSION=1.0.1 GOBJECT_INTROSPECTION_MIN_VERSION=0.9.6 -GDK_PIXBUF_MIN_VERSION=2.22.1 +GDK_PIXBUF_MIN_VERSION=2.23.0 PKG_CHECK_MODULES(SUSHI, freetype2 glib-2.0 >= $GLIB_MIN_VERSION gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION gjs-1.0 >= $GJS_MIN_VERSION - gjs-dbus-1.0 >= $GJS_MIN_VERSION gobject-2.0 >= $GLIB_MIN_VERSION clutter-1.0 >= $CLUTTER_MIN_VERSION clutter-x11-1.0 >= $CLUTTER_MIN_VERSION @@ -81,15 +80,6 @@ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` AC_SUBST(GLIB_MKENUMS) -AC_PATH_PROG(UNOCONV, unoconv, 0) -if test x$UNOCONV = x0; then - HAVE_UNOCONV=0 -else - HAVE_UNOCONV=1 -fi - -AC_SUBST(HAVE_UNOCONV) - AC_CONFIG_FILES([ Makefile src/Makefile 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.6.1/data/style/gtk-style.css new/sushi-3.8.0/data/style/gtk-style.css --- old/sushi-3.6.1/data/style/gtk-style.css 2012-09-20 22:35:45.000000000 +0200 +++ new/sushi-3.8.0/data/style/gtk-style.css 2013-03-05 00:18:27.000000000 +0100 @@ -6,16 +6,16 @@ color: @np_fg_color; } -SushiFontWidget { - padding: 2px; -} - GtkSourceView { color: @np_text_color; background-color: shade (@np_fg_color, 1.10); font: Monospace 10; } +SushiFontWidget { + background-color: transparent; +} + .scrollbar.slider, .scrollbar.button { background-color: shade (@np_bg_color, 1.30); 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.6.1/po/LINGUAS new/sushi-3.8.0/po/LINGUAS --- old/sushi-3.6.1/po/LINGUAS 2012-11-12 23:01:06.000000000 +0100 +++ new/sushi-3.8.0/po/LINGUAS 2013-03-25 16:22:44.000000000 +0100 @@ -20,6 +20,7 @@ fa fi fr +fur gl gu he @@ -28,6 +29,7 @@ id it ja +kn ko lt lv @@ -48,6 +50,7 @@ sv ta te +tg th tr uk 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.6.1/po/eu.po new/sushi-3.8.0/po/eu.po --- old/sushi-3.6.1/po/eu.po 2011-09-26 16:31:28.000000000 +0200 +++ new/sushi-3.8.0/po/eu.po 2013-03-04 23:31:28.000000000 +0100 @@ -1,61 +1,69 @@ # Basque translation for sushi. # Copyright (C) 2011 sushi's COPYRIGHT HOLDER # This file is distributed under the same license as the sushi package. -# Julen Ruiz Aizpuru <jul...@gmail.com>, 2011. +# Julen Ruiz Aizpuru <jul...@gmail.com>, 2011, 2013. +# Iñaki Larrañaga Murgoitio <doo...@zundan.com>, 2013. msgid "" msgstr "" "Project-Id-Version: sushi master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-24 10:34+0200\n" -"PO-Revision-Date: 2011-09-23 16:39+0200\n" -"Last-Translator: Julen Ruiz Aizpuru <jul...@gmail.com>\n" -"Language-Team: librez...@librezale.org\n" +"POT-Creation-Date: 2013-03-01 09:29+0100\n" +"PO-Revision-Date: 2013-02-28 22:49+0100\n" +"Last-Translator: Iñaki Larrañaga Murgoitio <doo...@zundan.com>\n" +"Language-Team: Basque <itzulp...@euskalgnu.org>\n" "Language: eu\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" -"X-Generator: Virtaal 0.7.1-beta1\n" +"X-Generator: Lokalize 1.0\n" "X-Project-Style: gnome\n" -#: ../src/libsushi/sushi-file-loader.c:641 -#, c-format -msgid "%d item" -msgid_plural "%d items" -msgstr[0] "elementu %d" -msgstr[1] "%d elementu" - -#: ../src/libsushi/sushi-file-loader.c:653 -msgid "Empty Folder" -msgstr "Karpeta hutsa" +#: ../data/org.gnome.sushi.gschema.xml.in.h:1 +msgid "Client decoration" +msgstr "Bezeroaren dekorazioa" + +#: ../data/org.gnome.sushi.gschema.xml.in.h:2 +msgid "Whether the window draws WM decorations itself" +msgstr "Leihoak leiho-kudeatzailearen dekorazioak marraztuko dituen edo ez" #: ../src/js/ui/fallbackRenderer.js:120 msgid "Type" msgstr "Mota" -#: ../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:121 ../src/js/ui/fallbackRenderer.js:130 +#: ../src/js/ui/fallbackRenderer.js:136 ../src/js/ui/spinnerBox.js:57 msgid "Loading..." msgstr "Kargatzen..." -#: ../src/js/ui/fallbackRenderer.js:125 ../src/js/viewers/folder.js:126 +#: ../src/js/ui/fallbackRenderer.js:129 msgid "Size" msgstr "Tamaina" -#: ../src/js/ui/fallbackRenderer.js:130 ../src/js/viewers/folder.js:131 +#: ../src/js/ui/fallbackRenderer.js:135 msgid "Modified" msgstr "Aldatuta" -#: ../src/js/viewers/audio.js:163 +#: ../src/js/viewers/audio.js:172 msgid "from" msgstr "albuma" -#: ../src/js/viewers/audio.js:165 +#: ../src/js/viewers/audio.js:174 msgid "by" msgstr "artista" -#: ../src/js/viewers/evince.js:75 +#: ../src/js/viewers/evince.js:78 #, c-format msgid "%d of %d" msgstr "%2$d / %1$d" + +#: ../src/libsushi/sushi-file-loader.c:639 +#, c-format +msgid "%d item" +msgid_plural "%d items" +msgstr[0] "elementu %d" +msgstr[1] "%d elementu" + +#: ../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.6.1/po/fur.po new/sushi-3.8.0/po/fur.po --- old/sushi-3.6.1/po/fur.po 1970-01-01 01:00:00.000000000 +0100 +++ new/sushi-3.8.0/po/fur.po 2013-01-14 16:47:49.000000000 +0100 @@ -0,0 +1,68 @@ +# Friulian translation for sushi. +# Copyright (C) 2012 sushi's COPYRIGHT HOLDER +# This file is distributed under the same license as the sushi package. +# TmTFx <f.t.pub...@gmail.com>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: sushi gnome-3-6\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-10 17:29+0000\n" +"PO-Revision-Date: 2012-12-28 14:29+0100\n" +"Last-Translator: TmTFx <f.t.pub...@gmail.com>\n" +"Language-Team: Friulian <f...@li.org>\n" +"Language: fur\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" + +#: ../data/org.gnome.sushi.gschema.xml.in.h:1 +msgid "Client decoration" +msgstr "Decorazion Client" + +#: ../data/org.gnome.sushi.gschema.xml.in.h:2 +msgid "Whether the window draws WM decorations itself" +msgstr "Se il barcon al disegne di besôl lis decorazions dal WM" + +#: ../src/js/ui/fallbackRenderer.js:120 +msgid "Type" +msgstr "Gjenar" + +#: ../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 "Cjariament..." + +#: ../src/js/ui/fallbackRenderer.js:129 +msgid "Size" +msgstr "Dimension" + +#: ../src/js/ui/fallbackRenderer.js:135 +msgid "Modified" +msgstr "Modificât" + +#: ../src/js/viewers/audio.js:172 +msgid "from" +msgstr "di" + +#: ../src/js/viewers/audio.js:174 +msgid "by" +msgstr "di" + +#: ../src/js/viewers/evince.js:79 +#, c-format +msgid "%d of %d" +msgstr "%d di %d" + +#: ../src/libsushi/sushi-file-loader.c:639 +#, c-format +msgid "%d item" +msgid_plural "%d items" +msgstr[0] "%d element" +msgstr[1] "%d elements" + +#: ../src/libsushi/sushi-file-loader.c:651 +msgid "Empty Folder" +msgstr "Cartele Vueide" 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.6.1/po/kn.po new/sushi-3.8.0/po/kn.po --- old/sushi-3.6.1/po/kn.po 1970-01-01 01:00:00.000000000 +0100 +++ new/sushi-3.8.0/po/kn.po 2012-12-17 16:16:51.000000000 +0100 @@ -0,0 +1,69 @@ +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Shankar Prasad <svenk...@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" +"POT-Creation-Date: 2012-12-07 15:01+0000\n" +"PO-Revision-Date: 2012-12-10 22:51+0530\n" +"Last-Translator: Shankar Prasad <svenk...@redhat.com>\n" +"Language-Team: Kannada <kde-i18n-...@kde.org>\n" +"Language: kn\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" +"X-Generator: Lokalize 1.5\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 "ಕಿಟಕಿಯು ತಾನಾಗಿಯೆ WM ಅಲಂಕಾರಗಳನ್ನು ರಚಿಸಿಕೊಳ್ಳುತ್ತದೆಯೆ" + +#: ../src/js/ui/fallbackRenderer.js:120 +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 +msgid "Loading..." +msgstr "ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..." + +#: ../src/js/ui/fallbackRenderer.js:129 +msgid "Size" +msgstr "ಗಾತ್ರ" + +#: ../src/js/ui/fallbackRenderer.js:135 +msgid "Modified" +msgstr "ಮಾರ್ಪಡಿಸಲಾಗಿದ್ದು" + +#: ../src/js/viewers/audio.js:172 +msgid "from" +msgstr "ಇಂದ" + +#: ../src/js/viewers/audio.js:174 +msgid "by" +msgstr "ಯಲ್ಲಿ" + +#: ../src/js/viewers/evince.js:79 +#, c-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 ಅಂಶ" +msgstr[1] "%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.6.1/po/nl.po new/sushi-3.8.0/po/nl.po --- old/sushi-3.6.1/po/nl.po 2011-09-19 17:25:03.000000000 +0200 +++ new/sushi-3.8.0/po/nl.po 2013-03-25 16:22:44.000000000 +0100 @@ -2,14 +2,14 @@ # # This file is distributed under the same license as the sushi package. # -# Wouter Bolsterlee <wbols...@gnome.org>, 2011 +# Wouter Bolsterlee <wbols...@gnome.org>, 2011‒2013 # msgid "" msgstr "" "Project-Id-Version: Sushi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-06 00:53+0200\n" -"PO-Revision-Date: 2011-09-06 00:51+0200\n" +"POT-Creation-Date: 2013-03-23 23:43+0100\n" +"PO-Revision-Date: 2013-03-23 23:42+0100\n" "Last-Translator: Wouter Bolsterlee <wbols...@gnome.org>\n" "Language-Team: Dutch <vertal...@vrijschrift.org>\n" "Language: \n" @@ -18,44 +18,51 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/libsushi/sushi-file-loader.c:641 -#, c-format -msgid "%d item" -msgid_plural "%d items" -msgstr[0] "%d item" -msgstr[1] "%d items" - -#: ../src/libsushi/sushi-file-loader.c:653 -msgid "Empty Folder" -msgstr "Lege map" +#: ../data/org.gnome.sushi.gschema.xml.in.h:1 +msgid "Client decoration" +msgstr "Vensterdecoratie" + +#: ../data/org.gnome.sushi.gschema.xml.in.h:2 +msgid "Whether the window draws WM decorations itself" +msgstr "Geeft aan of het venster de eigen vensterdecoratie moet tekenen" #: ../src/js/ui/fallbackRenderer.js:120 msgid "Type" msgstr "Type" -#: ../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:121 ../src/js/ui/fallbackRenderer.js:130 +#: ../src/js/ui/fallbackRenderer.js:136 ../src/js/ui/spinnerBox.js:57 msgid "Loading..." msgstr "Laden…" -#: ../src/js/ui/fallbackRenderer.js:125 ../src/js/viewers/folder.js:126 +#: ../src/js/ui/fallbackRenderer.js:129 msgid "Size" msgstr "Grootte" -#: ../src/js/ui/fallbackRenderer.js:130 ../src/js/viewers/folder.js:131 +#: ../src/js/ui/fallbackRenderer.js:135 msgid "Modified" msgstr "Gewijzigd" -#: ../src/js/viewers/audio.js:163 +#: ../src/js/viewers/audio.js:172 msgid "from" msgstr "van" -#: ../src/js/viewers/audio.js:165 +#: ../src/js/viewers/audio.js:174 msgid "by" msgstr "door" -#: ../src/js/viewers/evince.js:75 +#: ../src/js/viewers/evince.js:78 #, c-format msgid "%d of %d" msgstr "%d van %d" + +#: ../src/libsushi/sushi-file-loader.c:639 +#, c-format +msgid "%d item" +msgid_plural "%d items" +msgstr[0] "%d item" +msgstr[1] "%d items" + +#: ../src/libsushi/sushi-file-loader.c:651 +msgid "Empty Folder" +msgstr "Lege map" 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.6.1/po/or.po new/sushi-3.8.0/po/or.po --- old/sushi-3.6.1/po/or.po 2011-09-19 17:25:03.000000000 +0200 +++ new/sushi-3.8.0/po/or.po 2012-11-30 16:25:15.000000000 +0100 @@ -2,62 +2,69 @@ # Copyright (C) 2011 sushi's COPYRIGHT HOLDER # This file is distributed under the same license as the sushi package. # -# Manoj Kumar Giri <mg...@redhat.com>, 2011. +# Manoj Kumar Giri <mg...@redhat.com>, 2011, 2012. 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: 2011-09-08 16:56+0000\n" -"PO-Revision-Date: 2011-09-09 11:01+0530\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; +"product=sushi&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-09-25 23:14+0000\n" +"PO-Revision-Date: 2012-11-28 17:53+0530\n" "Last-Translator: Manoj Kumar Giri <mg...@redhat.com>\n" -"Language-Team: Oriya <o...@li.org>\n" +"Language-Team: Oriya <oriya...@googlegroups.com>\n" +"Language: or\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: or\n" -"X-Generator: Lokalize 1.2\n" - -#: ../src/libsushi/sushi-file-loader.c:641 -#, c-format -msgid "%d item" -msgid_plural "%d items" -msgstr[0] "%d ବସ୍ତୁ" -msgstr[1] "%d ବସ୍ତୁଗୁଡ଼ିକ" +"X-Generator: Lokalize 1.5\n" -#: ../src/libsushi/sushi-file-loader.c:653 -msgid "Empty Folder" -msgstr "ଖାଲି ଫୋଲଡର" +#: ../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 "ୱିଣ୍ଡୋ WM ଆଭୁଷଣକୁ ନିଜେ ଅଙ୍କନ କରିଥାଏ କି" #: ../src/js/ui/fallbackRenderer.js:120 msgid "Type" msgstr "ପ୍ରକାର" -#: ../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:121 ../src/js/ui/fallbackRenderer.js:130 +#: ../src/js/ui/fallbackRenderer.js:136 ../src/js/ui/spinnerBox.js:57 msgid "Loading..." msgstr "ଧାରଣ କରୁଅଛି..." -#: ../src/js/ui/fallbackRenderer.js:125 ../src/js/viewers/folder.js:126 +#: ../src/js/ui/fallbackRenderer.js:129 msgid "Size" msgstr "ଆକାର" -#: ../src/js/ui/fallbackRenderer.js:130 ../src/js/viewers/folder.js:131 +#: ../src/js/ui/fallbackRenderer.js:135 msgid "Modified" msgstr "ପରିବର୍ତ୍ତିତ" -#: ../src/js/viewers/audio.js:163 +#: ../src/js/viewers/audio.js:172 msgid "from" msgstr "ଠାରୁ" -#: ../src/js/viewers/audio.js:165 +#: ../src/js/viewers/audio.js:174 msgid "by" msgstr "ଦ୍ବାରା" -#: ../src/js/viewers/evince.js:75 +#: ../src/js/viewers/evince.js:79 #, c-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 ବସ୍ତୁ" +msgstr[1] "%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.6.1/po/pt.po new/sushi-3.8.0/po/pt.po --- old/sushi-3.6.1/po/pt.po 2012-09-20 22:44:32.000000000 +0200 +++ new/sushi-3.8.0/po/pt.po 2013-03-19 10:41:17.000000000 +0100 @@ -1,14 +1,14 @@ -# sushi's Portuguese translation. -# Copyright © 2011, 2012 sushi -# This file is distributed under the same license as the sushi package. -# Duarte Loreto <happyguy...@hotmail.com>, 2011, 2012. -# +# sushi's Portuguese translation. +# Copyright © 2011, 2012, 2013 sushi +# This file is distributed under the same license as the sushi package. +# Duarte Loreto <happyguy...@hotmail.com>, 2011, 2012, 2013. +# msgid "" msgstr "" -"Project-Id-Version: 3.6\n" +"Project-Id-Version: 3.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-01 01:49+0100\n" -"PO-Revision-Date: 2012-09-01 01:50+0000\n" +"POT-Creation-Date: 2013-03-17 00:32+0000\n" +"PO-Revision-Date: 2013-03-17 00:35+0000\n" "Last-Translator: Duarte Loreto <happyguy...@hotmail.com>\n" "Language-Team: Portuguese <gnome...@yahoogroups.com>\n" "Language: pt\n" @@ -50,7 +50,7 @@ msgid "by" msgstr "por" -#: ../src/js/viewers/evince.js:79 +#: ../src/js/viewers/evince.js:78 #, c-format msgid "%d of %d" msgstr "%d de %d" 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.6.1/po/sk.po new/sushi-3.8.0/po/sk.po --- old/sushi-3.6.1/po/sk.po 2012-11-12 23:01:06.000000000 +0100 +++ new/sushi-3.8.0/po/sk.po 2012-11-30 16:25:15.000000000 +0100 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: sushi\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; -"product=sushi&keywords=I18N+L10N&component=general\n" +"product=sushi&keywords=I18N+L10N&component=general\n" "POT-Creation-Date: 2012-09-29 09:48+0000\n" "PO-Revision-Date: 2012-10-05 23:36+0100\n" "Last-Translator: Stanislav Kubík <stanislavkubik.h...@gmail.com>\n" "Language-Team: Slovak <gnome-sk-l...@gnome.org>\n" +"Language: Slovenčina\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" "X-Generator: Poedit 1.5.3\n" -"Language: Slovenčina\n" #: ../data/org.gnome.sushi.gschema.xml.in.h:1 msgid "Client decoration" 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.6.1/po/tg.po new/sushi-3.8.0/po/tg.po --- old/sushi-3.6.1/po/tg.po 1970-01-01 01:00:00.000000000 +0100 +++ new/sushi-3.8.0/po/tg.po 2013-03-25 16:22:44.000000000 +0100 @@ -0,0 +1,68 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Victor Ibragimov <victor.ibragi...@gmail.com>, 2013. +# +msgid "" +msgstr "" +"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" +"Last-Translator: Victor Ibragimov <victor.ibragi...@gmail.com>\n" +"Language-Team: \n" +"Language: tg\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.5.4\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:120 +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 +msgid "Loading..." +msgstr "Бор шуда истодааст..." + +#: ../src/js/ui/fallbackRenderer.js:129 +msgid "Size" +msgstr "Андоза" + +#: ../src/js/ui/fallbackRenderer.js:135 +msgid "Modified" +msgstr "Тағйирёфта" + +#: ../src/js/viewers/audio.js:172 +msgid "from" +msgstr "аз" + +#: ../src/js/viewers/audio.js:174 +msgid "by" +msgstr "бо" + +#: ../src/js/viewers/evince.js:78 +#, c-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.6.1/po/ug.po new/sushi-3.8.0/po/ug.po --- old/sushi-3.6.1/po/ug.po 2012-02-29 14:45:57.000000000 +0100 +++ new/sushi-3.8.0/po/ug.po 2013-02-06 20:20:52.000000000 +0100 @@ -7,52 +7,60 @@ msgstr "" "Project-Id-Version: sushi\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=sushi&keywords=I18N+L10N&component=general\n"; -"POT-Creation-Date: 2012-01-28 16:52+0000\n" -"PO-Revision-Date: 2011-07-05 14:13+0900\n" -"Last-Translator: Sahran <sah...@live.com>\n" +"POT-Creation-Date: 2012-12-07 14:53+0000\n" +"PO-Revision-Date: 2013-01-27 13:34+0900\n" +"Last-Translator: Gheyret Kenji <ghey...@gmail.com>\n" "Language-Team: Uyghur Computer Science Association <u...@yahoogroups.com>\n" +"Language: \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" -#: ../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:653 -msgid "Empty Folder" -msgstr "بوش قىسقۇچ" +#: ../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 "WM بېزەكلىرىنى كۆزنەك ئۆزى سىزامدۇ" #: ../src/js/ui/fallbackRenderer.js:120 msgid "Type" msgstr "تىپى" -#: ../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:121 ../src/js/ui/fallbackRenderer.js:130 +#: ../src/js/ui/fallbackRenderer.js:136 ../src/js/ui/spinnerBox.js:57 msgid "Loading..." -msgstr "يۈكلەۋاتىدۇ…" +msgstr "ئوقۇۋاتىدۇ…" -#: ../src/js/ui/fallbackRenderer.js:125 ../src/js/viewers/folder.js:126 +#: ../src/js/ui/fallbackRenderer.js:129 msgid "Size" msgstr "چوڭلۇقى" -#: ../src/js/ui/fallbackRenderer.js:130 ../src/js/viewers/folder.js:131 +#: ../src/js/ui/fallbackRenderer.js:135 msgid "Modified" msgstr "ئۆزگەرتىلدى" -#: ../src/js/viewers/audio.js:163 +#: ../src/js/viewers/audio.js:172 msgid "from" msgstr "ئەۋەتكۈچى" -#: ../src/js/viewers/audio.js:165 +#: ../src/js/viewers/audio.js:174 msgid "by" msgstr "ئارىلىق" -#: ../src/js/viewers/evince.js:75 +#: ../src/js/viewers/evince.js:79 #, c-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.6.1/src/Makefile-js.am new/sushi-3.8.0/src/Makefile-js.am --- old/sushi-3.6.1/src/Makefile-js.am 2012-09-20 22:35:45.000000000 +0200 +++ new/sushi-3.8.0/src/Makefile-js.am 2013-01-14 17:16:53.000000000 +0100 @@ -26,7 +26,6 @@ js/util/totemMimeTypes.js jsutil_built_sources = \ - $(srcdir)/js/util/features.js \ $(srcdir)/js/util/path.js BUILT_SOURCES += $(jsutil_built_sources) @@ -34,9 +33,6 @@ js/util/path.js: Makefile js/util/path.js.in $(AM_V_GEN) $(do_subst) $(srcdir)/js/util/path.js.in > $@ -js/util/features.js: Makefile js/util/features.js.in - $(AM_V_GEN) $(do_subst) $(srcdir)/js/util/features.js.in > $@ - nodist_jsutil_DATA = \ $(jsutil_built_sources) @@ -44,5 +40,4 @@ $(BUILT_SOURCES) EXTRA_DIST += \ - js/util/features.js.in \ js/util/path.js.in 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.6.1/src/js/util/features.js.in new/sushi-3.8.0/src/js/util/features.js.in --- old/sushi-3.6.1/src/js/util/features.js.in 2012-09-20 22:33:42.000000000 +0200 +++ new/sushi-3.8.0/src/js/util/features.js.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2011 Red Hat, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * 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. - * - * The Sushi project hereby grant permission for non-gpl compatible GStreamer - * plugins to be used and distributed together with GStreamer and Sushi. This - * permission is above and beyond the permissions granted by the GPL license - * Sushi is covered by. - * - * Authors: Cosimo Cecchi <cosi...@redhat.com> - * - */ - -let HAVE_UNOCONV = @have_unoconv@; \ 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.6.1/src/js/viewers/evince.js new/sushi-3.8.0/src/js/viewers/evince.js --- old/sushi-3.6.1/src/js/viewers/evince.js 2012-09-20 22:33:42.000000000 +0200 +++ new/sushi-3.8.0/src/js/viewers/evince.js 2013-01-14 17:16:53.000000000 +0100 @@ -35,7 +35,6 @@ let _ = Gettext.gettext; let Utils = imports.ui.utils; -let Features = imports.util.features; function EvinceRenderer(args) { this._init(args); @@ -181,16 +180,14 @@ let mimeTypes = Sushi.query_supported_document_types(); handler.registerMimeTypes(mimeTypes, renderer); -if (Features.HAVE_UNOCONV) { - let officeTypes = [ - 'application/vnd.oasis.opendocument.text', - 'application/vnd.oasis.opendocument.presentation', - 'application/vnd.oasis.opendocument.spreadsheet', - 'application/msword', - 'application/vnd.ms-excel', - 'application/vnd.ms-powerpoint', - 'application/rtf' - ]; +let officeTypes = [ + 'application/vnd.oasis.opendocument.text', + 'application/vnd.oasis.opendocument.presentation', + 'application/vnd.oasis.opendocument.spreadsheet', + 'application/msword', + 'application/vnd.ms-excel', + 'application/vnd.ms-powerpoint', + 'application/rtf' +]; - handler.registerMimeTypes(officeTypes, renderer); -} +handler.registerMimeTypes(officeTypes, 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.6.1/src/js/viewers/font.js new/sushi-3.8.0/src/js/viewers/font.js --- old/sushi-3.6.1/src/js/viewers/font.js 2012-09-20 22:33:42.000000000 +0200 +++ new/sushi-3.8.0/src/js/viewers/font.js 2013-03-05 00:17:11.000000000 +0100 @@ -53,6 +53,7 @@ Lang.bind(this, this._onFontLoaded)); this._fontActor = new GtkClutter.Actor({ contents: this._fontWidget }); + Utils.alphaGtkWidget(this._fontActor.get_widget()); }, _onFontLoaded : function() { 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.6.1/src/libsushi/sushi-font-loader.c new/sushi-3.8.0/src/libsushi/sushi-font-loader.c --- old/sushi-3.6.1/src/libsushi/sushi-font-loader.c 2012-09-20 22:34:16.000000000 +0200 +++ new/sushi-3.8.0/src/libsushi/sushi-font-loader.c 2012-12-07 16:00:13.000000000 +0100 @@ -87,10 +87,13 @@ &retval); if (ft_error != 0) { - g_set_error_literal (error, G_IO_ERROR, 0, - "Unable to read the font face file"); + gchar *uri; + uri = g_file_get_uri (job->file); + g_set_error (error, G_IO_ERROR, 0, + "Unable to read the font face file '%s'", uri); retval = NULL; g_free (job->face_contents); + g_free (uri); } else { *contents = job->face_contents; } 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.6.1/src/libsushi/sushi-font-widget.c new/sushi-3.8.0/src/libsushi/sushi-font-widget.c --- old/sushi-3.6.1/src/libsushi/sushi-font-widget.c 2012-09-20 22:35:45.000000000 +0200 +++ new/sushi-3.8.0/src/libsushi/sushi-font-widget.c 2013-03-05 00:11:59.000000000 +0100 @@ -37,6 +37,7 @@ enum { LOADED, + ERROR, NUM_SIGNALS }; @@ -63,6 +64,7 @@ #define SURFACE_SIZE 4 #define SECTION_SPACING 16 +#define LINE_SPACING 2 static const gchar lowercase_text_stock[] = "abcdefghijklmnopqrstuvwxyz"; static const gchar uppercase_text_stock[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; @@ -94,7 +96,7 @@ if (pos_y != NULL) *pos_y += font_extents.ascent + font_extents.descent + - extents.y_advance + padding.top; + extents.y_advance + LINE_SPACING / 2; if (text_dir == GTK_TEXT_DIR_LTR) pos_x = padding.left; else { @@ -105,7 +107,7 @@ cairo_move_to (cr, pos_x, *pos_y); cairo_show_text (cr, text); - *pos_y += padding.bottom; + *pos_y += LINE_SPACING / 2; } static gboolean @@ -362,7 +364,7 @@ /* calculate size of pixmap to use */ pixmap_width = padding.left + padding.right; - pixmap_height = 0; + pixmap_height = padding.top + padding.bottom; font = cairo_ft_font_face_create_for_ft_face (face, 0); cairo_set_font_face (cr, font); @@ -373,7 +375,7 @@ cairo_font_extents (cr, &font_extents); cairo_text_extents (cr, self->priv->font_name, &extents); pixmap_height += font_extents.ascent + font_extents.descent + - extents.y_advance + padding.top + padding.bottom; + extents.y_advance + LINE_SPACING; pixmap_width = MAX (pixmap_width, extents.width + padding.left + padding.right); } @@ -384,21 +386,21 @@ if (self->priv->lowercase_text != NULL) { cairo_text_extents (cr, self->priv->lowercase_text, &extents); pixmap_height += font_extents.ascent + font_extents.descent + - extents.y_advance + padding.top + padding.bottom; + extents.y_advance + LINE_SPACING; pixmap_width = MAX (pixmap_width, extents.width + padding.left + padding.right); } if (self->priv->uppercase_text != NULL) { cairo_text_extents (cr, self->priv->uppercase_text, &extents); pixmap_height += font_extents.ascent + font_extents.descent + - extents.y_advance + padding.top + padding.bottom; + extents.y_advance + LINE_SPACING; pixmap_width = MAX (pixmap_width, extents.width + padding.left + padding.right); } if (self->priv->punctuation_text != NULL) { cairo_text_extents (cr, self->priv->punctuation_text, &extents); pixmap_height += font_extents.ascent + font_extents.descent + - extents.y_advance + padding.top + padding.bottom; + extents.y_advance + LINE_SPACING; pixmap_width = MAX (pixmap_width, extents.width + padding.left + padding.right); } @@ -410,7 +412,7 @@ cairo_font_extents (cr, &font_extents); cairo_text_extents (cr, self->priv->sample_string, &extents); pixmap_height += font_extents.ascent + font_extents.descent + - extents.y_advance + padding.top + padding.bottom; + extents.y_advance + LINE_SPACING; pixmap_width = MAX (pixmap_width, extents.width + padding.left + padding.right); if ((i == 7) && (min_height != NULL)) @@ -472,13 +474,20 @@ GdkRGBA color; GtkBorder padding; GtkStateFlags state; - gint allocated_height; + gint allocated_width, allocated_height; if (face == NULL) goto end; context = gtk_widget_get_style_context (drawing_area); state = gtk_style_context_get_state (context); + + allocated_width = gtk_widget_get_allocated_width (drawing_area); + allocated_height = gtk_widget_get_allocated_height (drawing_area); + + gtk_render_background (context, cr, + 0, 0, allocated_width, allocated_height); + gtk_style_context_get_color (context, state, &color); gtk_style_context_get_padding (context, state, &padding); @@ -490,8 +499,6 @@ cairo_set_font_face (cr, font); cairo_font_face_destroy (font); - allocated_height = gtk_widget_get_allocated_height (drawing_area); - /* draw text */ if (self->priv->font_name != NULL) { @@ -549,7 +556,7 @@ &error); if (error != NULL) { - /* FIXME: need to signal the error */ + g_signal_emit (self, signals[ERROR], 0, error->message); g_print ("Can't load the font face: %s\n", error->message); g_error_free (error); @@ -594,6 +601,9 @@ if (err != FT_Err_Ok) g_error ("Unable to initialize FreeType"); + + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (self)), + GTK_STYLE_CLASS_VIEW); } static void @@ -682,6 +692,13 @@ 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + signals[ERROR] = + g_signal_new ("error", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_FIRST, + 0, NULL, NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, G_TYPE_STRING); g_object_class_install_properties (oclass, NUM_PROPERTIES, properties); g_type_class_add_private (klass, sizeof (SushiFontWidgetPrivate)); @@ -704,3 +721,9 @@ { return self->priv->face; } + +const gchar * +sushi_font_widget_get_uri (SushiFontWidget *self) +{ + return self->priv->uri; +} 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.6.1/src/libsushi/sushi-font-widget.h new/sushi-3.8.0/src/libsushi/sushi-font-widget.h --- old/sushi-3.6.1/src/libsushi/sushi-font-widget.h 2012-09-20 22:33:42.000000000 +0200 +++ new/sushi-3.8.0/src/libsushi/sushi-font-widget.h 2013-03-05 00:07:59.000000000 +0100 @@ -63,6 +63,8 @@ FT_Face sushi_font_widget_get_ft_face (SushiFontWidget *self); +const gchar *sushi_font_widget_get_uri (SushiFontWidget *self); + G_END_DECLS #endif /* __SUSHI_FONT_WIDGET_H__ */ 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.6.1/src/libsushi/sushi-pdf-loader.c new/sushi-3.8.0/src/libsushi/sushi-pdf-loader.c --- old/sushi-3.6.1/src/libsushi/sushi-pdf-loader.c 2012-03-05 17:15:07.000000000 +0100 +++ new/sushi-3.8.0/src/libsushi/sushi-pdf-loader.c 2013-01-14 17:16:53.000000000 +0100 @@ -31,6 +31,7 @@ #include <evince-document.h> #include <evince-view.h> #include <glib/gstdio.h> +#include <gdk/gdkx.h> G_DEFINE_TYPE (SushiPdfLoader, sushi_pdf_loader, G_TYPE_OBJECT); @@ -39,6 +40,8 @@ PROP_URI }; +static void load_openoffice (SushiPdfLoader *self); + struct _SushiPdfLoaderPrivate { EvDocument *document; gchar *uri; @@ -80,6 +83,61 @@ } static void +openoffice_missing_unoconv_ready_cb (GObject *source, + GAsyncResult *res, + gpointer user_data) +{ + SushiPdfLoader *self = user_data; + GError *error = NULL; + + g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), res, &error); + if (error != NULL) { + GError *local_error; + + /* can't install unoconv with packagekit - nothing else we can do */ + /* FIXME: error reporting! */ + g_warning ("unoconv not found, and PackageKit failed to install it with error %s", + error->message); + return; + } + + /* now that we have unoconv installed, try again loading the document */ + load_openoffice (self); +} + +static void +openoffice_missing_unoconv (SushiPdfLoader *self) +{ + GApplication *app = g_application_get_default (); + GtkWidget *widget = GTK_WIDGET (gtk_application_get_active_window (GTK_APPLICATION (app))); + GDBusConnection *connection = g_application_get_dbus_connection (app); + guint xid = 0; + GdkWindow *gdk_window; + const gchar *unoconv_path[2]; + + gdk_window = gtk_widget_get_window (widget); + if (gdk_window != NULL) + xid = GDK_WINDOW_XID (gdk_window); + + unoconv_path[0] = "/usr/bin/unoconv"; + unoconv_path[1] = NULL; + + g_dbus_connection_call (connection, + "org.freedesktop.PackageKit", + "/org/freedesktop/PackageKit", + "org.freedesktop.PackageKit.Modify", + "InstallProvideFiles", + g_variant_new ("(u^ass)", + xid, + unoconv_path, + "hide-confirm-deps"), + NULL, G_DBUS_CALL_FLAGS_NONE, + G_MAXINT, NULL, + openoffice_missing_unoconv_ready_cb, + self); +} + +static void unoconv_child_watch_cb (GPid pid, gint status, gpointer user_data) @@ -111,6 +169,13 @@ GPid pid; gchar **argv = NULL; GError *error = NULL; + const gchar *unoconv_path; + + unoconv_path = g_find_program_in_path ("unoconv"); + if (unoconv_path == NULL) { + openoffice_missing_unoconv (self); + return; + } file = g_file_new_for_uri (self->priv->uri); doc_path = g_file_get_path (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.6.1/src/libsushi/sushi-text-loader.c new/sushi-3.8.0/src/libsushi/sushi-text-loader.c --- old/sushi-3.6.1/src/libsushi/sushi-text-loader.c 2011-07-26 16:50:43.000000000 +0200 +++ new/sushi-3.8.0/src/libsushi/sushi-text-loader.c 2012-11-30 16:25:15.000000000 +0100 @@ -27,8 +27,7 @@ #include "sushi-text-loader.h" -#include <gtksourceview/gtksourceview.h> -#include <gtksourceview/gtksourcelanguagemanager.h> +#include <gtksourceview/gtksource.h> #include <string.h> 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.6.1/src/sushi.in new/sushi-3.8.0/src/sushi.in --- old/sushi-3.6.1/src/sushi.in 2012-09-20 22:35:45.000000000 +0200 +++ new/sushi-3.8.0/src/sushi.in 2013-01-14 17:24:46.000000000 +0100 @@ -1,22 +1,8 @@ #!/bin/sh -if test x"$GJS_PATH" = x ; then - export GJS_PATH=@pkgdatadir@/js -else - export GJS_PATH=@pkgdatadir@/js:$GJS_PATH -fi - -if test x"$GI_TYPELIB_PATH" = x ; then - export GI_TYPELIB_PATH=@pkglibdir@/girepository-1.0 -else - export GI_TYPELIB_PATH=@pkglibdir@/girepository-1.0:$GI_TYPELIB_PATH -fi - -if test x"$LD_LIBRARY_PATH" = x ; then - export LD_LIBRARY_PATH=@pkglibdir@ -else - export LD_LIBRARY_PATH=@pkglibdir@:$LD_LIBRARY_PATH -fi +export GJS_PATH="@pkgdatadir@/js${GJS_PATH:+:$GJS_PATH}" +export GI_TYPELIB_PATH="@pkglibdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" +export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" if test x"$GJS_DEBUG_OUTPUT" = x ; then export GJS_DEBUG_OUTPUT=stderr -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
