Hello community,
here is the log from the commit of package sushi for openSUSE:Factory
checked in at Wed Aug 3 19:26:56 CEST 2011.
--------
--- sushi/sushi.changes 2011-07-09 14:33:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/sushi/sushi.changes 2011-07-27 12:17:57.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Jul 27 12:10:18 CEST 2011 - vuntz@opensuse.org
+
+- Update to version 0.0.5:
+ + Use "document-open-symbolic" for run/open toolbar buttons
+ + Require latest clutter-gtk to fix underallocations with GTK+
+ 3.1
+ + Use g_format_size() instead of g_format_size_for_display()
+ + Use the GTK+ dark theme
+ + UTF8-validate the text before inserting it into the buffer
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
sushi-0.0.4.tar.bz2
New:
----
sushi-0.0.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sushi.spec ++++++
--- /var/tmp/diff_new_pack.boGiDk/_old 2011-08-03 19:26:41.000000000 +0200
+++ /var/tmp/diff_new_pack.boGiDk/_new 2011-08-03 19:26:41.000000000 +0200
@@ -18,7 +18,7 @@
Name: sushi
-Version: 0.0.4
+Version: 0.0.5
Release: 1
License: GPLv2+
Summary: Quick Previewer for Nautilus
++++++ sushi-0.0.4.tar.bz2 -> sushi-0.0.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/aclocal.m4 new/sushi-0.0.5/aclocal.m4
--- old/sushi-0.0.4/aclocal.m4 2011-07-08 16:49:03.000000000 +0200
+++ new/sushi-0.0.5/aclocal.m4 2011-07-26 17:27:04.000000000 +0200
@@ -19,6 +19,259 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
+dnl -*- mode: autoconf -*-
+dnl Copyright 2009 Johan Dahlin
+dnl
+dnl This file is free software; the author(s) gives unlimited
+dnl permission to copy and/or distribute it, with or without
+dnl modifications, as long as this notice is preserved.
+dnl
+
+# serial 1
+
+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
+[
+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
+
+ dnl enable/disable introspection
+ m4_if([$2], [require],
+ [dnl
+ enable_introspection=yes
+ ],[dnl
+ AC_ARG_ENABLE(introspection,
+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
+ [Enable introspection for this build]),,
+ [enable_introspection=auto])
+ ])dnl
+
+ AC_MSG_CHECKING([for gobject-introspection])
+
+ dnl presence/version checking
+ AS_CASE([$enable_introspection],
+ [no], [dnl
+ found_introspection="no (disabled, use --enable-introspection to enable)"
+ ],dnl
+ [yes],[dnl
+ PKG_CHECK_EXISTS([gobject-introspection-1.0],,
+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
+ found_introspection=yes,
+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
+ ],dnl
+ [auto],[dnl
+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
+ ],dnl
+ [dnl
+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
+ ])dnl
+
+ AC_MSG_RESULT([$found_introspection])
+
+ INTROSPECTION_SCANNER=
+ INTROSPECTION_COMPILER=
+ INTROSPECTION_GENERATE=
+ INTROSPECTION_GIRDIR=
+ INTROSPECTION_TYPELIBDIR=
+ if test "x$found_introspection" = "xyes"; then
+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+ fi
+ AC_SUBST(INTROSPECTION_SCANNER)
+ AC_SUBST(INTROSPECTION_COMPILER)
+ AC_SUBST(INTROSPECTION_GENERATE)
+ AC_SUBST(INTROSPECTION_GIRDIR)
+ AC_SUBST(INTROSPECTION_TYPELIBDIR)
+ AC_SUBST(INTROSPECTION_CFLAGS)
+ AC_SUBST(INTROSPECTION_LIBS)
+ AC_SUBST(INTROSPECTION_MAKEFILE)
+
+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
+])
+
+
+dnl Usage:
+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
+
+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
+[
+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
+])
+
+dnl Usage:
+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
+
+
+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
+[
+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
+])
+
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+#
+# Copyright © 2004 Scott James Remnant .
+#
+# 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.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_default([$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ AC_MSG_RESULT([no])
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+ m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])
+ ])
+elif test $pkg_failed = untried; then
+ AC_MSG_RESULT([no])
+ m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see http://pkg-config.freedesktop.org/.])
+ ])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ $3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
@@ -1063,259 +1316,6 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-#
-# Copyright © 2004 Scott James Remnant .
-#
-# 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.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_default([$1], [0.9.0])
- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- PKG_CONFIG=""
- fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_default([$2], [:])
-m4_ifvaln([$3], [else
- $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- else
- pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
- AC_MSG_RESULT([no])
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
- else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
- m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])
- ])
-elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no])
- m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see http://pkg-config.freedesktop.org/.])
- ])
-else
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
- AC_MSG_RESULT([yes])
- $3
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-dnl -*- mode: autoconf -*-
-dnl Copyright 2009 Johan Dahlin
-dnl
-dnl This file is free software; the author(s) gives unlimited
-dnl permission to copy and/or distribute it, with or without
-dnl modifications, as long as this notice is preserved.
-dnl
-
-# serial 1
-
-m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-[
- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
- AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-
- dnl enable/disable introspection
- m4_if([$2], [require],
- [dnl
- enable_introspection=yes
- ],[dnl
- AC_ARG_ENABLE(introspection,
- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
- [Enable introspection for this build]),,
- [enable_introspection=auto])
- ])dnl
-
- AC_MSG_CHECKING([for gobject-introspection])
-
- dnl presence/version checking
- AS_CASE([$enable_introspection],
- [no], [dnl
- found_introspection="no (disabled, use --enable-introspection to enable)"
- ],dnl
- [yes],[dnl
- PKG_CHECK_EXISTS([gobject-introspection-1.0],,
- AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
- found_introspection=yes,
- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
- ],dnl
- [auto],[dnl
- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
- ],dnl
- [dnl
- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
- ])dnl
-
- AC_MSG_RESULT([$found_introspection])
-
- INTROSPECTION_SCANNER=
- INTROSPECTION_COMPILER=
- INTROSPECTION_GENERATE=
- INTROSPECTION_GIRDIR=
- INTROSPECTION_TYPELIBDIR=
- if test "x$found_introspection" = "xyes"; then
- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
- fi
- AC_SUBST(INTROSPECTION_SCANNER)
- AC_SUBST(INTROSPECTION_COMPILER)
- AC_SUBST(INTROSPECTION_GENERATE)
- AC_SUBST(INTROSPECTION_GIRDIR)
- AC_SUBST(INTROSPECTION_TYPELIBDIR)
- AC_SUBST(INTROSPECTION_CFLAGS)
- AC_SUBST(INTROSPECTION_LIBS)
- AC_SUBST(INTROSPECTION_MAKEFILE)
-
- AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-])
-
-
-dnl Usage:
-dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-
-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-[
- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-])
-
-dnl Usage:
-dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-
-
-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-[
- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-])
-
m4_include([m4/gettext.m4])
m4_include([m4/iconv.m4])
m4_include([m4/intlmacosx.m4])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/configure new/sushi-0.0.5/configure
--- old/sushi-0.0.4/configure 2011-07-08 16:49:04.000000000 +0200
+++ new/sushi-0.0.5/configure 2011-07-26 17:27:04.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for sushi 0.0.4.
+# Generated by GNU Autoconf 2.68 for sushi 0.0.5.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@
# Identity of this package.
PACKAGE_NAME='sushi'
PACKAGE_TARNAME='sushi'
-PACKAGE_VERSION='0.0.4'
-PACKAGE_STRING='sushi 0.0.4'
+PACKAGE_VERSION='0.0.5'
+PACKAGE_STRING='sushi 0.0.5'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1377,7 +1377,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sushi 0.0.4 to adapt to many kinds of systems.
+\`configure' configures sushi 0.0.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1448,7 +1448,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sushi 0.0.4:";;
+ short | recursive ) echo "Configuration of sushi 0.0.5:";;
esac
cat <<\_ACEOF
@@ -1571,7 +1571,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sushi configure 0.0.4
+sushi configure 0.0.5
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1970,7 +1970,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sushi $as_me 0.0.4, which was
+It was created by sushi $as_me 0.0.5, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2917,7 +2917,7 @@
# Define the identity of the package.
PACKAGE='sushi'
- VERSION='0.0.4'
+ VERSION='0.0.5'
cat >>confdefs.h <<_ACEOF
@@ -18710,7 +18710,7 @@
GLIB_MIN_VERSION=2.28.0
GTK_MIN_VERSION=3.0.0
GJS_MIN_VERSION=0.7.7
-CLUTTER_GTK_MIN_VERSION=0.91.8
+CLUTTER_GTK_MIN_VERSION=1.0.1
GOBJECT_INTROSPECTION_MIN_VERSION=0.9.6
GDK_PIXBUF_MIN_VERSION=2.22.1
@@ -19559,7 +19559,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by sushi $as_me 0.0.4, which was
+This file was extended by sushi $as_me 0.0.5, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19625,7 +19625,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-sushi config.status 0.0.4
+sushi config.status 0.0.5
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/configure.ac new/sushi-0.0.5/configure.ac
--- old/sushi-0.0.4/configure.ac 2011-07-08 16:48:58.000000000 +0200
+++ new/sushi-0.0.5/configure.ac 2011-07-26 17:24:39.000000000 +0200
@@ -1,6 +1,6 @@
dnl -*- mode: m4 -*-
AC_PREREQ(2.63)
-AC_INIT([sushi],[0.0.4],[],[sushi])
+AC_INIT([sushi],[0.0.5],[],[sushi])
AM_CONFIG_HEADER(config/config.h)
AC_CONFIG_SRCDIR([src/main.c])
@@ -51,7 +51,7 @@
GLIB_MIN_VERSION=2.28.0
GTK_MIN_VERSION=3.0.0
GJS_MIN_VERSION=0.7.7
-CLUTTER_GTK_MIN_VERSION=0.91.8
+CLUTTER_GTK_MIN_VERSION=1.0.1
GOBJECT_INTROSPECTION_MIN_VERSION=0.9.6
GDK_PIXBUF_MIN_VERSION=2.22.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/data/style/gtk-style.css new/sushi-0.0.5/data/style/gtk-style.css
--- old/sushi-0.0.4/data/style/gtk-style.css 2011-07-02 06:19:02.000000000 +0200
+++ new/sushi-0.0.5/data/style/gtk-style.css 2011-07-25 18:18:23.000000000 +0200
@@ -5,24 +5,11 @@
@define-color info_bg_color @np_bg_color;
@define-color info_fg_color @np_fg_color;
-GtkWindow {
- color: @np_fg_color;
-}
-
* {
background-color: alpha(#000, 0.0);
}
-*:selected {
- background-color: shade (@np_bg_color, 1.55);
-}
-
-*:insensitive {
- color: shade(@np_fg_color, 0.60);
-}
-
SushiFontWidget {
- color: @np_fg_color;
padding: 2;
}
@@ -32,37 +19,28 @@
font: Monospace 10;
}
-.spinner {
- color: @np_fg_color;
-}
-
.scrollbar.slider,
.scrollbar.button {
- color: shade (@np_bg_color, 1.30);
border-color: shade (@np_bg_color, 1.30);
}
.scrollbar.button:prelight,
.scrollbar.slider:prelight {
background-color: shade (@np_bg_color, 1.30);
- color: shade (@np_fg_color, 0.75);
}
.scrollbar.button:prelight:active,
.scrollbar.slider:prelight:active {
background-color: shade (@np_bg_color, 1.55);
border-color: shade (@np_bg_color, 1.55);
- color: shade (@np_fg_color, 0.85);
}
.np-toolbar {
border-style: none;
border-radius: 3;
border-width: 0;
- padding: 0 2;
background-color: @np_bg_color;
- color: @np_fg_color;
}
.np-toolbar GtkSeparatorToolItem {
@@ -71,16 +49,34 @@
border-width: 1;
border-style: solid;
- border-color: shade(@np_fg_color, 0.60);
+}
+
+.np-toolbar .button {
+ border-image: none;
+ background-image: -gtk-gradient(linear,
+ left top, left bottom,
+ from(#333),
+ color-stop(0.50, shade (#333, 1.40)),
+ to (#333));
+}
+
+.np-toolbar .button:hover {
+ background-image: -gtk-gradient(linear,
+ left top, left bottom,
+ from(shade(#333, 1.20)),
+ color-stop(0.50, shade (#333, 1.60)),
+ to (shade(#333, 1.20)));
+}
+
+.np-toolbar GtkLabel {
+ font: Cantarell 8;
}
.np-decoration {
- color: @np_fg_color;
font: bold;
}
.np-decoration.button {
- color: @np_fg_color;
background-image: none;
padding: 4;
@@ -110,46 +106,3 @@
color-stop(0.50, #333),
to(alpha(#333, 0.0)));
}
-
-.np-toolbar {
- padding: 0 4;
-}
-
-.np-toolbar .button {
- border-image: none;
- padding: 0 4;
- background-image: -gtk-gradient(linear,
- left top, left bottom,
- from(#333),
- color-stop(0.50, shade (#333, 1.40)),
- to (#333));
-}
-
-.np-toolbar .button:hover {
- background-image: -gtk-gradient(linear,
- left top, left bottom,
- from(shade(#333, 1.20)),
- color-stop(0.50, shade (#333, 1.60)),
- to (shade(#333, 1.20)));
-}
-
-.np-toolbar GtkScale.slider {
- background-image: none;
- background-color: @np_bg_color;
- border-color: shade (@np_fg_color, 0.8);
-}
-
-.np-toolbar GtkScale.trough {
- border-color: shade (@np_fg_color, 0.8);
- border-width: 1;
- border-style: solid;
- background-image: -gtk-gradient (linear,
- left top, left bottom,
- from (shade(#333, 1.10)),
- to (shade (#333, 1.30)));
-}
-
-.np-toolbar GtkLabel {
- font: Cantarell 8;
- color: @np_fg_color;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/NEWS new/sushi-0.0.5/NEWS
--- old/sushi-0.0.4/NEWS 2011-07-08 16:48:58.000000000 +0200
+++ new/sushi-0.0.5/NEWS 2011-07-26 17:24:34.000000000 +0200
@@ -1,3 +1,13 @@
+0.0.5 - "Coop"
+==============
+
+- Use "document-open-symbolic" for run/open toolbar buttons
+- Require latest clutter-gtk to fix underallocations with GTK+ 3.1
+- Use g_format_size() instead of g_format_size_for_display()
+- Use the GTK+ dark theme
+- UTF8-validate the text before inserting it into the
+ buffer (Ignacio Casal Quinteiro)
+
0.0.4 - "Bianca"
================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/po/da.po new/sushi-0.0.5/po/da.po
--- old/sushi-0.0.4/po/da.po 1970-01-01 01:00:00.000000000 +0100
+++ new/sushi-0.0.5/po/da.po 2011-07-20 22:21:20.000000000 +0200
@@ -0,0 +1,52 @@
+# Danish translation for sushi.
+# Copyright (C) 2011 sushi's COPYRIGHT HOLDER
+# This file is distributed under the same license as the sushi package.
+# Joe Hansen , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sushi master\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-13 23:06+0200\n"
+"PO-Revision-Date: 2011-06-30 19:00+0100\n"
+"Last-Translator: Joe Hansen \n"
+"Language-Team: Danish \n"
+"Language: da\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"
+
+#: ../src/libsushi/sushi-file-loader.c:641
+#, c-format
+msgid "%d item"
+msgid_plural "%d items"
+msgstr[0] "%d element"
+msgstr[1] "%d elementer"
+
+#: ../src/libsushi/sushi-file-loader.c:651
+msgid "Empty Folder"
+msgstr "Tom mappe"
+
+#: ../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/viewers/folder.js:127
+#: ../src/js/viewers/folder.js:132
+msgid "Loading..."
+msgstr "Indlæser..."
+
+#: ../src/js/ui/fallbackRenderer.js:125 ../src/js/viewers/folder.js:126
+msgid "Size"
+msgstr "Størrelse"
+
+#: ../src/js/ui/fallbackRenderer.js:130 ../src/js/viewers/folder.js:131
+msgid "Modified"
+msgstr "Ændret"
+
+#: ../src/js/viewers/evince.js:75
+#, c-format
+msgid "%d of %d"
+msgstr "%d af %d"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/po/it.po new/sushi-0.0.5/po/it.po
--- old/sushi-0.0.4/po/it.po 1970-01-01 01:00:00.000000000 +0100
+++ new/sushi-0.0.5/po/it.po 2011-07-26 16:50:43.000000000 +0200
@@ -0,0 +1,60 @@
+# Italian translation for sushi
+# Copyright (C) Free Software Foundation, Inc
+# This file is distributed under the same license as the sushi package.
+# Luca Ferretti , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sushi\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-25 19:05+0200\n"
+"PO-Revision-Date: 2011-07-25 19:06+0200\n"
+"Last-Translator: Luca Ferretti \n"
+"Language-Team: Italian \n"
+"Language: \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"
+
+#: ../src/libsushi/sushi-file-loader.c:641
+#, c-format
+msgid "%d item"
+msgid_plural "%d items"
+msgstr[0] "%d oggetto"
+msgstr[1] "%d oggetti"
+
+#: ../src/libsushi/sushi-file-loader.c:653
+msgid "Empty Folder"
+msgstr "Cartella vuota"
+
+#: ../src/js/ui/fallbackRenderer.js:120
+msgid "Type"
+msgstr "Tipo"
+
+#: ../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
+msgid "Loading..."
+msgstr "Caricamento..."
+
+#: ../src/js/ui/fallbackRenderer.js:125 ../src/js/viewers/folder.js:126
+msgid "Size"
+msgstr "Dimensione"
+
+#: ../src/js/ui/fallbackRenderer.js:130 ../src/js/viewers/folder.js:131
+msgid "Modified"
+msgstr "Ultima modifica"
+
+#: ../src/js/viewers/audio.js:163
+msgid "from"
+msgstr "da"
+
+#: ../src/js/viewers/audio.js:165
+msgid "by"
+msgstr "di"
+
+#: ../src/js/viewers/evince.js:75
+#, c-format
+msgid "%d of %d"
+msgstr "%d di %d"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/po/LINGUAS new/sushi-0.0.5/po/LINGUAS
--- old/sushi-0.0.4/po/LINGUAS 2011-07-05 16:52:56.000000000 +0200
+++ new/sushi-0.0.5/po/LINGUAS 2011-07-26 16:50:43.000000000 +0200
@@ -1,8 +1,11 @@
# Keep this list sorted alphabetically
cs
+da
de
es
gl
+it
+nb
pl
pt_BR
sl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/po/nb.po new/sushi-0.0.5/po/nb.po
--- old/sushi-0.0.4/po/nb.po 1970-01-01 01:00:00.000000000 +0100
+++ new/sushi-0.0.5/po/nb.po 2011-07-20 22:21:20.000000000 +0200
@@ -0,0 +1,52 @@
+# Norwegian bokmål translation of sushi.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Kjartan Maraas , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sushi 0.x\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-19 11:24+0200\n"
+"PO-Revision-Date: 2011-07-19 11:27+0200\n"
+"Last-Translator: Kjartan Maraas \n"
+"Language-Team: Norwegian bokmål \n"
+"Language: \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"
+
+#: ../src/libsushi/sushi-file-loader.c:641
+#, c-format
+msgid "%d item"
+msgid_plural "%d items"
+msgstr[0] "%d oppføring"
+msgstr[1] "%d oppføringer"
+
+#: ../src/libsushi/sushi-file-loader.c:651
+msgid "Empty Folder"
+msgstr "Tom mappe"
+
+#: ../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/viewers/folder.js:127
+#: ../src/js/viewers/folder.js:132
+msgid "Loading..."
+msgstr "Laster …"
+
+#: ../src/js/ui/fallbackRenderer.js:125 ../src/js/viewers/folder.js:126
+msgid "Size"
+msgstr "Størrelse"
+
+#: ../src/js/ui/fallbackRenderer.js:130 ../src/js/viewers/folder.js:131
+msgid "Modified"
+msgstr "Endret"
+
+#: ../src/js/viewers/evince.js:75
+#, c-format
+msgid "%d of %d"
+msgstr "%d av %d"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/po/POTFILES.in new/sushi-0.0.5/po/POTFILES.in
--- old/sushi-0.0.4/po/POTFILES.in 2011-04-30 02:31:31.000000000 +0200
+++ new/sushi-0.0.5/po/POTFILES.in 2011-07-26 16:50:43.000000000 +0200
@@ -1,6 +1,8 @@
[encoding: UTF-8]
src/libsushi/sushi-file-loader.c
src/js/ui/fallbackRenderer.js
+src/js/ui/spinnerBox.js
+src/js/viewers/audio.js
src/js/viewers/evince.js
src/js/viewers/folder.js
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/src/js/ui/application.js new/sushi-0.0.5/src/js/ui/application.js
--- old/sushi-0.0.4/src/js/ui/application.js 2011-07-06 17:53:54.000000000 +0200
+++ new/sushi-0.0.5/src/js/ui/application.js 2011-07-25 18:06:53.000000000 +0200
@@ -107,6 +107,9 @@
Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(),
provider,
600);
+
+ let settings = Gtk.Settings.get_default();
+ settings.gtk_application_prefer_dark_theme = true;
},
activate : function() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/src/js/ui/mainWindow.js new/sushi-0.0.5/src/js/ui/mainWindow.js
--- old/sushi-0.0.4/src/js/ui/mainWindow.js 2011-07-06 17:54:15.000000000 +0200
+++ new/sushi-0.0.5/src/js/ui/mainWindow.js 2011-07-25 12:48:22.000000000 +0200
@@ -557,7 +557,7 @@
this._titleLabel.get_style_context().add_class("np-decoration");
this._titleLabel.show();
- this._titleActor = Utils.forcedSizeActor(this._titleLabel);
+ this._titleActor = new GtkClutter.Actor({ contents: this._titleLabel });
this._titleActor.add_constraint(
new Clutter.AlignConstraint({ source: this._stage,
factor: 0.5 }));
@@ -576,7 +576,7 @@
Lang.bind(this,
this._clearAndQuit));
- this._quitActor = Utils.forcedSizeActor(this._quitButton);
+ this._quitActor = new GtkClutter.Actor({ contents: this._quitButton });
this._quitActor.set_reactive(true);
this._quitActor.add_constraint(
new Clutter.AlignConstraint({ source: this._stage,
@@ -657,9 +657,6 @@
setTitle : function(label) {
this._titleLabel.set_label(label);
-
- //FIXME: why is this needed?
- this._titleActor.set_size(this._titleLabel.get_preferred_width()[1], this._titleLabel.get_preferred_height()[1]);
},
refreshSize : function() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/src/js/ui/utils.js new/sushi-0.0.5/src/js/ui/utils.js
--- old/sushi-0.0.4/src/js/ui/utils.js 2011-07-06 17:55:44.000000000 +0200
+++ new/sushi-0.0.5/src/js/ui/utils.js 2011-07-25 12:48:22.000000000 +0200
@@ -29,14 +29,6 @@
let slowDownFactor = 0;
-// FIXME: why is this needed?
-function forcedSizeActor(widget) {
- let actor = new GtkClutter.Actor({ contents: widget });
- actor.set_size(widget.get_preferred_width()[1], widget.get_preferred_height()[1]);
-
- return actor;
-}
-
function setSlowDownFactor(factor) {
slowDownFactor = factor;
}
@@ -100,57 +92,35 @@
return [ width, height ];
}
-function createFullScreenButton(mainWindow) {
- let toolbarZoom = new Gtk.ToolButton({ expand: false,
- "icon-name": "view-fullscreen-symbolic" });
- toolbarZoom.show();
- toolbarZoom.connect("clicked",
- function () {
- mainWindow.toggleFullScreen();
- });
-
- return toolbarZoom;
-}
-
-function createRunButton(file, mainWindow) {
- let toolbarRun = new Gtk.ToolButton({ expand: false,
- "icon-name": "system-run-symbolic" });
- toolbarRun.show();
- toolbarRun.connect("clicked",
- function () {
- let timestamp = Gtk.get_current_event_time();
- try {
- Gtk.show_uri(toolbarRun.get_screen(),
- file.get_uri(),
- timestamp);
-
- mainWindow.close();
- } catch (e) {
- }
- });
-
- return toolbarRun;
-}
-
-function createEditButton(file, mainWindow) {
- // FIXME: needs better icon
- let toolbarRun = new Gtk.ToolButton({ expand: false,
- "icon-name": "edit-cut-symbolic" });
- toolbarRun.show();
- toolbarRun.connect("clicked",
- function () {
- let timestamp = Gtk.get_current_event_time();
- try {
- Gtk.show_uri(toolbarRun.get_screen(),
- file.get_uri(),
- timestamp);
-
- mainWindow.close();
- } catch (e) {
- }
- });
+function createToolButton(iconName, callback) {
+ let button = new Gtk.ToolButton({ expand: false,
+ "icon-name": iconName });
+ button.show();
+ button.connect("clicked", callback);
- return toolbarRun;
+ return button;
+}
+
+function createFullScreenButton(mainWindow) {
+ return createToolButton("view-fullscreen-symbolic", Lang.bind(this, function() {
+ mainWindow.toggleFullScreen();
+ }));
+}
+
+function createOpenButton(file, mainWindow) {
+ return createToolButton("document-open-symbolic", Lang.bind(this, function(widget) {
+ let timestamp = Gtk.get_current_event_time();
+ try {
+ Gtk.show_uri(widget.get_screen(),
+ file.get_uri(),
+ timestamp);
+
+ mainWindow.close();
+ } catch (e) {
+ log('Unable to execute the default application for ' +
+ file.get_uri() + ' : ' + e.toString());
+ }
+ }));
}
function formatTimeString(timeVal) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/src/js/viewers/audio.js new/sushi-0.0.5/src/js/viewers/audio.js
--- old/sushi-0.0.4/src/js/viewers/audio.js 2011-07-06 17:55:57.000000000 +0200
+++ new/sushi-0.0.5/src/js/viewers/audio.js 2011-07-25 12:48:22.000000000 +0200
@@ -248,6 +248,14 @@
this._mainToolbar = new Gtk.Toolbar();
this._mainToolbar.get_style_context().add_class("np-toolbar");
this._mainToolbar.set_icon_size(Gtk.IconSize.MENU);
+ this._mainToolbar.show();
+
+ this._toolbarActor = new GtkClutter.Actor({ contents: this._mainToolbar,
+ opacity: 0});
+ this._toolbarActor.add_constraint(
+ new Clutter.BindConstraint({ source: this._actor,
+ coordinate: Clutter.BindCoordinate.WIDTH,
+ offset: -50 }));
this._toolbarPlay = new Gtk.ToolButton({ "icon-name": "media-playback-pause-symbolic" });
this._toolbarPlay.show();
@@ -289,15 +297,6 @@
item.show_all();
this._mainToolbar.insert(item, 3);
- this._mainToolbar.show();
-
- this._toolbarActor = Utils.forcedSizeActor(this._mainToolbar);
- this._toolbarActor.add_constraint(
- new Clutter.BindConstraint({ source: this._actor,
- coordinate: Clutter.BindCoordinate.WIDTH,
- offset: -50 }));
-
-
return this._toolbarActor;
},
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/src/js/viewers/evince.js new/sushi-0.0.5/src/js/viewers/evince.js
--- old/sushi-0.0.4/src/js/viewers/evince.js 2011-07-06 17:56:08.000000000 +0200
+++ new/sushi-0.0.5/src/js/viewers/evince.js 2011-07-25 12:48:22.000000000 +0200
@@ -126,6 +126,9 @@
this._mainToolbar = new Gtk.Toolbar({ "icon-size": Gtk.IconSize.MENU });
this._mainToolbar.get_style_context().add_class("np-toolbar");
this._mainToolbar.set_show_arrow(false);
+ this._mainToolbar.show();
+
+ this._toolbarActor = new GtkClutter.Actor({ contents: this._mainToolbar });
this._toolbarZoom = Utils.createFullScreenButton(this._mainWindow);
this._mainToolbar.insert(this._toolbarZoom, 0);
@@ -159,10 +162,6 @@
this._updatePageLabel();
- this._mainToolbar.show();
-
- this._toolbarActor = Utils.forcedSizeActor(this._mainToolbar);
-
return this._toolbarActor;
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/src/js/viewers/gst.js new/sushi-0.0.5/src/js/viewers/gst.js
--- old/sushi-0.0.4/src/js/viewers/gst.js 2011-07-06 17:56:25.000000000 +0200
+++ new/sushi-0.0.5/src/js/viewers/gst.js 2011-07-25 12:48:22.000000000 +0200
@@ -143,6 +143,14 @@
createToolbar : function () {
this._mainToolbar = new Gtk.Toolbar({ "icon-size": Gtk.IconSize.MENU });
this._mainToolbar.get_style_context().add_class("np-toolbar");
+ this._mainToolbar.show();
+
+ this._toolbarActor = new GtkClutter.Actor({ contents: this._mainToolbar,
+ opacity: 0 });
+ this._toolbarActor.add_constraint(
+ new Clutter.BindConstraint({ source: this._video,
+ coordinate: Clutter.BindCoordinate.WIDTH,
+ offset: -50 }));
this._toolbarPlay = new Gtk.ToolButton({ "icon-name": "media-playback-pause-symbolic" });
this._toolbarPlay.show();
@@ -188,14 +196,6 @@
this._toolbarZoom = Utils.createFullScreenButton(this._mainWindow);
this._mainToolbar.insert(this._toolbarZoom, 4);
- this._mainToolbar.show();
-
- this._toolbarActor = Utils.forcedSizeActor(this._mainToolbar);
- this._toolbarActor.add_constraint(
- new Clutter.BindConstraint({ source: this._video,
- coordinate: Clutter.BindCoordinate.WIDTH,
- offset: -50 }));
-
return this._toolbarActor;
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/src/js/viewers/html.js new/sushi-0.0.5/src/js/viewers/html.js
--- old/sushi-0.0.4/src/js/viewers/html.js 2011-07-06 17:56:29.000000000 +0200
+++ new/sushi-0.0.5/src/js/viewers/html.js 2011-07-25 12:48:22.000000000 +0200
@@ -79,6 +79,9 @@
this._mainToolbar = new Gtk.Toolbar({ "icon-size": Gtk.IconSize.MENU });
this._mainToolbar.get_style_context().add_class("np-toolbar");
this._mainToolbar.set_show_arrow(false);
+ this._mainToolbar.show();
+
+ this._toolbarActor = new GtkClutter.Actor({ contents: this._mainToolbar });
this._toolbarZoom = Utils.createFullScreenButton(this._mainWindow);
this._mainToolbar.insert(this._toolbarZoom, 0);
@@ -87,13 +90,9 @@
separator.show();
this._mainToolbar.insert(separator, 1);
- this._toolbarRun = Utils.createRunButton(this._file, this._mainWindow);
+ this._toolbarRun = Utils.createOpenButton(this._file, this._mainWindow);
this._mainToolbar.insert(this._toolbarRun, 2);
- this._mainToolbar.show();
-
- this._toolbarActor = Utils.forcedSizeActor(this._mainToolbar);
-
return this._toolbarActor;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/src/js/viewers/image.js new/sushi-0.0.5/src/js/viewers/image.js
--- old/sushi-0.0.4/src/js/viewers/image.js 2011-07-06 17:56:35.000000000 +0200
+++ new/sushi-0.0.5/src/js/viewers/image.js 2011-07-25 12:48:22.000000000 +0200
@@ -103,14 +103,13 @@
this._mainToolbar = new Gtk.Toolbar({ "icon-size": Gtk.IconSize.MENU });
this._mainToolbar.get_style_context().add_class("np-toolbar");
this._mainToolbar.set_show_arrow(false);
+ this._mainToolbar.show();
+
+ this._toolbarActor = new GtkClutter.Actor({ contents: this._mainToolbar });
this._toolbarZoom = Utils.createFullScreenButton(this._mainWindow);
this._mainToolbar.insert(this._toolbarZoom, 0);
- this._mainToolbar.show();
-
- this._toolbarActor = Utils.forcedSizeActor(this._mainToolbar);
-
return this._toolbarActor;
},
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/src/js/viewers/text.js new/sushi-0.0.5/src/js/viewers/text.js
--- old/sushi-0.0.4/src/js/viewers/text.js 2011-07-06 17:56:40.000000000 +0200
+++ new/sushi-0.0.5/src/js/viewers/text.js 2011-07-13 16:50:59.000000000 +0200
@@ -102,7 +102,7 @@
this._mainToolbar.get_style_context().add_class("np-toolbar");
this._mainToolbar.set_show_arrow(false);
- this._toolbarRun = Utils.createEditButton(this._file, this._mainWindow);
+ this._toolbarRun = Utils.createOpenButton(this._file, this._mainWindow);
this._mainToolbar.insert(this._toolbarRun, 0);
this._mainToolbar.show();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/src/libsushi/sushi-file-loader.c new/sushi-0.0.5/src/libsushi/sushi-file-loader.c
--- old/sushi-0.0.4/src/libsushi/sushi-file-loader.c 2011-07-06 17:42:19.000000000 +0200
+++ new/sushi-0.0.5/src/libsushi/sushi-file-loader.c 2011-07-25 12:52:26.000000000 +0200
@@ -625,11 +625,11 @@
if (g_file_info_get_file_type (self->priv->info) != G_FILE_TYPE_DIRECTORY) {
size = g_file_info_get_size (self->priv->info);
- return g_format_size_for_display (size);
+ return g_format_size (size);
}
if (self->priv->total_size != -1) {
- gchar *str, *retval;
+ gchar *str, *size_str, *retval;
const gchar *items_str;
size = self->priv->total_size;
@@ -642,9 +642,11 @@
"%d items",
self->priv->file_items + self->priv->directory_items);
str = g_strdup_printf (items_str, self->priv->file_items + self->priv->directory_items);
-
- retval = g_strconcat (g_format_size_for_display (size), ", ", str, NULL);
+ size_str = g_format_size (size);
+
+ retval = g_strconcat (size_str, ", ", str, NULL);
g_free (str);
+ g_free (size_str);
return retval;
} else if (!self->priv->loading) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sushi-0.0.4/src/libsushi/sushi-text-loader.c new/sushi-0.0.5/src/libsushi/sushi-text-loader.c
--- old/sushi-0.0.4/src/libsushi/sushi-text-loader.c 2011-07-06 17:44:32.000000000 +0200
+++ new/sushi-0.0.5/src/libsushi/sushi-text-loader.c 2011-07-26 16:50:43.000000000 +0200
@@ -177,6 +177,14 @@
return;
}
+ if (!g_utf8_validate (contents, -1, NULL)) {
+ /* FIXME: we need to report the error */
+ g_print ("Can't load the text file as it has invalid characters");
+ g_free (contents);
+
+ return;
+ }
+
gtk_source_buffer_begin_not_undoable_action (self->priv->buffer);
gtk_text_buffer_set_text (GTK_TEXT_BUFFER (self->priv->buffer), contents, -1);
gtk_source_buffer_end_not_undoable_action (self->priv->buffer);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org