Hello community,
here is the log from the commit of package pix for openSUSE:Factory checked in
at 2016-06-23 13:37:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pix (Old)
and /work/SRC/openSUSE:Factory/.pix.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pix"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pix/pix.changes 2016-06-07 23:45:54.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.pix.new/pix.changes 2016-06-23
13:37:22.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Jun 22 12:01:32 UTC 2016 - sor.ale...@meowr.ru
+
+- Update to version 1.0.2:
+ * Fix wrong URL in about dialog.
+ * Toolbar: Show text under icons by default.
+ * Fix setting background in MATE.
+ * When setting backgrounds picture, don't mess with the options
+ (picture aspect).
+ * Remove a couple sizes of the palette.png icon.
+ * Fix a build warning.
+
+-------------------------------------------------------------------
Old:
----
pix-1.0.1.tar.gz
New:
----
pix-1.0.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pix.spec ++++++
--- /var/tmp/diff_new_pack.suQDa1/_old 2016-06-23 13:37:23.000000000 +0200
+++ /var/tmp/diff_new_pack.suQDa1/_new 2016-06-23 13:37:23.000000000 +0200
@@ -17,7 +17,7 @@
Name: pix
-Version: 1.0.1
+Version: 1.0.2
Release: 0
Summary: Image viewer and browser utility
License: GPL-2.0+
++++++ pix-1.0.1.tar.gz -> pix-1.0.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pix-1.0.1/configure.ac new/pix-1.0.2/configure.ac
--- old/pix-1.0.1/configure.ac 2016-05-16 18:44:34.000000000 +0200
+++ new/pix-1.0.2/configure.ac 2016-06-20 11:31:55.000000000 +0200
@@ -1,6 +1,6 @@
m4_define([pix_major_version], [1])
m4_define([pix_minor_version], [0])
-m4_define([pix_micro_version], [1])
+m4_define([pix_micro_version], [2])
m4_define([pix_version],
[pix_major_version.pix_minor_version.pix_micro_version])
m4_define([pix_api_version],
@@ -8,9 +8,9 @@
AC_PREREQ(2.63)
AC_INIT([pix], [pix_version],
- [http://bugzilla.gnome.org/enter_bug.cgi?product=pix],
+ [https://github.com/linuxmint/pix/issues],
[pix])
-AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar])
+AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar subdir-objects])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pix-1.0.1/data/icons/hicolor/22x22/actions/Makefile.am
new/pix-1.0.2/data/icons/hicolor/22x22/actions/Makefile.am
--- old/pix-1.0.1/data/icons/hicolor/22x22/actions/Makefile.am 2016-05-16
18:44:34.000000000 +0200
+++ new/pix-1.0.2/data/icons/hicolor/22x22/actions/Makefile.am 2016-06-20
11:31:55.000000000 +0200
@@ -11,7 +11,6 @@
file-library.png \
file-search.png \
histogram.png \
- palette.png \
share.png \
tag.png \
tool-adjust-colors.png \
Files old/pix-1.0.1/data/icons/hicolor/22x22/actions/palette.png and
new/pix-1.0.2/data/icons/hicolor/22x22/actions/palette.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pix-1.0.1/data/icons/hicolor/48x48/actions/Makefile.am
new/pix-1.0.2/data/icons/hicolor/48x48/actions/Makefile.am
--- old/pix-1.0.1/data/icons/hicolor/48x48/actions/Makefile.am 2016-05-16
18:44:34.000000000 +0200
+++ new/pix-1.0.2/data/icons/hicolor/48x48/actions/Makefile.am 2016-06-20
11:31:55.000000000 +0200
@@ -9,7 +9,6 @@
file-catalog.png \
file-library.png \
file-search.png \
- palette.png \
selection.png \
selection1.png \
selection2.png \
Files old/pix-1.0.1/data/icons/hicolor/48x48/actions/palette.png and
new/pix-1.0.2/data/icons/hicolor/48x48/actions/palette.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pix-1.0.1/data/org.x.pix.gschema.xml.in
new/pix-1.0.2/data/org.x.pix.gschema.xml.in
--- old/pix-1.0.1/data/org.x.pix.gschema.xml.in 2016-05-16 18:44:34.000000000
+0200
+++ new/pix-1.0.2/data/org.x.pix.gschema.xml.in 2016-06-20 11:31:55.000000000
+0200
@@ -90,7 +90,7 @@
<default>false</default>
</key>
<key name="toolbar-style" enum="org.x.pix.GthToolbarStyle">
- <default>'system'</default>
+ <default>'text-below'</default>
</key>
<key name="window-width" type="i">
<default>0</default>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pix-1.0.1/debian/changelog
new/pix-1.0.2/debian/changelog
--- old/pix-1.0.1/debian/changelog 2016-05-16 18:44:34.000000000 +0200
+++ new/pix-1.0.2/debian/changelog 2016-06-20 11:31:55.000000000 +0200
@@ -1,3 +1,18 @@
+pix (1.0.2) sarah; urgency=medium
+
+ [ Clement Lefebvre ]
+ * Fixed wrong URL in about dialog
+ * Toolbar: Show text under icons by default
+ * Removed debian/patches
+ * Fixed setting background in MATE
+ * When setting backgrounds picture, don't mess with the options (picture
aspect)
+
+ [ JosephMcc ]
+ * Remove a couple sizes of the palette.png icon
+ * build: Fix a build warning
+
+ -- Clement Lefebvre <r...@linuxmint.com> Mon, 20 Jun 2016 10:30:48 +0100
+
pix (1.0.1) sarah; urgency=medium
* Removed ref to GNOME in help
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pix-1.0.1/debian/patches/00-fix_ltmain.sh.patch
new/pix-1.0.2/debian/patches/00-fix_ltmain.sh.patch
--- old/pix-1.0.1/debian/patches/00-fix_ltmain.sh.patch 2016-05-16
18:44:34.000000000 +0200
+++ new/pix-1.0.2/debian/patches/00-fix_ltmain.sh.patch 1970-01-01
01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-This patch makes --as-needed work correctly.
-Please see the patch in #347650 provided by Josselin Mouette <j...@debian.org>.
----
- ltmain.sh | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
---- pix.orig/ltmain.sh
-+++ pix/ltmain.sh
-@@ -4716,6 +4716,11 @@ func_mode_link ()
- arg=$func_stripname_result
- ;;
-
-+ -Wl,--as-needed)
-+ deplibs="$deplibs $arg"
-+ continue
-+ ;;
-+
- -Wl,*)
- func_stripname '-Wl,' '' "$arg"
- args=$func_stripname_result
-@@ -5070,6 +5075,15 @@ func_mode_link ()
- lib=
- found=no
- case $deplib in
-+ -Wl,--as-needed)
-+ if test "$linkmode,$pass" = "prog,link"; then
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ else
-+ deplibs="$deplib $deplibs"
-+ fi
-+ continue
-+ ;;
-
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pix-1.0.1/debian/patches/02-preserve_upstream_files.patch
new/pix-1.0.2/debian/patches/02-preserve_upstream_files.patch
--- old/pix-1.0.1/debian/patches/02-preserve_upstream_files.patch
2016-05-16 18:44:34.000000000 +0200
+++ new/pix-1.0.2/debian/patches/02-preserve_upstream_files.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-From: David Paleino <da...@debian.org>
-Subject: try not to remove upstream files on clean
-Forwarded: not-needed
-
----
- Makefile.am | 23 -----------------------
- 1 file changed, 23 deletions(-)
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -51,27 +51,4 @@ GITIGNOREFILES = build .autotools .cdt*
-
- DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
-
--CLEANFILES = ChangeLog
--
--# Build ChangeLog from GIT history
--
--CHANGELOG_START = PIX_2_10_11
--ChangeLog:
-- @echo Creating $@
-- @if test -d $(top_srcdir)/.git; then \
-- (GIT_DIR=$(top_srcdir)/.git $(top_srcdir)/missing --run git log
$(CHANGELOG_START).. --stat -M -C --name-status --date=short --no-color) | fmt
--split-only > $@.tmp \
-- && mv -f $@.tmp $@ \
-- || ($(RM) $@.tmp; \
-- echo Failed to generate ChangeLog, your ChangeLog may be
outdated >&2; \
-- (test -f $@ || echo git-log is required to generate this
file >> $@)); \
-- else \
-- test -f $@ || \
-- (echo A git checkout and git-log is required to generate
ChangeLog >&2 && \
-- echo A git checkout and git-log is required to generate this
file >> $@); \
-- fi
--
--dist: ChangeLog
--
--.PHONY: ChangeLog
--
- -include $(top_srcdir)/git.mk
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pix-1.0.1/debian/patches/03-add_missing_includes.patch
new/pix-1.0.2/debian/patches/03-add_missing_includes.patch
--- old/pix-1.0.1/debian/patches/03-add_missing_includes.patch 2016-05-16
18:44:34.000000000 +0200
+++ new/pix-1.0.2/debian/patches/03-add_missing_includes.patch 1970-01-01
01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-From: David Paleino <da...@debian.org>
-Subject: add missing included header
-Origin: vendor
-Forwarded: no
-
----
- extensions/exiv2_tools/exiv2-utils.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: pix-3.2.3/extensions/exiv2_tools/exiv2-utils.cpp
-===================================================================
---- pix-3.2.3.orig/extensions/exiv2_tools/exiv2-utils.cpp 2013-08-31
06:28:55.859559782 +1000
-+++ pix-3.2.3/extensions/exiv2_tools/exiv2-utils.cpp 2013-08-31
06:28:55.847559723 +1000
-@@ -29,6 +29,7 @@
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
- #include <iostream>
-+#include <iomanip>
- #include <string>
- #include <sstream>
- #include <vector>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pix-1.0.1/debian/patches/05-fix_locales.patch
new/pix-1.0.2/debian/patches/05-fix_locales.patch
--- old/pix-1.0.1/debian/patches/05-fix_locales.patch 2016-05-16
18:44:34.000000000 +0200
+++ new/pix-1.0.2/debian/patches/05-fix_locales.patch 1970-01-01
01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-Fix some wrong localizations reported by users
----
- po/ru.po | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: pix-3.2.3/po/ru.po
-===================================================================
---- pix-3.2.3.orig/po/ru.po 2013-08-31 06:28:58.519572972 +1000
-+++ pix-3.2.3/po/ru.po 2013-08-31 06:28:58.515572952 +1000
-@@ -100,7 +100,7 @@
-
- #: ../data/pix.desktop.in.in.h:2
- msgid "Image Viewer"
--msgstr "Просмотр изображений"
-+msgstr "Просмотр изображений Pix"
-
- #: ../data/pix.desktop.in.in.h:3
- msgid "Pix Image Viewer"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pix-1.0.1/debian/patches/07-fix_documentation_xml.patch
new/pix-1.0.2/debian/patches/07-fix_documentation_xml.patch
--- old/pix-1.0.1/debian/patches/07-fix_documentation_xml.patch 2016-05-16
18:44:34.000000000 +0200
+++ new/pix-1.0.2/debian/patches/07-fix_documentation_xml.patch 1970-01-01
01:00:00.000000000 +0100
@@ -1,628 +0,0 @@
-From: David Paleino <da...@debian.org>
-Subject: fix XML so that it validates during dh_auto_test
-Forwarded: no
-
----
- help/C/shortcuts.page | 12 ++++++------
- help/C/strftime.page | 2 +-
- help/de/shortcuts.page | 12 ++++++------
- help/de/strftime.page | 2 +-
- help/el/shortcuts.page | 12 ++++++------
- help/el/strftime.page | 2 +-
- help/es/shortcuts.page | 12 ++++++------
- help/es/strftime.page | 2 +-
- help/fr/shortcuts.page | 12 ++++++------
- help/fr/strftime.page | 2 +-
- help/oc/shortcuts.page | 12 ++++++------
- help/oc/strftime.page | 2 +-
- help/sl/shortcuts.page | 12 ++++++------
- help/sl/strftime.page | 2 +-
- help/sv/shortcuts.page | 12 ++++++------
- help/sv/strftime.page | 2 +-
- help/zh_CN/shortcuts.page | 12 ++++++------
- help/zh_CN/strftime.page | 2 +-
- 18 files changed, 63 insertions(+), 63 deletions(-)
-
---- a/help/C/strftime.page
-+++ b/help/C/strftime.page
-@@ -8,7 +8,7 @@ id="pix-date-formats">
- <p>This is a summary of standard date/time codes that may be used
- in format strings:</p>
-
-- <table id="pix-TBL-strftime">
-+ <table>
- <title>Valid format codes for custom subfolders</title>
- <tr>
- <td>
---- a/help/de/strftime.page
-+++ b/help/de/strftime.page
-@@ -19,7 +19,7 @@
-
- <p>Es folgt eine Zusammenfassung der Datums- und Uhrzeit-Codes, die in
Formatangaben verwendet werden können:</p>
-
-- <table id="pix-TBL-strftime">
-+ <table>
- <title>Gültige Formatangaben für eigene Unterordner</title>
- <tr>
- <td>
---- a/help/el/strftime.page
-+++ b/help/el/strftime.page
-@@ -19,7 +19,7 @@
-
- <p>Αυτή είναι μια περίληψη των τυπικών κωδικών ημερομηνίας/χρόνου που
μπορούν να χρησιμοποιηθούν σε συμβολοσειρές:</p>
-
-- <table id="pix-TBL-strftime">
-+ <table>
- <title>Έγκυροι κώδικες μορφής για προσαρμοσμένους υποφακέλους</title>
- <tr>
- <td>
---- a/help/es/strftime.page
-+++ b/help/es/strftime.page
-@@ -19,7 +19,7 @@
-
- <p>Esto es un resumen de los códigos de fecha y hora que se pueden usar en
cadenas de formato:</p>
-
-- <table id="pix-TBL-strftime">
-+ <table>
- <title>Códigos de formato válidos para subcarpetas personalizadas</title>
- <tr>
- <td>
---- a/help/fr/strftime.page
-+++ b/help/fr/strftime.page
-@@ -25,7 +25,7 @@
-
- <p>Voici un résumé des codes standards de date et d'heure qui peuvent être
utilisés dans les chaînes de format :</p>
-
-- <table id="pix-TBL-strftime">
-+ <table>
- <title>Codes de format valides pour les sous-dossiers
personnalisés</title>
- <tr>
- <td>
---- a/help/oc/strftime.page
-+++ b/help/oc/strftime.page
-@@ -8,7 +8,7 @@
- <p>This is a summary of standard date/time codes that may be used
- in format strings:</p>
-
-- <table id="pix-TBL-strftime">
-+ <table>
- <title>Valid format codes for custom subfolders</title>
- <tr>
- <td>
---- a/help/sl/strftime.page
-+++ b/help/sl/strftime.page
-@@ -7,7 +7,7 @@
-
- <p>To je povzete običajnih kod datuma/časa, ki jih je mogoče uporabiti v
nizih oblike:</p>
-
-- <table id="pix-TBL-strftime">
-+ <table>
- <title>Veljavne kode oblike za podmape po meri</title>
- <tr>
- <td>
---- a/help/sv/strftime.page
-+++ b/help/sv/strftime.page
-@@ -8,7 +8,7 @@
- <p>This is a summary of standard date/time codes that may be used
- in format strings:</p>
-
-- <table id="pix-TBL-strftime">
-+ <table>
- <title>Valid format codes for custom subfolders</title>
- <tr>
- <td>
---- a/help/zh_CN/strftime.page
-+++ b/help/zh_CN/strftime.page
-@@ -8,7 +8,7 @@
- <p>This is a summary of standard date/time codes that may be used
- in format strings:</p>
-
-- <table id="pix-TBL-strftime">
-+ <table>
- <title>Valid format codes for custom subfolders</title>
- <tr>
- <td>
---- a/help/C/shortcuts.page
-+++ b/help/C/shortcuts.page
-@@ -6,7 +6,7 @@ id="pix-shortcuts">
-
- <title>Keyboard Shortcuts</title>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-folders">
- <title>Viewing and hiding parts of the user interface</title>
- <table frame="all" rules="all">
- <tr>
-@@ -83,7 +83,7 @@ id="pix-shortcuts">
- </section>
-
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browser">
- <title>Editing shortcuts for the browser and viewer</title>
- <table frame="all" rules="all">
- <tr>
-@@ -178,7 +178,7 @@ id="pix-shortcuts">
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer">
- <title>Editing shortcuts for the viewer mode only</title>
- <table frame="all" rules="all">
- <tr>
-@@ -262,7 +262,7 @@ id="pix-shortcuts">
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer2">
- <title>Viewer shortcuts</title>
- <table frame="all" rules="all">
- <tr>
-@@ -406,7 +406,7 @@ id="pix-shortcuts">
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browsernav">
- <title>Browser Navigation</title>
- <table frame="all" rules="all">
-
-@@ -487,7 +487,7 @@ id="pix-shortcuts">
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-slideshow">
- <title>Slideshow controls</title>
- <table frame="all" rules="all">
- <tr>
---- a/help/de/shortcuts.page
-+++ b/help/de/shortcuts.page
-@@ -18,7 +18,7 @@
-
- <title>Tastenkombinationen</title>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-folders">
- <title>Anzeigen und verbergen von Teilen der grafischen
Oberflächen</title>
- <table frame="all" rules="all">
- <tr>
-@@ -82,7 +82,7 @@
- </section>
-
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browser">
- <title>Tastenkombinationen für Bildbetrachter und Browser
bearbeiten</title>
- <table frame="all" rules="all">
- <tr>
-@@ -161,7 +161,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer">
- <title>Tastenkombinationen nur für den Ansichtsmodus bearbeiten</title>
- <table frame="all" rules="all">
- <tr>
-@@ -231,7 +231,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer2">
- <title>Tastenkombinationen des Betrachters</title>
- <table frame="all" rules="all">
- <tr>
-@@ -341,7 +341,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browsernav">
- <title>Browser-Navigation</title>
- <table frame="all" rules="all">
-
-@@ -405,7 +405,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-slideshow">
- <title>Steuerung von Dia-Vorführungen</title>
- <table frame="all" rules="all">
- <tr>
---- a/help/el/shortcuts.page
-+++ b/help/el/shortcuts.page
-@@ -18,7 +18,7 @@
-
- <title>Συντομεύσεις πληκτρολογίου</title>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-folders">
- <title>Προβολή και απόκρυψη μερών της διεπαφής χρήστη</title>
- <table frame="all" rules="all">
- <tr>
-@@ -82,7 +82,7 @@
- </section>
-
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browser">
- <title>Επεξεργασία των συντομεύσεων μόνο για την περιήγηση και
προβολή</title>
- <table frame="all" rules="all">
- <tr>
-@@ -161,7 +161,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer">
- <title>Επεξεργασία των συντομεύσεων μόνο για την κατάσταση
προβολής</title>
- <table frame="all" rules="all">
- <tr>
-@@ -231,7 +231,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer2">
- <title>Συντομεύσεις προβολής</title>
- <table frame="all" rules="all">
- <tr>
-@@ -341,7 +341,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browsernav">
- <title>Περιήγηση εξερευνητή</title>
- <table frame="all" rules="all">
-
-@@ -405,7 +405,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-slideshow">
- <title>Στοιχεία ελέγχου προβολής διαφανειών</title>
- <table frame="all" rules="all">
- <tr>
---- a/help/es/shortcuts.page
-+++ b/help/es/shortcuts.page
-@@ -18,7 +18,7 @@
-
- <title>Combinaciones de teclas</title>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-folders">
- <title>Ver y ocultar partes del interfaz de usuario</title>
- <table frame="all" rules="all">
- <tr>
-@@ -82,7 +82,7 @@
- </section>
-
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browser">
- <title>Editar atajos para el explorador y el visor</title>
- <table frame="all" rules="all">
- <tr>
-@@ -161,7 +161,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer">
- <title>Editar atajos para el modo visor solamente</title>
- <table frame="all" rules="all">
- <tr>
-@@ -231,7 +231,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer2">
- <title>Ver atajos de teclado</title>
- <table frame="all" rules="all">
- <tr>
-@@ -341,7 +341,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browsernav">
- <title>Navegación con explorador</title>
- <table frame="all" rules="all">
-
-@@ -405,7 +405,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-slideshow">
- <title>Controles de las diapositivas</title>
- <table frame="all" rules="all">
- <tr>
---- a/help/fr/shortcuts.page
-+++ b/help/fr/shortcuts.page
-@@ -24,7 +24,7 @@
-
- <title>Raccourcis clavier</title>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-folders">
- <title>Affichage et masquage de certaines parties de l'interface
utilisateur</title>
- <table frame="all" rules="all">
- <tr>
-@@ -88,7 +88,7 @@
- </section>
-
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browser">
- <title>Raccourcis pour l'édition dans le navigateur et le
visionneur</title>
- <table frame="all" rules="all">
- <tr>
-@@ -167,7 +167,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer">
- <title>Raccourcis pour l'édition dans le visionneur uniquement</title>
- <table frame="all" rules="all">
- <tr>
-@@ -237,7 +237,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer2">
- <title>Raccourcis clavier du visionneur</title>
- <table frame="all" rules="all">
- <tr>
-@@ -347,7 +347,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browsernav">
- <title>Déplacement dans le navigateur</title>
- <table frame="all" rules="all">
-
-@@ -411,7 +411,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-slideshow">
- <title>Contrôles du diaporama</title>
- <table frame="all" rules="all">
- <tr>
---- a/help/oc/shortcuts.page
-+++ b/help/oc/shortcuts.page
-@@ -6,7 +6,7 @@
-
- <title>Keyboard Shortcuts</title>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-folders">
- <title>Viewing and hiding parts of the user interface</title>
- <table frame="all" rules="all">
- <tr>
-@@ -83,7 +83,7 @@
- </section>
-
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browser">
- <title>Editing shortcuts for the browser and viewer</title>
- <table frame="all" rules="all">
- <tr>
-@@ -178,7 +178,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer">
- <title>Editing shortcuts for the viewer mode only</title>
- <table frame="all" rules="all">
- <tr>
-@@ -262,7 +262,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer2">
- <title>Viewer shortcuts</title>
- <table frame="all" rules="all">
- <tr>
-@@ -406,7 +406,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browsernav">
- <title>Browser Navigation</title>
- <table frame="all" rules="all">
-
-@@ -487,7 +487,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-slideshow">
- <title>Slideshow controls</title>
- <table frame="all" rules="all">
- <tr>
---- a/help/sv/shortcuts.page
-+++ b/help/sv/shortcuts.page
-@@ -6,7 +6,7 @@
-
- <title>Keyboard Shortcuts</title>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-folders">
- <title>Viewing and hiding parts of the user interface</title>
- <table frame="all" rules="all">
- <tr>
-@@ -83,7 +83,7 @@
- </section>
-
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browser">
- <title>Editing shortcuts for the browser and viewer</title>
- <table frame="all" rules="all">
- <tr>
-@@ -178,7 +178,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer">
- <title>Editing shortcuts for the viewer mode only</title>
- <table frame="all" rules="all">
- <tr>
-@@ -262,7 +262,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer2">
- <title>Viewer shortcuts</title>
- <table frame="all" rules="all">
- <tr>
-@@ -406,7 +406,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browsernav">
- <title>Browser Navigation</title>
- <table frame="all" rules="all">
-
-@@ -487,7 +487,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-slideshow">
- <title>Slideshow controls</title>
- <table frame="all" rules="all">
- <tr>
---- a/help/zh_CN/shortcuts.page
-+++ b/help/zh_CN/shortcuts.page
-@@ -6,7 +6,7 @@
-
- <title>Keyboard Shortcuts</title>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-folders">
- <title>Viewing and hiding parts of the user interface</title>
- <table frame="all" rules="all">
- <tr>
-@@ -83,7 +83,7 @@
- </section>
-
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browser">
- <title>Editing shortcuts for the browser and viewer</title>
- <table frame="all" rules="all">
- <tr>
-@@ -178,7 +178,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer">
- <title>Editing shortcuts for the viewer mode only</title>
- <table frame="all" rules="all">
- <tr>
-@@ -262,7 +262,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer2">
- <title>Viewer shortcuts</title>
- <table frame="all" rules="all">
- <tr>
-@@ -406,7 +406,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browsernav">
- <title>Browser Navigation</title>
- <table frame="all" rules="all">
-
-@@ -487,7 +487,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-slideshow">
- <title>Slideshow controls</title>
- <table frame="all" rules="all">
- <tr>
---- a/help/sl/shortcuts.page
-+++ b/help/sl/shortcuts.page
-@@ -6,7 +6,7 @@
-
- <title>Tipkovne bližnjice</title>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-folders">
- <title>Ogled in skrivanje delov uporabniškega vmesnika</title>
- <table frame="all" rules="all">
- <tr>
-@@ -80,7 +80,7 @@
- </section>
-
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browser">
- <title>Urejanje bližnjic za brskalnik in pregledovalnik</title>
- <table frame="all" rules="all">
- <tr>
-@@ -173,7 +173,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer">
- <title>Urejanje bližnjic le za način pregledovalnika</title>
- <table frame="all" rules="all">
- <tr>
-@@ -257,7 +257,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-viewer2">
- <title>Bližnjice pregledovalnika</title>
- <table frame="all" rules="all">
- <tr>
-@@ -390,7 +390,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-browsernav">
- <title>Krmarjenje brskalnika</title>
- <table frame="all" rules="all">
-
-@@ -467,7 +467,7 @@
- </table>
- </section>
-
-- <section>
-+ <section id="pix-SCT-shortcuts-slideshow">
- <title>Nadzor predstavitve</title>
- <table frame="all" rules="all">
- <tr>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pix-1.0.1/debian/patches/10-fix_POTFILES.skip.patch
new/pix-1.0.2/debian/patches/10-fix_POTFILES.skip.patch
--- old/pix-1.0.1/debian/patches/10-fix_POTFILES.skip.patch 2016-05-16
18:44:34.000000000 +0200
+++ new/pix-1.0.2/debian/patches/10-fix_POTFILES.skip.patch 1970-01-01
01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-These files are private to quilt. I'm not even sure why intltool-extract is
-seeing them.
----
- po/POTFILES.skip | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-Index: pix-3.2.3/po/POTFILES.skip
-===================================================================
---- pix-3.2.3.orig/po/POTFILES.skip 2013-08-31 06:29:10.315631466 +1000
-+++ pix-3.2.3/po/POTFILES.skip 2013-08-31 06:29:10.307631426 +1000
-@@ -1,3 +1,20 @@
- data/pix.desktop.in
- data/pix-import.desktop.in
- extensions/webalbums/albumtheme.c
-+
-+# These are the original files patched by quilt.
-+.pc/04-fix_source_typo.patch/extensions/edit_metadata/callbacks.c
-+#.pc/07-fix_zooms.patch/src/gth-window-actions-callbacks.c
-+#.pc/07-fix_zooms.patch/src/gth-window-actions-entries.h
-+#.pc/08-fix_preferences.patch/data/glade/pix_preferences.glade
-+#.pc/09-fix_infinite_loop_dragging_parent_dir.patch/src/gth-browser.c
-+#.pc/11-fix_Film_on_import.patch/src/dlg-photo-importer.c
-+#.pc/12-remove_Save_button_in_crop_dialog.patch/data/glade/pix_crop.glade
-+#.pc/12-remove_Save_button_in_crop_dialog.patch/src/dlg-crop.c
-+.pc/13-fix_Close_mismatch.patch/pix/gth-window-actions-entries.h
-+#.pc/14-add_rotate_button_viewer.patch/src/gth-browser.c
-+#.pc/15-suggest_new_name_on_overwrite_dialog.patch/src/dlg-file-utils.c
-+#.pc/16-fix_crop_dialog_usability.patch/data/glade/pix_crop.glade
-+#.pc/16-fix_crop_dialog_usability.patch/src/dlg-crop.c
-+#.pc/17-dont_follow_symlinks_on_dups_search.patch/src/dlg-duplicates.c
-+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pix-1.0.1/debian/patches/14-unity_control_center.patch
new/pix-1.0.2/debian/patches/14-unity_control_center.patch
--- old/pix-1.0.1/debian/patches/14-unity_control_center.patch 2016-05-16
18:44:34.000000000 +0200
+++ new/pix-1.0.2/debian/patches/14-unity_control_center.patch 1970-01-01
01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-Author: Robert Ancell <robert.anc...@canonical.com>
-Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=722233
-Bug-Ubuntu: https://launchpad.net/bugs/1257505
-
----
- extensions/desktop_background/actions.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
---- a/extensions/desktop_background/actions.c
-+++ b/extensions/desktop_background/actions.c
-@@ -184,13 +184,21 @@ infobar_response_cb (GtkInfoBar *info_ba
- gpointer user_data)
- {
- WallpaperData *wdata = user_data;
-+ gchar *path;
-+ const gchar *control_center_command;
- GError *error = NULL;
-
- g_return_if_fail (GTH_IS_BROWSER (wdata->browser));
-
- switch (response_id) {
- case _RESPONSE_PREFERENCES:
-- if (! g_spawn_command_line_async
(DESKTOP_BACKGROUND_PROPERTIES_COMMAND, &error)) {
-+ path = g_find_program_in_path ("unity-control-center");
-+ if (path && g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"),
"Unity") == 0)
-+ control_center_command = "unity-control-center
appearance";
-+ else
-+ control_center_command =
DESKTOP_BACKGROUND_PROPERTIES_COMMAND;
-+ g_free (path);
-+ if (! g_spawn_command_line_async (control_center_command,
&error)) {
- _gtk_error_dialog_from_gerror_run (GTK_WINDOW
(wdata->browser), _("Could not show the desktop background properties"), error);
- g_clear_error (&error);
- }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pix-1.0.1/debian/patches/15-flickr-https.patch
new/pix-1.0.2/debian/patches/15-flickr-https.patch
--- old/pix-1.0.1/debian/patches/15-flickr-https.patch 2016-05-16
18:44:34.000000000 +0200
+++ new/pix-1.0.2/debian/patches/15-flickr-https.patch 1970-01-01
01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-From 4cba2631576653dc86be38bf532c879457cc25bf Mon Sep 17 00:00:00 2001
-From: Paolo Bacchilega <pao...@src.gnome.org>
-Date: Mon, 21 Jul 2014 19:07:47 +0200
-Subject: Forbidden when trying to upload to Flickr
-
-[bug #732557]
-
-diff --git a/extensions/flicker/actions.c b/extensions/flicker/actions.c
-index 0ad858a..2094acf 100644
---- a/extensions/flicker/actions.c
-+++ b/extensions/flicker/actions.c
-@@ -31,17 +31,17 @@
- static FlickrServer www_flickr_com = {
- "Flickr",
- "flickr",
-- "http://www.flickr.com";,
-- "http",
-+ "https://www.flickr.com";,
-+ "https",
-
-- "http://www.flickr.com/services/oauth/request_token";,
-- "http://www.flickr.com/services/oauth/authorize";,
-- "http://www.flickr.com/services/oauth/access_token";,
-+ "https://www.flickr.com/services/oauth/request_token";,
-+ "https://www.flickr.com/services/oauth/authorize";,
-+ "https://www.flickr.com/services/oauth/access_token";,
- "8960706ee7f4151e893b11837e9c24ce",
- "1ff8d1e45c873423",
-
-- "http://api.flickr.com/services/rest";,
-- "http://api.flickr.com/services/upload";,
-+ "https://api.flickr.com/services/rest";,
-+ "https://up.flickr.com/services/upload";,
- "static.flickr.com",
- FALSE,
- TRUE
---
-cgit v0.10.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pix-1.0.1/debian/patches/series
new/pix-1.0.2/debian/patches/series
--- old/pix-1.0.1/debian/patches/series 2016-05-16 18:44:34.000000000 +0200
+++ new/pix-1.0.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-#00-fix_ltmain.sh.patch # doesn't work because of autoreconf
-02-preserve_upstream_files.patch
-03-add_missing_includes.patch
-05-fix_locales.patch
-07-fix_documentation_xml.patch
-10-fix_POTFILES.skip.patch
-14-unity_control_center.patch
-15-flickr-https.patch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pix-1.0.1/debian/patches/xx-MAINTAINER_MODE.patch
new/pix-1.0.2/debian/patches/xx-MAINTAINER_MODE.patch
--- old/pix-1.0.1/debian/patches/xx-MAINTAINER_MODE.patch 2016-05-16
18:44:34.000000000 +0200
+++ new/pix-1.0.2/debian/patches/xx-MAINTAINER_MODE.patch 1970-01-01
01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-Index: pix-2.10.7/configure.in
-===================================================================
---- pix-2.10.7.orig/configure.in 2007-12-28 09:07:19.000000000 +0100
-+++ pix-2.10.7/configure.in 2007-12-28 09:07:38.000000000 +0100
-@@ -5,6 +5,7 @@
- AC_INIT(pix, 2.10.7, http://bugzilla.gnome.org/enter_bug.cgi?product=pix)
- AC_CONFIG_SRCDIR(src/main.c)
- AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-+AM_MAINTAINER_MODE
-
- AM_CONFIG_HEADER(config.h)
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pix-1.0.1/debian/patches/xx-MIME_types.dpatch
new/pix-1.0.2/debian/patches/xx-MIME_types.dpatch
--- old/pix-1.0.1/debian/patches/xx-MIME_types.dpatch 2016-05-16
18:44:34.000000000 +0200
+++ new/pix-1.0.2/debian/patches/xx-MIME_types.dpatch 1970-01-01
01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_mime_types.dpatch by Remco van de Meent <re...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad pix-2.6.1/data/pix.applications
/tmp/dpep.ncAcg4/pix-2.6.1/data/pix.applications
---- pix-2.6.1/data/pix.applications 2004-11-20 21:26:54.000000000 +0100
-+++ /tmp/dpep.ncAcg4/pix-2.6.1/data/pix.applications 2004-12-01
10:19:23.000000000 +0100
-@@ -4,4 +4,4 @@
- can_open_multiple_files=true
- expects_uris=false
- requires_terminal=false
--
mime_types=x-directory/normal,image/jpeg,image/gif,image/png,image/tiff,image/x-bmp,image/x-png,image/xpm,image/x-tga
-+
mime_types=x-directory/normal,image/jpeg,image/gif,image/png,image/tiff,image/x-bmp,image/x-png,image/xpm,image/x-tga,image/svg+xml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pix-1.0.1/debian/patches/xx-prevent_GNOME_GThumb.h_modifications.patch
new/pix-1.0.2/debian/patches/xx-prevent_GNOME_GThumb.h_modifications.patch
--- old/pix-1.0.1/debian/patches/xx-prevent_GNOME_GThumb.h_modifications.patch
2016-05-16 18:44:34.000000000 +0200
+++ new/pix-1.0.2/debian/patches/xx-prevent_GNOME_GThumb.h_modifications.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
---- pix.orig/src/Makefile.am
-+++ pix/src/Makefile.am
-@@ -223,5 +223,7 @@
- lex.albumtheme.c
-
- CLEANFILES = \
-- $(gnome_pix_idl_sources) \
-+ X_Pix-stubs.c \
-+ X_Pix-skels.c \
-+ X_Pix-common.c
- gnome_pix_idl_stamp
---- pix.orig/src/X_Pix.h
-+++ pix/src/X_Pix.h
-@@ -14,7 +14,6 @@
-
-
- /** typedefs **/
--#line 14 "/usr/share/idl/bonobo-2.0/Bonobo.idl"
- #include <bonobo/Bonobo.h>
- #if !defined(ORBIT_DECL_X_Pix_Application) &&
!defined(_X_Pix_Application_defined)
- #define ORBIT_DECL_X_Pix_Application 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pix-1.0.1/extensions/desktop_background/actions.c
new/pix-1.0.2/extensions/desktop_background/actions.c
--- old/pix-1.0.1/extensions/desktop_background/actions.c 2016-05-16
18:44:34.000000000 +0200
+++ new/pix-1.0.2/extensions/desktop_background/actions.c 2016-06-20
11:31:55.000000000 +0200
@@ -31,23 +31,9 @@
#define GNOME_DESKTOP_BACKGROUND_SCHEMA "org.gnome.desktop.background"
#define DESKTOP_BACKGROUND_FILE_KEY "picture-uri"
#define MATE_DESKTOP_BACKGROUND_FILE_KEY "picture-filename"
-#define DESKTOP_BACKGROUND_STYLE_KEY "picture-options"
-
-
-typedef enum {
- BACKGROUND_STYLE_NONE,
- BACKGROUND_STYLE_WALLPAPER,
- BACKGROUND_STYLE_CENTERED,
- BACKGROUND_STYLE_SCALED,
- BACKGROUND_STYLE_STRETCHED,
- BACKGROUND_STYLE_ZOOM,
- BACKGROUND_STYLE_SPANNED
-} BackgroundStyle;
-
typedef struct {
GFile *file;
- BackgroundStyle background_style;
} WallpaperStyle;
@@ -63,7 +49,6 @@
wallpaper_style_init (WallpaperStyle *style)
{
style->file = NULL;
- style->background_style = BACKGROUND_STYLE_WALLPAPER;
}
@@ -71,7 +56,7 @@
wallpaper_style_init_from_current (WallpaperStyle *style)
{
GSettings *settings;
- char *uri;
+ char *location;
if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Cinnamon") == 0 ||
g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "X-Cinnamon") == 0) {
settings = g_settings_new (CINNAMON_DESKTOP_BACKGROUND_SCHEMA);
@@ -84,17 +69,15 @@
}
if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "MATE") == 0) {
- uri = g_settings_get_string (settings,
MATE_DESKTOP_BACKGROUND_FILE_KEY);
+ location = g_settings_get_string (settings,
MATE_DESKTOP_BACKGROUND_FILE_KEY);
+ style->file = (location != NULL) ? g_file_new_for_path
(location) : NULL;
}
else {
- uri = g_settings_get_string (settings,
DESKTOP_BACKGROUND_FILE_KEY);
+ location = g_settings_get_string (settings,
DESKTOP_BACKGROUND_FILE_KEY);
+ style->file = (location != NULL) ? g_file_new_for_uri
(location) : NULL;
}
- style->file = (uri != NULL) ? g_file_new_for_uri (uri) : NULL;
- style->background_style = g_settings_get_enum (settings,
DESKTOP_BACKGROUND_STYLE_KEY);
-
-
- g_free (uri);
+ g_free (location);
g_object_unref (settings);
}
@@ -102,13 +85,18 @@
static void
wallpaper_style_set_as_current (WallpaperStyle *style)
{
- char *uri;
+ char *location;
if (style->file == NULL)
return;
- uri = g_file_get_uri (style->file);
- if (uri != NULL) {
+ if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "MATE") == 0) {
+ location = g_file_get_path (style->file);
+ }
+ else {
+ location = g_file_get_uri (style->file);
+ }
+ if (location != NULL) {
GSettings *settings;
if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Cinnamon") ==
0 || g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "X-Cinnamon") == 0) {
@@ -122,17 +110,16 @@
}
if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "MATE") == 0) {
- g_settings_set_string (settings,
MATE_DESKTOP_BACKGROUND_FILE_KEY, uri);
+ g_settings_set_string (settings,
MATE_DESKTOP_BACKGROUND_FILE_KEY, location);
}
else {
- g_settings_set_string (settings,
DESKTOP_BACKGROUND_FILE_KEY, uri);
+ g_settings_set_string (settings,
DESKTOP_BACKGROUND_FILE_KEY, location);
}
- g_settings_set_enum (settings, DESKTOP_BACKGROUND_STYLE_KEY,
style->background_style);
g_object_unref (settings);
}
- g_free (uri);
+ g_free (location);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pix-1.0.1/pix/gth-browser-actions-callbacks.c
new/pix-1.0.2/pix/gth-browser-actions-callbacks.c
--- old/pix-1.0.1/pix/gth-browser-actions-callbacks.c 2016-05-16
18:44:34.000000000 +0200
+++ new/pix-1.0.2/pix/gth-browser-actions-callbacks.c 2016-06-20
11:31:55.000000000 +0200
@@ -444,7 +444,7 @@
"translator-credits", _("translator_credits"),
"license", license_text,
"wrap-license", TRUE,
- "website",
"http://github.com/linuxmint/Apps/pix";,
+ "website", "http://github.com/linuxmint/pix";,
(logo != NULL ? "logo" : NULL), logo,
NULL);
