Hello community, here is the log from the commit of package gpaste for openSUSE:Factory checked in at 2018-06-19 11:57:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpaste (Old) and /work/SRC/openSUSE:Factory/.gpaste.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpaste" Tue Jun 19 11:57:14 2018 rev:19 rq:616360 version:3.28.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gpaste/gpaste.changes 2018-04-10 10:54:12.162244040 +0200 +++ /work/SRC/openSUSE:Factory/.gpaste.new/gpaste.changes 2018-06-19 11:57:14.912323075 +0200 @@ -1,0 +2,12 @@ +Tue Jun 12 15:27:19 UTC 2018 - [email protected] + +- Update to version 3.28.2: + + Fix a crash in images support. +- Changes from version 3.28.1: + + Gnome-shell extension cleanups. + + Allow disabling the confirmation dialog for emptying history. +- Drop gpaste-clutter-2.patch: Fixed upstream. +- Change soname to libgpaste11 from libgpaste10 following upstreams + bump. + +------------------------------------------------------------------- Old: ---- gpaste-3.28.0.tar.xz gpaste-clutter-2.patch New: ---- gpaste-3.28.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpaste.spec ++++++ --- /var/tmp/diff_new_pack.yMgWRc/_old 2018-06-19 11:57:15.688294262 +0200 +++ /var/tmp/diff_new_pack.yMgWRc/_new 2018-06-19 11:57:15.692294113 +0200 @@ -19,15 +19,14 @@ %global __requires_exclude typelib\\(Clutter\\) Name: gpaste -Version: 3.28.0 +Version: 3.28.2 Release: 0 Summary: Clipboard management system for GNOME License: BSD-2-Clause Group: System/GUI/GNOME URL: https://github.com/Keruspe/GPaste Source0: http://www.imagination-land.org/files/%{name}/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM gpaste-clutter-2.patch [email protected] -- Import Clutter = 2 instead of 1, Mutter 3.28 bumped the version -Patch0: gpaste-clutter-2.patch + # For directory ownership BuildRequires: gnome-shell >= 3.28 BuildRequires: gobject-introspection-devel >= 1.48 @@ -57,11 +56,11 @@ %description GPaste is a clipboard management daemon with DBus interface. -%package -n libgpaste10 +%package -n libgpaste11 Summary: Library for managing clipboard history Group: System/Libraries -%description -n libgpaste10 +%description -n libgpaste11 GPaste is a clipboard management daemon with DBus interface. This package provides a library for managing clipboard history. @@ -88,7 +87,7 @@ %package devel Summary: Development files for the gpaste clipboard history manager Group: Development/Libraries/GNOME -Requires: libgpaste10 = %{version} +Requires: libgpaste11 = %{version} Requires: typelib-1_0-GPaste-1_0 = %{version} %description devel @@ -115,7 +114,6 @@ %prep %setup -q -%patch0 -p1 %build %configure --enable-vala @@ -127,8 +125,8 @@ desktop-file-edit --set-icon=edit-paste --remove-key Categories --add-category=Applet --add-only-show-in=GNOME %{buildroot}%{_datadir}/applications/org.gnome.GPaste.Ui.desktop %find_lang GPaste %{?no_lang_C} -%post -n libgpaste10 -p /sbin/ldconfig -%postun -n libgpaste10 -p /sbin/ldconfig +%post -n libgpaste11 -p /sbin/ldconfig +%postun -n libgpaste11 -p /sbin/ldconfig %files %license COPYING @@ -148,7 +146,7 @@ %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions -%files -n libgpaste10 +%files -n libgpaste11 %{_libdir}/libgpaste.so.* %files -n typelib-1_0-GPaste-1_0 ++++++ gpaste-3.28.0.tar.xz -> gpaste-3.28.2.tar.xz ++++++ ++++ 1901 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/gpaste-3.28.0/ChangeLog new/gpaste-3.28.2/ChangeLog --- old/gpaste-3.28.0/ChangeLog 2018-03-13 14:55:50.000000000 +0100 +++ new/gpaste-3.28.2/ChangeLog 2018-04-13 22:48:35.000000000 +0200 @@ -1,6 +1,94 @@ # Generated by Makefile. Do not edit. +commit e281ff07fd082b47a35b4ebd7678669c301323ff +Author: Marc-Antoine Perennou <[email protected]> +Date: Mon Mar 26 17:38:48 2018 +0200 + + Release GPaste 3.28.1 + + Signed-off-by: Marc-Antoine Perennou <[email protected]> + +commit 85c923f1cd44ca6272f9da1c4aae75b62fa9ffe8 +Author: Marc-Antoine Perennou <[email protected]> +Date: Mon Mar 26 13:35:49 2018 +0200 + + fix exported symbols + + Signed-off-by: Marc-Antoine Perennou <[email protected]> + +commit 086cdf1e70f447fcd300b5da68465b20533a2c23 +Author: Marc-Antoine Perennou <[email protected]> +Date: Mon Mar 26 11:08:38 2018 +0200 + + use the empty-history-confirmation settings + + Signed-off-by: Marc-Antoine Perennou <[email protected]> + +commit 590111d9351253774681235a9028cebadf33db44 +Author: Marc-Antoine Perennou <[email protected]> +Date: Mon Mar 26 11:05:18 2018 +0200 + + ui: fwd GPasteSettings to history actions + + Signed-off-by: Marc-Antoine Perennou <[email protected]> + +commit cc9e44bb88a16cec3dceadc1d8e60478eb589fb6 +Author: Marc-Antoine Perennou <[email protected]> +Date: Mon Mar 26 10:41:05 2018 +0200 + + settings: add empty-history-confirmation setting + + Signed-off-by: Marc-Antoine Perennou <[email protected]> + +commit c5c3ead1a049fd0753775796ba01f7abd8c2d779 +Author: Marc-Antoine Perennou <[email protected]> +Date: Tue Mar 20 15:56:48 2018 +0100 + + gnome-shell: simplify prefs + + Signed-off-by: Marc-Antoine Perennou <[email protected]> + +commit f2d57e4d06080ded4fdb11220bffedc1be482517 +Author: Marc-Antoine Perennou <[email protected]> +Date: Tue Mar 20 15:51:46 2018 +0100 + + gnome-shell: define all gi versions requirements at extension loading + + Signed-off-by: Marc-Antoine Perennou <[email protected]> + +commit e7d48eb9030782279aac958ff6d4b67c6ad69c82 +Author: Marc-Antoine Perennou <[email protected]> +Date: Tue Mar 20 15:47:53 2018 +0100 + + gnome-shell: specify versions for all gi stuff we import + + Signed-off-by: Marc-Antoine Perennou <[email protected]> + +commit 40299a51a04433aba292642624d60605ef80e106 +Author: Marc-Antoine Perennou <[email protected]> +Date: Tue Mar 20 15:40:36 2018 +0100 + + gnome-shell: don't hardcode the clutter api we require + + Signed-off-by: Marc-Antoine Perennou <[email protected]> + +commit cbf5c053ba94c6009b2a99a1788573327a7ad9c9 +Author: Dominique Leuenberger <[email protected]> +Date: Tue Mar 20 11:58:56 2018 +0100 + + gnome-shell-extension: Set Clutter version to be imported to '2' + + Clutter is internal to mutter and had the version bumped to '2' with GNOME 3.28 + +commit e633bc51d87a44c2d53dadcbd09c5422c75b409c +Author: Marc-Antoine Perennou <[email protected]> +Date: Tue Mar 13 14:56:37 2018 +0100 + + Release GPaste 3.28.0 + + Signed-off-by: Marc-Antoine Perennou <[email protected]> + commit 74a932ab4996122ae959c5f7140f1c7fc8fb1a96 Author: Marc-Antoine Perennou <[email protected]> Date: Tue Mar 13 13:41:37 2018 +0100 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/gpaste-3.28.0/NEWS new/gpaste-3.28.2/NEWS --- old/gpaste-3.28.0/NEWS 2018-03-13 14:52:12.000000000 +0100 +++ new/gpaste-3.28.2/NEWS 2018-04-13 22:48:21.000000000 +0200 @@ -1,3 +1,14 @@ +NEW in 3.28.2 (13/04/2018) +============= + +- fix a crash in images support + +NEW in 3.28.1 (26/03/2018) +============= + +- gnome-shell extension cleanups +- allow disabling the confirmation dialog for emptying history + NEW in 3.28.0 (13/03/2018) ============= @@ -7,6 +18,11 @@ - API adjustments to prepare for the future gtk4 port - ask confirmation before emptying an history +NEW in 3.26.3 (13/04/2018) +============= + +- fix a crash in images support + NEW in 3.26.2 (08/03/2018) ============= @@ -28,6 +44,11 @@ - use the new clipboardText feature in the search provider - gtk4 3.91.2 compatibility +NEW in 3.24.6 (13/04/2018) +============= + +- fix a crash in images support + NEW in 3.24.5 (08/03/2018) ============= @@ -79,6 +100,11 @@ - preparations for mime types support - more reliable "paste" behaviour part in some corener cases +NEW in 3.22.7 (13/04/2018) +============= + +- fix a crash in images support + NEW in 3.22.6 (08/03/2018) ============= @@ -114,7 +140,6 @@ NEW in 3.22.1 (30/11/2016) ============= - - Fix some build system issues for vala and gobject-introspection NEW in 3.22.0 (08/10/2016) @@ -142,6 +167,11 @@ - gnome-shell extension cleanup - Add pagination to gnmoe-shell extension +NEW in 3.20.8 (13/04/2018) +============= + +- fix a crash in images support + NEW in 3.20.7 (08/03/2018) ============= @@ -212,6 +242,11 @@ - Implement the new shotcut window from gtk+ - Various code cleanups +NEW in 3.18.8 (13/04/2018) +============= + +- fix a crash in images support + NEW in 3.18.7 (08/03/2018) ============= 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/gpaste-3.28.0/README.md new/gpaste-3.28.2/README.md --- old/gpaste-3.28.0/README.md 2018-03-13 14:54:07.000000000 +0100 +++ new/gpaste-3.28.2/README.md 2018-04-13 22:48:09.000000000 +0200 @@ -4,7 +4,7 @@ </a> GPaste is a clipboard management system. -See <http://www.imagination-land.org/posts/2012-12-01-gpaste-released.html> for more information about what clipboard +See <https://www.imagination-land.org/posts/2012-12-01-gpaste-released.html> for more information about what clipboard managers are. A library is available for development purposes: @@ -37,8 +37,8 @@ sudo make install sudo glib-compile-schemas /usr/share/glib-2.0/schemas/ -You can see everything I'll post about GPaste [there](http://www.imagination-land.org/tags/GPaste.html). +You can see everything I'll post about GPaste [there](https://www.imagination-land.org/tags/GPaste.html). -Latest release for GNOME 3.28 is: [GPaste 3.28.0](http://www.imagination-land.org/posts/2018-03-13-gpaste-3.28.0-released.html). +Latest release for GNOME 3.28 is: [GPaste 3.28.2](https://www.imagination-land.org/posts/2018-04-13-gpaste-3.28.2-released.html). -Direct link to download: <http://www.imagination-land.org/files/gpaste/gpaste-3.28.0.tar.xz> +Direct link to download: <https://www.imagination-land.org/files/gpaste/gpaste-3.28.2.tar.xz> 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/gpaste-3.28.0/build-aux/compile new/gpaste-3.28.2/build-aux/compile --- old/gpaste-3.28.0/build-aux/compile 2018-03-08 16:51:32.000000000 +0100 +++ new/gpaste-3.28.2/build-aux/compile 2018-04-13 22:36:19.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2017-09-16.17; # UTC +scriptversion=2018-03-07.03; # UTC # Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. @@ -340,7 +340,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" 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/gpaste-3.28.0/build-aux/missing new/gpaste-3.28.2/build-aux/missing --- old/gpaste-3.28.0/build-aux/missing 2018-03-08 16:51:32.000000000 +0100 +++ new/gpaste-3.28.2/build-aux/missing 2018-04-13 22:36:19.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2018-01-04.22; # UTC +scriptversion=2018-03-07.03; # UTC # Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. @@ -207,7 +207,7 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" 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/gpaste-3.28.0/build-aux/test-driver new/gpaste-3.28.2/build-aux/test-driver --- old/gpaste-3.28.0/build-aux/test-driver 2018-03-08 16:51:32.000000000 +0100 +++ new/gpaste-3.28.2/build-aux/test-driver 2018-04-13 22:36:19.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2017-09-16.17; # UTC +scriptversion=2018-03-07.03; # UTC # Copyright (C) 2011-2018 Free Software Foundation, Inc. # @@ -140,7 +140,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" 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/gpaste-3.28.0/configure.ac new/gpaste-3.28.2/configure.ac --- old/gpaste-3.28.0/configure.ac 2018-03-13 14:53:21.000000000 +0100 +++ new/gpaste-3.28.2/configure.ac 2018-04-13 22:47:34.000000000 +0200 @@ -2,14 +2,14 @@ ## ## Copyright (c) 2010-2018, Marc-Antoine Perennou <[email protected]> -m4_define([gpaste_version], [3.28.0]) +m4_define([gpaste_version], [3.28.2]) # Update gpaste_lt_version before each release (and only then) # The format is C:R:A (current revision age) # - If any interface has been added, ‘C:R:A’ becomes ‘C+1:0:A+1’. # - If any interface has been removed or modified, ‘C:R:A’ becomes ‘C+1:0:0’. # - Otherwise, ‘C:R:A’ becomes ‘C:R+1:A’. -m4_define([gpaste_lt_version], [10:0:0]) +m4_define([gpaste_lt_version], [11:1:0]) # Build system requirements m4_define([autoconf_required], [2.69]) 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/gpaste-3.28.0/data/gsettings/org.gnome.GPaste.gschema.xml.in new/gpaste-3.28.2/data/gsettings/org.gnome.GPaste.gschema.xml.in --- old/gpaste-3.28.0/data/gsettings/org.gnome.GPaste.gschema.xml.in 2018-03-11 20:53:50.000000000 +0100 +++ new/gpaste-3.28.2/data/gsettings/org.gnome.GPaste.gschema.xml.in 2018-04-13 22:46:43.000000000 +0200 @@ -208,5 +208,13 @@ </description> </key> + <key name="empty-history-confirmation" type="b"> + <default>true</default> + <summary>Do we prompt for confirmation when emptying an history?</summary> + <description> + By default, we do as it's a destructive action + </description> + </key> + </schema> </schemalist> Binary files old/gpaste-3.28.0/po/de.gmo and new/gpaste-3.28.2/po/de.gmo differ 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/gpaste-3.28.0/po/de.po new/gpaste-3.28.2/po/de.po --- old/gpaste-3.28.0/po/de.po 2018-03-13 14:55:48.000000000 +0100 +++ new/gpaste-3.28.2/po/de.po 2018-04-13 22:48:34.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: GPaste\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2018-03-13 14:55+0100\n" +"POT-Creation-Date: 2018-04-13 22:48+0200\n" "PO-Revision-Date: 2014-03-27 21:03+0100\n" "Last-Translator: Christian Kluge <[email protected]>\n" "Language-Team: \n" @@ -168,7 +168,7 @@ msgstr "Lösche den <number>ten Eintrag aus der Chronik" #: src/libgpaste/settings-ui/gpaste-settings-ui-stack.c:320 -#: src/libgpaste/ui/gpaste-ui-window.c:310 src/client/gpaste-client.c:804 +#: src/libgpaste/ui/gpaste-ui-window.c:311 src/client/gpaste-client.c:804 msgid "Couldn't connect to GPaste daemon" msgstr "Verbindung zum GPaste daemon fehlgeschlagen" @@ -193,8 +193,8 @@ #. translators: This is the name of a multi-history management action #: src/libgpaste/settings-ui/gpaste-settings-ui-stack.c:459 #: src/libgpaste/ui/gpaste-ui-delete-item.c:49 -#: src/libgpaste/ui/gpaste-ui-delete-history.c:24 -#: src/libgpaste/ui/gpaste-ui-delete-history.c:61 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:25 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:65 msgid "Delete" msgstr "Löschen" @@ -203,7 +203,7 @@ msgstr "Über" #: src/libgpaste/ui/gpaste-ui-backup-history.c:43 -#: src/libgpaste/ui/gpaste-ui-backup-history.c:136 +#: src/libgpaste/ui/gpaste-ui-backup-history.c:140 msgid "Backup" msgstr "Backup" @@ -217,7 +217,7 @@ msgid "Under which name do you want to backup this history?" msgstr "" -#: src/libgpaste/ui/gpaste-ui-delete-history.c:24 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:25 #, fuzzy msgid "Are you sure you want to delete this history?" msgstr "Tastenkürzel um den ersten Eintrag in der Chronik zu löschen" @@ -228,8 +228,8 @@ msgstr "" #. Translators: this is the translation for emptying the history -#: src/libgpaste/ui/gpaste-ui-empty-history.c:61 -#: src/libgpaste/util/gpaste-util.c:338 +#: src/libgpaste/ui/gpaste-ui-empty-history.c:65 +#: src/libgpaste/util/gpaste-util.c:341 #, fuzzy msgid "Empty" msgstr "(Leer)" @@ -290,11 +290,11 @@ msgid "Upload" msgstr "" -#: src/libgpaste/util/gpaste-util.c:338 +#: src/libgpaste/util/gpaste-util.c:341 msgid "Do you really want to empty the history?" msgstr "" -#: src/libgpaste/util/gpaste-util.c:617 +#: src/libgpaste/util/gpaste-util.c:620 msgid "Could not create history dir" msgstr "Ordner für die Chronik konnte nicht angelegt werden" @@ -908,6 +908,15 @@ "Die Vorgabe ist Strg + Alt + v (\"<Strg><Alt>V\"). Ein leeres " "Feld schaltet diese Funktion ab." +#: data/gsettings/org.gnome.GPaste.gschema.xml.in:213 +msgid "Do we prompt for confirmation when emptying an history?" +msgstr "" + +#: data/gsettings/org.gnome.GPaste.gschema.xml.in:214 +#, fuzzy +msgid "By default, we do as it's a destructive action" +msgstr "Standardmäßig bleibt der Daemon unberührt." + #~ msgid "launch the applet" #~ msgstr "Applet starten" Binary files old/gpaste-3.28.0/po/es.gmo and new/gpaste-3.28.2/po/es.gmo differ 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/gpaste-3.28.0/po/es.po new/gpaste-3.28.2/po/es.po --- old/gpaste-3.28.0/po/es.po 2018-03-13 14:55:48.000000000 +0100 +++ new/gpaste-3.28.2/po/es.po 2018-04-13 22:48:34.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: GPaste\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2018-03-13 14:55+0100\n" +"POT-Creation-Date: 2018-04-13 22:48+0200\n" "PO-Revision-Date: 2011-11-20 16:30+0100\n" "Last-Translator: Antonio Trujillo <[email protected]>\n" "Language-Team: Spanish\n" @@ -167,7 +167,7 @@ msgstr "Eliminar el primer elemento del historial" #: src/libgpaste/settings-ui/gpaste-settings-ui-stack.c:320 -#: src/libgpaste/ui/gpaste-ui-window.c:310 src/client/gpaste-client.c:804 +#: src/libgpaste/ui/gpaste-ui-window.c:311 src/client/gpaste-client.c:804 msgid "Couldn't connect to GPaste daemon" msgstr "No se pudo conectar al servicio GPaste" @@ -192,8 +192,8 @@ #. translators: This is the name of a multi-history management action #: src/libgpaste/settings-ui/gpaste-settings-ui-stack.c:459 #: src/libgpaste/ui/gpaste-ui-delete-item.c:49 -#: src/libgpaste/ui/gpaste-ui-delete-history.c:24 -#: src/libgpaste/ui/gpaste-ui-delete-history.c:61 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:25 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:65 msgid "Delete" msgstr "Suprimir" @@ -202,7 +202,7 @@ msgstr "" #: src/libgpaste/ui/gpaste-ui-backup-history.c:43 -#: src/libgpaste/ui/gpaste-ui-backup-history.c:136 +#: src/libgpaste/ui/gpaste-ui-backup-history.c:140 msgid "Backup" msgstr "Copia de seguridad" @@ -216,7 +216,7 @@ msgid "Under which name do you want to backup this history?" msgstr "" -#: src/libgpaste/ui/gpaste-ui-delete-history.c:24 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:25 #, fuzzy msgid "Are you sure you want to delete this history?" msgstr "Atajo de teclado para eliminar la primera entrada del historial" @@ -227,8 +227,8 @@ msgstr "" #. Translators: this is the translation for emptying the history -#: src/libgpaste/ui/gpaste-ui-empty-history.c:61 -#: src/libgpaste/util/gpaste-util.c:338 +#: src/libgpaste/ui/gpaste-ui-empty-history.c:65 +#: src/libgpaste/util/gpaste-util.c:341 #, fuzzy msgid "Empty" msgstr "(Vacío)" @@ -290,11 +290,11 @@ msgid "Upload" msgstr "" -#: src/libgpaste/util/gpaste-util.c:338 +#: src/libgpaste/util/gpaste-util.c:341 msgid "Do you really want to empty the history?" msgstr "" -#: src/libgpaste/util/gpaste-util.c:617 +#: src/libgpaste/util/gpaste-util.c:620 msgid "Could not create history dir" msgstr "No se pudo crear directorio de historial" @@ -903,6 +903,15 @@ "Por omisión, pulsando ctrl + alt + v (\"<Ctrl><Alt>v\"). Una " "cadena vacía desactivaría esta funcionalidad." +#: data/gsettings/org.gnome.GPaste.gschema.xml.in:213 +msgid "Do we prompt for confirmation when emptying an history?" +msgstr "" + +#: data/gsettings/org.gnome.GPaste.gschema.xml.in:214 +#, fuzzy +msgid "By default, we do as it's a destructive action" +msgstr "Por omisión, el estado del servicio se mantiene sin cambios." + #~ msgid "launch the applet" #~ msgstr "iniciar el applet" Binary files old/gpaste-3.28.0/po/fr.gmo and new/gpaste-3.28.2/po/fr.gmo differ 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/gpaste-3.28.0/po/fr.po new/gpaste-3.28.2/po/fr.po --- old/gpaste-3.28.0/po/fr.po 2018-03-13 14:55:48.000000000 +0100 +++ new/gpaste-3.28.2/po/fr.po 2018-04-13 22:48:34.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: GPaste\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2018-03-13 14:55+0100\n" +"POT-Creation-Date: 2018-04-13 22:48+0200\n" "PO-Revision-Date: 2011-01-25 16:05+0100\n" "Last-Translator: Marc-Antoine Perennou <[email protected]>\n" "Language-Team: French\n" @@ -157,7 +157,7 @@ msgstr "Téléverser l'élément actif vers un sevice type pastebin" #: src/libgpaste/settings-ui/gpaste-settings-ui-stack.c:320 -#: src/libgpaste/ui/gpaste-ui-window.c:310 src/client/gpaste-client.c:804 +#: src/libgpaste/ui/gpaste-ui-window.c:311 src/client/gpaste-client.c:804 msgid "Couldn't connect to GPaste daemon" msgstr "Impossible de se connecter au démon GPaste" @@ -182,8 +182,8 @@ #. translators: This is the name of a multi-history management action #: src/libgpaste/settings-ui/gpaste-settings-ui-stack.c:459 #: src/libgpaste/ui/gpaste-ui-delete-item.c:49 -#: src/libgpaste/ui/gpaste-ui-delete-history.c:24 -#: src/libgpaste/ui/gpaste-ui-delete-history.c:61 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:25 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:65 msgid "Delete" msgstr "Supprimer" @@ -192,7 +192,7 @@ msgstr "À propos" #: src/libgpaste/ui/gpaste-ui-backup-history.c:43 -#: src/libgpaste/ui/gpaste-ui-backup-history.c:136 +#: src/libgpaste/ui/gpaste-ui-backup-history.c:140 msgid "Backup" msgstr "Copier" @@ -206,7 +206,7 @@ msgid "Under which name do you want to backup this history?" msgstr "Sous quel nom voulez-vous copier cet historique ?" -#: src/libgpaste/ui/gpaste-ui-delete-history.c:24 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:25 msgid "Are you sure you want to delete this history?" msgstr "Voulez-vous vraiment supprimer cet historique ?" @@ -216,8 +216,8 @@ msgstr "Modifier" #. Translators: this is the translation for emptying the history -#: src/libgpaste/ui/gpaste-ui-empty-history.c:61 -#: src/libgpaste/util/gpaste-util.c:338 +#: src/libgpaste/ui/gpaste-ui-empty-history.c:65 +#: src/libgpaste/util/gpaste-util.c:341 msgid "Empty" msgstr "Vider" @@ -275,11 +275,11 @@ msgid "Upload" msgstr "Publier" -#: src/libgpaste/util/gpaste-util.c:338 +#: src/libgpaste/util/gpaste-util.c:341 msgid "Do you really want to empty the history?" msgstr "Voulez-vous vraiment vider l'historique ?" -#: src/libgpaste/util/gpaste-util.c:617 +#: src/libgpaste/util/gpaste-util.c:620 msgid "Could not create history dir" msgstr "Impossible de créer le dossier d'historique" @@ -773,11 +773,12 @@ "Do we save all versions of selected rich text (e.g. html) or just the plain " "text version?" msgstr "" +"Faut-il sauvegarder toutes les versions d'un texte riche (html) selectionné, " +"ou juste le texte brut ?" #: data/gsettings/org.gnome.GPaste.gschema.xml.in:129 -#, fuzzy msgid "By default, we're saving all" -msgstr "Par défaut, on le sauvegarde." +msgstr "Par défaut, on sauvegarde tout." #: data/gsettings/org.gnome.GPaste.gschema.xml.in:136 msgid "Do we save the history from one session to another?" @@ -885,3 +886,11 @@ msgstr "" "Par défaut, appuyer sur ctrl + alt + u le fait (\"<Ctrl><Alt>U\"). Une " "chaîne vide désactive cette fonctionnalité." + +#: data/gsettings/org.gnome.GPaste.gschema.xml.in:213 +msgid "Do we prompt for confirmation when emptying an history?" +msgstr "Faut-il demander confirmation avant de vider un historique ?" + +#: data/gsettings/org.gnome.GPaste.gschema.xml.in:214 +msgid "By default, we do as it's a destructive action" +msgstr "Par défaut, on le fait car c'est une action destructrice" Binary files old/gpaste-3.28.0/po/nl_NL.gmo and new/gpaste-3.28.2/po/nl_NL.gmo differ 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/gpaste-3.28.0/po/nl_NL.po new/gpaste-3.28.2/po/nl_NL.po --- old/gpaste-3.28.0/po/nl_NL.po 2018-03-13 14:55:48.000000000 +0100 +++ new/gpaste-3.28.2/po/nl_NL.po 2018-04-13 22:48:34.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: GPaste\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2018-03-13 14:55+0100\n" +"POT-Creation-Date: 2018-04-13 22:48+0200\n" "PO-Revision-Date: 2017-03-17 17:38+0100\n" "Last-Translator: Heimen Stoffels <[email protected]>\n" "Language-Team: Vistaus <[email protected]>\n" @@ -158,7 +158,7 @@ msgstr "Actief item uploaden naar een pastebin-dienst" #: src/libgpaste/settings-ui/gpaste-settings-ui-stack.c:320 -#: src/libgpaste/ui/gpaste-ui-window.c:310 src/client/gpaste-client.c:804 +#: src/libgpaste/ui/gpaste-ui-window.c:311 src/client/gpaste-client.c:804 msgid "Couldn't connect to GPaste daemon" msgstr "Het verbinden met de GPaste-daemon is mislukt" @@ -183,8 +183,8 @@ #. translators: This is the name of a multi-history management action #: src/libgpaste/settings-ui/gpaste-settings-ui-stack.c:459 #: src/libgpaste/ui/gpaste-ui-delete-item.c:49 -#: src/libgpaste/ui/gpaste-ui-delete-history.c:24 -#: src/libgpaste/ui/gpaste-ui-delete-history.c:61 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:25 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:65 msgid "Delete" msgstr "Verwijderen" @@ -193,7 +193,7 @@ msgstr "Over" #: src/libgpaste/ui/gpaste-ui-backup-history.c:43 -#: src/libgpaste/ui/gpaste-ui-backup-history.c:136 +#: src/libgpaste/ui/gpaste-ui-backup-history.c:140 msgid "Backup" msgstr "Back-uppen" @@ -207,7 +207,7 @@ msgid "Under which name do you want to backup this history?" msgstr "Onder welke naam wilt u de geschiedenis opslaan?" -#: src/libgpaste/ui/gpaste-ui-delete-history.c:24 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:25 msgid "Are you sure you want to delete this history?" msgstr "Weet u zeker dat u de geschiedenis wilt verwijderen?" @@ -217,8 +217,8 @@ msgstr "Bewerken" #. Translators: this is the translation for emptying the history -#: src/libgpaste/ui/gpaste-ui-empty-history.c:61 -#: src/libgpaste/util/gpaste-util.c:338 +#: src/libgpaste/ui/gpaste-ui-empty-history.c:65 +#: src/libgpaste/util/gpaste-util.c:341 msgid "Empty" msgstr "Legen" @@ -275,11 +275,11 @@ msgid "Upload" msgstr "Uploaden" -#: src/libgpaste/util/gpaste-util.c:338 +#: src/libgpaste/util/gpaste-util.c:341 msgid "Do you really want to empty the history?" msgstr "Weet u zeker dat u de geschiedenis wilt legen?" -#: src/libgpaste/util/gpaste-util.c:617 +#: src/libgpaste/util/gpaste-util.c:620 msgid "Could not create history dir" msgstr "Het creëren van de geschiedenismap is mislukt" @@ -880,6 +880,15 @@ "Ctrl + Alt + U wordt gebruikt om te uploaden (\"<Ctrl><Alt>U\"). Dit " "leeglaten schakelt de functionaliteit uit." +#: data/gsettings/org.gnome.GPaste.gschema.xml.in:213 +msgid "Do we prompt for confirmation when emptying an history?" +msgstr "" + +#: data/gsettings/org.gnome.GPaste.gschema.xml.in:214 +#, fuzzy +msgid "By default, we do as it's a destructive action" +msgstr "Standaard blijft de daemon-staat ongewijzigd" + #~ msgid "launch the applet" #~ msgstr "Applet starten" Binary files old/gpaste-3.28.0/po/pt_BR.gmo and new/gpaste-3.28.2/po/pt_BR.gmo differ 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/gpaste-3.28.0/po/pt_BR.po new/gpaste-3.28.2/po/pt_BR.po --- old/gpaste-3.28.0/po/pt_BR.po 2018-03-13 14:55:48.000000000 +0100 +++ new/gpaste-3.28.2/po/pt_BR.po 2018-04-13 22:48:34.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: GPaste\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2018-03-13 14:55+0100\n" +"POT-Creation-Date: 2018-04-13 22:48+0200\n" "PO-Revision-Date: 2015-10-10 20:03-0300\n" "Last-Translator: Elder Marco <[email protected]>\n" "Language-Team: \n" @@ -167,7 +167,7 @@ msgstr "Carregar o item ativo para um serviço de pastebin: " #: src/libgpaste/settings-ui/gpaste-settings-ui-stack.c:320 -#: src/libgpaste/ui/gpaste-ui-window.c:310 src/client/gpaste-client.c:804 +#: src/libgpaste/ui/gpaste-ui-window.c:311 src/client/gpaste-client.c:804 msgid "Couldn't connect to GPaste daemon" msgstr "Não foi possível se conectar ao daemon do GPaste" @@ -192,8 +192,8 @@ #. translators: This is the name of a multi-history management action #: src/libgpaste/settings-ui/gpaste-settings-ui-stack.c:459 #: src/libgpaste/ui/gpaste-ui-delete-item.c:49 -#: src/libgpaste/ui/gpaste-ui-delete-history.c:24 -#: src/libgpaste/ui/gpaste-ui-delete-history.c:61 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:25 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:65 msgid "Delete" msgstr "Apagar" @@ -202,7 +202,7 @@ msgstr "Sobre" #: src/libgpaste/ui/gpaste-ui-backup-history.c:43 -#: src/libgpaste/ui/gpaste-ui-backup-history.c:136 +#: src/libgpaste/ui/gpaste-ui-backup-history.c:140 msgid "Backup" msgstr "Backup" @@ -216,7 +216,7 @@ msgid "Under which name do you want to backup this history?" msgstr "Com qual nome você deseja salvar este histórico?" -#: src/libgpaste/ui/gpaste-ui-delete-history.c:24 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:25 msgid "Are you sure you want to delete this history?" msgstr "Tem certeza que quer apagar este histórico?" @@ -226,8 +226,8 @@ msgstr "Editar" #. Translators: this is the translation for emptying the history -#: src/libgpaste/ui/gpaste-ui-empty-history.c:61 -#: src/libgpaste/util/gpaste-util.c:338 +#: src/libgpaste/ui/gpaste-ui-empty-history.c:65 +#: src/libgpaste/util/gpaste-util.c:341 msgid "Empty" msgstr "Vazio" @@ -286,11 +286,11 @@ msgid "Upload" msgstr "Carregar" -#: src/libgpaste/util/gpaste-util.c:338 +#: src/libgpaste/util/gpaste-util.c:341 msgid "Do you really want to empty the history?" msgstr "Você quer mesmo esvaziar o histórico?" -#: src/libgpaste/util/gpaste-util.c:617 +#: src/libgpaste/util/gpaste-util.c:620 msgid "Could not create history dir" msgstr "Não foi possível criar o diretório do histórico" @@ -902,6 +902,15 @@ "Por padrão, a combinação de teclas ctrl + alt + u faz isso (\"<Ctrl>" "<Alt>U\"). Deixar vazio aqui desabilita essa funcionalidade." +#: data/gsettings/org.gnome.GPaste.gschema.xml.in:213 +msgid "Do we prompt for confirmation when emptying an history?" +msgstr "" + +#: data/gsettings/org.gnome.GPaste.gschema.xml.in:214 +#, fuzzy +msgid "By default, we do as it's a destructive action" +msgstr "Por padrão, o estado do daemon se mantém inalterado" + #~ msgid "launch the applet" #~ msgstr "inicia o applet do GPaste" Binary files old/gpaste-3.28.0/po/sv.gmo and new/gpaste-3.28.2/po/sv.gmo differ 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/gpaste-3.28.0/po/sv.po new/gpaste-3.28.2/po/sv.po --- old/gpaste-3.28.0/po/sv.po 2018-03-13 14:55:48.000000000 +0100 +++ new/gpaste-3.28.2/po/sv.po 2018-04-13 22:48:34.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: GPaste\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2018-03-13 14:55+0100\n" +"POT-Creation-Date: 2018-04-13 22:48+0200\n" "PO-Revision-Date: 2018-01-06 08:14+0100\n" "Last-Translator: Åke Engelbrektson <[email protected]>\n" "Language-Team: Svenska Språkfiler <[email protected]>\n" @@ -159,7 +159,7 @@ msgstr "Ladda upp aktiv post till en pastebin-tjänst" #: src/libgpaste/settings-ui/gpaste-settings-ui-stack.c:320 -#: src/libgpaste/ui/gpaste-ui-window.c:310 src/client/gpaste-client.c:804 +#: src/libgpaste/ui/gpaste-ui-window.c:311 src/client/gpaste-client.c:804 msgid "Couldn't connect to GPaste daemon" msgstr "Kunde inte ansluta till GPaste-tjänsten" @@ -184,8 +184,8 @@ #. translators: This is the name of a multi-history management action #: src/libgpaste/settings-ui/gpaste-settings-ui-stack.c:459 #: src/libgpaste/ui/gpaste-ui-delete-item.c:49 -#: src/libgpaste/ui/gpaste-ui-delete-history.c:24 -#: src/libgpaste/ui/gpaste-ui-delete-history.c:61 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:25 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:65 msgid "Delete" msgstr "Ta bort" @@ -194,7 +194,7 @@ msgstr "Om" #: src/libgpaste/ui/gpaste-ui-backup-history.c:43 -#: src/libgpaste/ui/gpaste-ui-backup-history.c:136 +#: src/libgpaste/ui/gpaste-ui-backup-history.c:140 msgid "Backup" msgstr "Säkerhetskopiera" @@ -208,7 +208,7 @@ msgid "Under which name do you want to backup this history?" msgstr "Under vilket namn vill du säkerhetskopiera historiken?" -#: src/libgpaste/ui/gpaste-ui-delete-history.c:24 +#: src/libgpaste/ui/gpaste-ui-delete-history.c:25 msgid "Are you sure you want to delete this history?" msgstr "Vill du verkligen ta bort denna historik?" @@ -218,8 +218,8 @@ msgstr "Redigera" #. Translators: this is the translation for emptying the history -#: src/libgpaste/ui/gpaste-ui-empty-history.c:61 -#: src/libgpaste/util/gpaste-util.c:338 +#: src/libgpaste/ui/gpaste-ui-empty-history.c:65 +#: src/libgpaste/util/gpaste-util.c:341 msgid "Empty" msgstr "Töm" @@ -276,11 +276,11 @@ msgid "Upload" msgstr "Ladda upp" -#: src/libgpaste/util/gpaste-util.c:338 +#: src/libgpaste/util/gpaste-util.c:341 msgid "Do you really want to empty the history?" msgstr "Vill du verkligen tömma historiken?" -#: src/libgpaste/util/gpaste-util.c:617 +#: src/libgpaste/util/gpaste-util.c:620 msgid "Could not create history dir" msgstr "Kunde inte skapa historikmapp" @@ -866,3 +866,12 @@ msgstr "" "Som standard görs detta med Ctrl+Alt+U (\"<Ctrl><Alt>U\"). En tom sträng " "här, inaktiverar denna funktion." + +#: data/gsettings/org.gnome.GPaste.gschema.xml.in:213 +msgid "Do we prompt for confirmation when emptying an history?" +msgstr "" + +#: data/gsettings/org.gnome.GPaste.gschema.xml.in:214 +#, fuzzy +msgid "By default, we do as it's a destructive action" +msgstr "Som standard ändras inte tjänstens status" 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/gpaste-3.28.0/src/gnome-shell/deleteButton.js new/gpaste-3.28.2/src/gnome-shell/deleteButton.js --- old/gpaste-3.28.0/src/gnome-shell/deleteButton.js 2018-03-11 23:51:45.000000000 +0100 +++ new/gpaste-3.28.2/src/gnome-shell/deleteButton.js 2018-04-13 22:46:43.000000000 +0200 @@ -5,8 +5,6 @@ */ /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */ -imports.gi.versions.Clutter = '1'; - const Lang = imports.lang; const Clutter = imports.gi.Clutter; 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/gpaste-3.28.0/src/gnome-shell/emptyHistoryItem.js new/gpaste-3.28.2/src/gnome-shell/emptyHistoryItem.js --- old/gpaste-3.28.0/src/gnome-shell/emptyHistoryItem.js 2018-03-12 00:00:36.000000000 +0100 +++ new/gpaste-3.28.2/src/gnome-shell/emptyHistoryItem.js 2018-04-13 22:46:43.000000000 +0200 @@ -15,7 +15,7 @@ var GPasteEmptyHistoryItem = new Lang.Class({ Name: 'GPasteEmptyHistoryItem', - _init: function(client) { + _init: function(client, settings) { this.actor = new St.Button({ reactive: true, can_focus: true, @@ -29,7 +29,10 @@ client.get_history_name((client, result) => { const name = client.get_history_name_finish(result); - GPaste.util_activate_ui("empty", GLib.Variant.new_string(name)); + if (settings.get_empty_history_confirmation()) + GPaste.util_activate_ui("empty", GLib.Variant.new_string(name)); + else + client.empty_history(name, null); }); }); } 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/gpaste-3.28.0/src/gnome-shell/extension.js new/gpaste-3.28.2/src/gnome-shell/extension.js --- old/gpaste-3.28.0/src/gnome-shell/extension.js 2018-03-11 23:51:45.000000000 +0100 +++ new/gpaste-3.28.2/src/gnome-shell/extension.js 2018-04-13 22:46:43.000000000 +0200 @@ -5,6 +5,14 @@ */ /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */ +const Config = imports.misc.config; + +imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION; +imports.gi.versions.GLib = '2.0'; +imports.gi.versions.GPaste = '1.0'; +imports.gi.versions.Pango = '1.0'; +imports.gi.versions.St = '1.0'; + const Gettext = imports.gettext; const Main = imports.ui.main; 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/gpaste-3.28.0/src/gnome-shell/indicator.js new/gpaste-3.28.2/src/gnome-shell/indicator.js --- old/gpaste-3.28.0/src/gnome-shell/indicator.js 2018-03-11 23:51:45.000000000 +0100 +++ new/gpaste-3.28.2/src/gnome-shell/indicator.js 2018-04-13 22:46:43.000000000 +0200 @@ -5,8 +5,6 @@ */ /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */ -imports.gi.versions.Clutter = '1'; - const Gettext = imports.gettext; const Lang = imports.lang; @@ -81,7 +79,7 @@ this._client = GPaste.Client.new_finish(result); this._uiItem = new UiItem.GPasteUiItem(this.menu); - this._emptyHistoryItem = new EmptyHistoryItem.GPasteEmptyHistoryItem(this._client); + this._emptyHistoryItem = new EmptyHistoryItem.GPasteEmptyHistoryItem(this._client, this._settings); this._aboutItem = new AboutItem.GPasteAboutItem(this._client, this.menu); this._switch = new StateSwitch.GPasteStateSwitch(this._client); 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/gpaste-3.28.0/src/gnome-shell/item.js new/gpaste-3.28.2/src/gnome-shell/item.js --- old/gpaste-3.28.0/src/gnome-shell/item.js 2018-03-11 23:51:45.000000000 +0100 +++ new/gpaste-3.28.2/src/gnome-shell/item.js 2018-04-13 22:46:43.000000000 +0200 @@ -5,8 +5,6 @@ */ /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */ -imports.gi.versions.Clutter = '1'; - const Lang = imports.lang; const PopupMenu = imports.ui.popupMenu; 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/gpaste-3.28.0/src/gnome-shell/pageSwitcher.js new/gpaste-3.28.2/src/gnome-shell/pageSwitcher.js --- old/gpaste-3.28.0/src/gnome-shell/pageSwitcher.js 2018-03-11 23:51:45.000000000 +0100 +++ new/gpaste-3.28.2/src/gnome-shell/pageSwitcher.js 2018-04-13 22:46:43.000000000 +0200 @@ -5,8 +5,6 @@ */ /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */ -imports.gi.versions.Clutter = '1'; - const Lang = imports.lang; const PopupMenu = imports.ui.popupMenu; 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/gpaste-3.28.0/src/gnome-shell/prefs.js new/gpaste-3.28.2/src/gnome-shell/prefs.js --- old/gpaste-3.28.0/src/gnome-shell/prefs.js 2018-03-11 23:51:45.000000000 +0100 +++ new/gpaste-3.28.2/src/gnome-shell/prefs.js 2018-04-13 22:46:43.000000000 +0200 @@ -5,12 +5,8 @@ */ /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */ -imports.gi.versions.Gtk = '3.0'; - const Gettext = imports.gettext; -const Gtk = imports.gi.Gtk; - const GPaste = imports.gi.GPaste; const ExtensionUtils = imports.misc.extensionUtils; @@ -23,7 +19,7 @@ } function buildPrefsWidget() { - let widget = new GPaste.SettingsUiWidget({ orientation: Gtk.Orientation.VERTICAL, margin: 12 }); + let widget = new GPaste.SettingsUiWidget({ margin: 12 }); if (widget) { widget.show_all(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gpaste-3.28.0/src/libgpaste/core/gpaste-clipboard.c new/gpaste-3.28.2/src/libgpaste/core/gpaste-clipboard.c --- old/gpaste-3.28.0/src/libgpaste/core/gpaste-clipboard.c 2018-03-13 13:41:03.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/core/gpaste-clipboard.c 2018-04-13 22:46:51.000000000 +0200 @@ -528,7 +528,7 @@ g_autofree gchar *checksum = g_paste_util_compute_checksum (image); if (g_paste_str_equal (checksum, priv->image_checksum)) - g_clear_object (&image); + image = NULL; else g_paste_clipboard_private_select_image (priv, image, checksum); 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/gpaste-3.28.0/src/libgpaste/core/gpaste-clipboards-manager.c new/gpaste-3.28.2/src/libgpaste/core/gpaste-clipboards-manager.c --- old/gpaste-3.28.0/src/libgpaste/core/gpaste-clipboards-manager.c 2018-03-12 10:01:39.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/core/gpaste-clipboards-manager.c 2018-04-13 22:46:51.000000000 +0200 @@ -241,7 +241,6 @@ gpointer user_data) { g_autofree GPasteClipboardsManagerCallbackData *data = user_data; - g_autoptr (GdkPixbuf) img = image; GPasteClipboardsManagerPrivate *priv = data->priv; GPasteItem *item = NULL; 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/gpaste-3.28.0/src/libgpaste/gpaste-gsettings-keys.h new/gpaste-3.28.2/src/libgpaste/gpaste-gsettings-keys.h --- old/gpaste-3.28.0/src/libgpaste/gpaste-gsettings-keys.h 2018-03-11 20:51:17.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/gpaste-gsettings-keys.h 2018-04-13 22:46:43.000000000 +0200 @@ -20,6 +20,7 @@ #define G_PASTE_CLOSE_ON_SELECT_SETTING "close-on-select" #define G_PASTE_ELEMENT_SIZE_SETTING "element-size" +#define G_PASTE_EMPTY_HISTORY_CONFIRMATION_SETTING "empty-history-confirmation" #define G_PASTE_GROWING_LINES_SETTING "growing-lines" #define G_PASTE_HISTORY_NAME_SETTING "history-name" #define G_PASTE_IMAGES_SUPPORT_SETTING "images-support" 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/gpaste-3.28.0/src/libgpaste/libgpaste.sym new/gpaste-3.28.2/src/libgpaste/libgpaste.sym --- old/gpaste-3.28.0/src/libgpaste/libgpaste.sym 2018-03-12 09:51:39.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/libgpaste.sym 2018-04-13 22:46:43.000000000 +0200 @@ -366,24 +366,19 @@ g_paste_search_provider_new; g_paste_ui_backup_history_get_type; - g_paste_ui_backup_history_new; g_paste_ui_delete_history_get_type; - g_paste_ui_delete_history_new; g_paste_ui_delete_item_get_type; g_paste_ui_delete_item_new; g_paste_ui_edit_item_get_type; g_paste_ui_edit_item_new; g_paste_ui_empty_history_get_type; - g_paste_ui_empty_history_new; g_paste_ui_empty_item_new; g_paste_ui_header_get_search_button; g_paste_ui_header_show_prefs; g_paste_ui_history_search; g_paste_ui_history_action_get_type; - g_paste_ui_history_action_new; g_paste_ui_history_action_set_history; g_paste_ui_history_actions_get_type; - g_paste_ui_history_actions_new; g_paste_ui_history_actions_set_relative_to; g_paste_ui_history_new; g_paste_ui_item_action_get_type; @@ -488,6 +483,19 @@ g_paste_clipboards_manager_sync_from_to; g_paste_ui_window_empty_history; +} LIBGPASTE_3_24_0; + +LIBGPASTE_3_28_1 { +global: + g_paste_ui_backup_history_new; + g_paste_ui_delete_history_new; + g_paste_ui_empty_history_new; + g_paste_ui_history_action_new; + g_paste_ui_history_actions_new; g_paste_util_empty_history; -} LIBGPASTE_3_24_0; + + g_paste_settings_get_empty_history_confirmation; + g_paste_settings_reset_empty_history_confirmation; + g_paste_settings_set_empty_history_confirmation; +} LIBGPASTE_3_28_0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gpaste-3.28.0/src/libgpaste/settings/gpaste-settings.c new/gpaste-3.28.2/src/libgpaste/settings/gpaste-settings.c --- old/gpaste-3.28.0/src/libgpaste/settings/gpaste-settings.c 2018-03-11 21:00:14.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/settings/gpaste-settings.c 2018-04-13 22:46:43.000000000 +0200 @@ -27,6 +27,7 @@ gboolean close_on_select; guint64 element_size; + gboolean empty_history_confirmation; gboolean growing_lines; gchar *history_name; gboolean images_support; @@ -173,6 +174,29 @@ UNSIGNED_SETTING (element_size, ELEMENT_SIZE) /** + * g_paste_settings_get_empty_history_confirmation: + * @self: a #GPasteSettings instance + * + * Get the "empty-history-confirmation" setting + * + * Returns: the value of the "empty-history-confirmation" setting + */ +/** + * g_paste_settings_reset_empty_history_confirmation: + * @self: a #GPasteSettings instance + * + * Reset the "empty-history-confirmation" setting + */ +/** + * g_paste_settings_set_empty_history_confirmation: + * @self: a #GPasteSettings instance + * @value: whether to prompt for confirmation when emptying an history + * + * Change the "empty-history-confirmation" setting + */ +BOOLEAN_SETTING (empty_history_confirmation, EMPTY_HISTORY_CONFIRMATION) + +/** * g_paste_settings_get_growing_lines: * @self: a #GPasteSettings instance * @@ -801,6 +825,8 @@ g_paste_settings_private_set_close_on_select_from_dconf (priv); else if (g_paste_str_equal (key, G_PASTE_ELEMENT_SIZE_SETTING)) g_paste_settings_private_set_element_size_from_dconf (priv); + else if (g_paste_str_equal (key, G_PASTE_EMPTY_HISTORY_CONFIRMATION_SETTING)) + g_paste_settings_private_set_empty_history_confirmation_from_dconf (priv); else if (g_paste_str_equal (key, G_PASTE_GROWING_LINES_SETTING)) g_paste_settings_private_set_growing_lines_from_dconf (priv); else if (g_paste_str_equal (key, G_PASTE_HISTORY_NAME_SETTING)) @@ -992,6 +1018,7 @@ g_paste_settings_private_set_close_on_select_from_dconf (priv); g_paste_settings_private_set_element_size_from_dconf (priv); + g_paste_settings_private_set_empty_history_confirmation_from_dconf (priv); g_paste_settings_private_set_growing_lines_from_dconf (priv); g_paste_settings_private_set_history_name_from_dconf (priv); g_paste_settings_private_set_images_support_from_dconf (priv); 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/gpaste-3.28.0/src/libgpaste/settings/gpaste-settings.h new/gpaste-3.28.2/src/libgpaste/settings/gpaste-settings.h --- old/gpaste-3.28.0/src/libgpaste/settings/gpaste-settings.h 2018-03-11 20:59:25.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/settings/gpaste-settings.h 2018-04-13 22:46:43.000000000 +0200 @@ -21,6 +21,7 @@ gboolean g_paste_settings_get_close_on_select (const GPasteSettings *self); guint64 g_paste_settings_get_element_size (const GPasteSettings *self); +gboolean g_paste_settings_get_empty_history_confirmation (const GPasteSettings *self); gboolean g_paste_settings_get_growing_lines (const GPasteSettings *self); const gchar *g_paste_settings_get_history_name (const GPasteSettings *self); gboolean g_paste_settings_get_images_support (const GPasteSettings *self); @@ -46,6 +47,7 @@ void g_paste_settings_reset_close_on_select (GPasteSettings *self); void g_paste_settings_reset_element_size (GPasteSettings *self); +void g_paste_settings_reset_empty_history_confirmation (GPasteSettings *self); void g_paste_settings_reset_growing_lines (GPasteSettings *self); void g_paste_settings_reset_history_name (GPasteSettings *self); void g_paste_settings_reset_images_support (GPasteSettings *self); @@ -73,6 +75,8 @@ gboolean value); void g_paste_settings_set_element_size (GPasteSettings *self, guint64 value); +void g_paste_settings_set_empty_history_confirmation (GPasteSettings *self, + gboolean value); void g_paste_settings_set_growing_lines (GPasteSettings *self, gboolean value); void g_paste_settings_set_history_name (GPasteSettings *self, 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/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-backup-history.c new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-backup-history.c --- old/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-backup-history.c 2018-03-09 15:06:27.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-backup-history.c 2018-04-13 22:46:43.000000000 +0200 @@ -91,6 +91,7 @@ static gboolean g_paste_ui_backup_history_activate (GPasteUiHistoryAction *self G_GNUC_UNUSED, GPasteClient *client, + GPasteSettings *settings G_GNUC_UNUSED, GtkWindow *rootwin, const gchar *history) { @@ -116,6 +117,7 @@ /** * g_paste_ui_backup_history_new: * @client: a #GPasteClient + * @settings: a #GPasteSettings * @actions: the #GPasteUiHistoryActions * @rootwin: the root #GtkWindow * @@ -125,13 +127,15 @@ * free it with g_object_unref */ G_PASTE_VISIBLE GtkWidget * -g_paste_ui_backup_history_new (GPasteClient *client, - GtkWidget *actions, - GtkWindow *rootwin) +g_paste_ui_backup_history_new (GPasteClient *client, + GPasteSettings *settings, + GtkWidget *actions, + GtkWindow *rootwin) { g_return_val_if_fail (_G_PASTE_IS_CLIENT (client), NULL); + g_return_val_if_fail (_G_PASTE_IS_SETTINGS (settings), NULL); g_return_val_if_fail (_G_PASTE_IS_UI_HISTORY_ACTIONS (actions), NULL); g_return_val_if_fail (GTK_IS_WINDOW (rootwin), NULL); - return g_paste_ui_history_action_new (G_PASTE_TYPE_UI_BACKUP_HISTORY, client, actions, rootwin, _("Backup")); + return g_paste_ui_history_action_new (G_PASTE_TYPE_UI_BACKUP_HISTORY, client, settings, actions, rootwin, _("Backup")); } 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/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-backup-history.h new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-backup-history.h --- old/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-backup-history.h 2018-03-08 17:23:25.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-backup-history.h 2018-04-13 22:46:43.000000000 +0200 @@ -19,9 +19,10 @@ G_PASTE_FINAL_TYPE (UiBackupHistory, ui_backup_history, UI_BACKUP_HISTORY, GPasteUiHistoryAction) -GtkWidget *g_paste_ui_backup_history_new (GPasteClient *client, - GtkWidget *actions, - GtkWindow *rootwin); +GtkWidget *g_paste_ui_backup_history_new (GPasteClient *client, + GPasteSettings *settings, + GtkWidget *actions, + GtkWindow *rootwin); G_END_DECLS 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/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-delete-history.c new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-delete-history.c --- old/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-delete-history.c 2018-03-08 17:23:25.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-delete-history.c 2018-04-13 22:46:43.000000000 +0200 @@ -18,6 +18,7 @@ static gboolean g_paste_ui_delete_history_activate (GPasteUiHistoryAction *self G_GNUC_UNUSED, GPasteClient *client, + GPasteSettings *settings G_GNUC_UNUSED, GtkWindow *rootwin, const gchar *history) { @@ -41,6 +42,7 @@ /** * g_paste_ui_delete_history_new: * @client: a #GPasteClient + * @settings: a #GPasteSettings * @actions: the #GPasteUiHistoryActions * @rootwin: the root #GtkWindow * @@ -50,13 +52,15 @@ * free it with g_object_unref */ G_PASTE_VISIBLE GtkWidget * -g_paste_ui_delete_history_new (GPasteClient *client, - GtkWidget *actions, - GtkWindow *rootwin) +g_paste_ui_delete_history_new (GPasteClient *client, + GPasteSettings *settings, + GtkWidget *actions, + GtkWindow *rootwin) { g_return_val_if_fail (_G_PASTE_IS_CLIENT (client), NULL); + g_return_val_if_fail (_G_PASTE_IS_SETTINGS (settings), NULL); g_return_val_if_fail (_G_PASTE_IS_UI_HISTORY_ACTIONS (actions), NULL); g_return_val_if_fail (GTK_IS_WINDOW (rootwin), NULL); - return g_paste_ui_history_action_new (G_PASTE_TYPE_UI_DELETE_HISTORY, client, actions, rootwin, _("Delete")); + return g_paste_ui_history_action_new (G_PASTE_TYPE_UI_DELETE_HISTORY, client, settings, actions, rootwin, _("Delete")); } 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/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-delete-history.h new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-delete-history.h --- old/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-delete-history.h 2018-03-08 17:23:25.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-delete-history.h 2018-04-13 22:46:43.000000000 +0200 @@ -19,9 +19,10 @@ G_PASTE_FINAL_TYPE (UiDeleteHistory, ui_delete_history, UI_DELETE_HISTORY, GPasteUiHistoryAction) -GtkWidget *g_paste_ui_delete_history_new (GPasteClient *client, - GtkWidget *actions, - GtkWindow *rootwin); +GtkWidget *g_paste_ui_delete_history_new (GPasteClient *client, + GPasteSettings *settings, + GtkWidget *actions, + GtkWindow *rootwin); G_END_DECLS 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/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-empty-history.c new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-empty-history.c --- old/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-empty-history.c 2018-03-11 23:28:02.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-empty-history.c 2018-04-13 22:46:43.000000000 +0200 @@ -18,10 +18,11 @@ static gboolean g_paste_ui_empty_history_activate (GPasteUiHistoryAction *self G_GNUC_UNUSED, GPasteClient *client, + GPasteSettings *settings, GtkWindow *rootwin, const gchar *history) { - g_paste_util_empty_history (rootwin, client, history); + g_paste_util_empty_history (rootwin, client, settings, history); return TRUE; } @@ -40,6 +41,7 @@ /** * g_paste_ui_empty_history_new: * @client: a #GPasteClient instance + * @settings: a #GPasteSettings instance * @actions: the #GPasteUiHistoryActions * @rootwin: the main #GtkWindow * @@ -49,14 +51,16 @@ * free it with g_object_unref */ G_PASTE_VISIBLE GtkWidget * -g_paste_ui_empty_history_new (GPasteClient *client, - GtkWidget *actions, - GtkWindow *rootwin) +g_paste_ui_empty_history_new (GPasteClient *client, + GPasteSettings *settings, + GtkWidget *actions, + GtkWindow *rootwin) { g_return_val_if_fail (_G_PASTE_IS_CLIENT (client), NULL); + g_return_val_if_fail (_G_PASTE_IS_SETTINGS (settings), NULL); g_return_val_if_fail (_G_PASTE_IS_UI_HISTORY_ACTIONS (actions), NULL); g_return_val_if_fail (GTK_IS_WINDOW (rootwin), NULL); /* Translators: this is the translation for emptying the history */ - return g_paste_ui_history_action_new (G_PASTE_TYPE_UI_EMPTY_HISTORY, client, actions, rootwin, _("Empty")); + return g_paste_ui_history_action_new (G_PASTE_TYPE_UI_EMPTY_HISTORY, client, settings, actions, rootwin, _("Empty")); } 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/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-empty-history.h new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-empty-history.h --- old/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-empty-history.h 2018-03-08 17:23:25.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-empty-history.h 2018-04-13 22:46:43.000000000 +0200 @@ -19,9 +19,10 @@ G_PASTE_FINAL_TYPE (UiEmptyHistory, ui_empty_history, UI_EMPTY_HISTORY, GPasteUiHistoryAction) -GtkWidget *g_paste_ui_empty_history_new (GPasteClient *client, - GtkWidget *actions, - GtkWindow *rootwin); +GtkWidget *g_paste_ui_empty_history_new (GPasteClient *client, + GPasteSettings *settings, + GtkWidget *actions, + GtkWindow *rootwin); G_END_DECLS 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/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-history-action.c new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-history-action.c --- old/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-history-action.c 2018-03-08 17:23:25.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-history-action.c 2018-04-13 22:46:43.000000000 +0200 @@ -10,6 +10,7 @@ typedef struct { GPasteClient *client; + GPasteSettings *settings; GPasteUiHistoryActions *actions; GtkWindow *rootwin; @@ -48,7 +49,7 @@ gboolean ret; if (priv->history && klass->activate) - ret = klass->activate (self, priv->client, priv->rootwin, priv->history); + ret = klass->activate (self, priv->client, priv->settings, priv->rootwin, priv->history); else ret = GTK_WIDGET_CLASS (g_paste_ui_history_action_parent_class)->button_press_event (widget, event); @@ -63,6 +64,7 @@ const GPasteUiHistoryActionPrivate *priv = _g_paste_ui_history_action_get_instance_private (G_PASTE_UI_HISTORY_ACTION (object)); g_clear_object (&priv->client); + g_clear_object (&priv->settings); G_OBJECT_CLASS (g_paste_ui_history_action_parent_class)->dispose (object); } @@ -101,6 +103,7 @@ * g_paste_ui_history_action_new: * @type: the type of the subclass to instantiate * @client: a #GPasteClient + * @settings: a #GPasteSettings * @actions: a #GPasteUiHistoryActions * @rootwin: the main #GtkWindow * @@ -110,14 +113,16 @@ * free it with g_object_unref */ G_PASTE_VISIBLE GtkWidget * -g_paste_ui_history_action_new (GType type, - GPasteClient *client, - GtkWidget *actions, - GtkWindow *rootwin, - const gchar *label) +g_paste_ui_history_action_new (GType type, + GPasteClient *client, + GPasteSettings *settings, + GtkWidget *actions, + GtkWindow *rootwin, + const gchar *label) { g_return_val_if_fail (g_type_is_a (type, G_PASTE_TYPE_UI_HISTORY_ACTION), NULL); g_return_val_if_fail (_G_PASTE_IS_CLIENT (client), NULL); + g_return_val_if_fail (_G_PASTE_IS_SETTINGS (settings), NULL); g_return_val_if_fail (_G_PASTE_IS_UI_HISTORY_ACTIONS (actions), NULL); g_return_val_if_fail (GTK_IS_WINDOW (rootwin), NULL); @@ -128,6 +133,7 @@ GPasteUiHistoryActionPrivate *priv = g_paste_ui_history_action_get_instance_private (G_PASTE_UI_HISTORY_ACTION (self)); priv->client = g_object_ref (client); + priv->settings = g_object_ref (settings); priv->actions = G_PASTE_UI_HISTORY_ACTIONS (actions); priv->rootwin = rootwin; 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/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-history-action.h new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-history-action.h --- old/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-history-action.h 2018-03-08 17:23:25.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-history-action.h 2018-04-13 22:46:43.000000000 +0200 @@ -12,6 +12,7 @@ #define __G_PASTE_UI_HISTORY_ACTION_H__ #include <gpaste-client.h> +#include <gpaste-settings.h> G_BEGIN_DECLS @@ -26,6 +27,7 @@ /*< pure virtual >*/ gboolean (*activate) (GPasteUiHistoryAction *self, GPasteClient *client, + GPasteSettings *settings, GtkWindow *rootwin, const gchar *history); }; @@ -33,11 +35,12 @@ void g_paste_ui_history_action_set_history (GPasteUiHistoryAction *self, const gchar *history); -GtkWidget *g_paste_ui_history_action_new (GType type, - GPasteClient *client, - GtkWidget *actions, - GtkWindow *rootwin, - const gchar *label); +GtkWidget *g_paste_ui_history_action_new (GType type, + GPasteClient *client, + GPasteSettings *settings, + GtkWidget *actions, + GtkWindow *rootwin, + const gchar *label); G_END_DECLS 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/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-history-actions.c new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-history-actions.c --- old/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-history-actions.c 2018-03-09 15:06:27.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-history-actions.c 2018-04-13 22:46:43.000000000 +0200 @@ -94,6 +94,7 @@ /** * g_paste_ui_history_actions_new: * @client: a #GPasteClient instance + * @settings: a #GPasteSettings instance * @rootwin: the root #GtkWindow * * Create a new instance of #GPasteUiHistoryActions @@ -102,10 +103,12 @@ * free it with g_object_unref */ G_PASTE_VISIBLE GtkWidget * -g_paste_ui_history_actions_new (GPasteClient *client, - GtkWindow *rootwin) +g_paste_ui_history_actions_new (GPasteClient *client, + GPasteSettings *settings, + GtkWindow *rootwin) { g_return_val_if_fail (_G_PASTE_IS_CLIENT (client), NULL); + g_return_val_if_fail (_G_PASTE_IS_SETTINGS (settings), NULL); g_return_val_if_fail (GTK_IS_WINDOW (rootwin), NULL); GtkWidget *self = gtk_widget_new (G_PASTE_TYPE_UI_HISTORY_ACTIONS, @@ -114,9 +117,9 @@ NULL); GPasteUiHistoryActionsPrivate *priv = g_paste_ui_history_actions_get_instance_private (G_PASTE_UI_HISTORY_ACTIONS (self)); GtkWidget *box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); - GtkWidget *backup = g_paste_ui_backup_history_new (client, self, rootwin); - GtkWidget *delete = g_paste_ui_delete_history_new (client, self, rootwin); - GtkWidget *empty = g_paste_ui_empty_history_new (client, self, rootwin); + GtkWidget *backup = g_paste_ui_backup_history_new (client, settings, self, rootwin); + GtkWidget *delete = g_paste_ui_delete_history_new (client, settings, self, rootwin); + GtkWidget *empty = g_paste_ui_empty_history_new (client, settings, self, rootwin); priv->client = g_object_ref (client); priv->actions = g_slist_append (priv->actions, backup); 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/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-history-actions.h new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-history-actions.h --- old/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-history-actions.h 2018-03-08 17:23:25.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-history-actions.h 2018-04-13 22:46:43.000000000 +0200 @@ -11,6 +11,7 @@ #ifndef __G_PASTE_UI_HISTORY_ACTIONS_H__ #define __G_PASTE_UI_HISTORY_ACTIONS_H__ +#include <gpaste-settings.h> #include <gpaste-ui-panel-history.h> G_BEGIN_DECLS @@ -22,8 +23,9 @@ void g_paste_ui_history_actions_set_relative_to (GPasteUiHistoryActions *self, GPasteUiPanelHistory *history); -GtkWidget *g_paste_ui_history_actions_new (GPasteClient *client, - GtkWindow *rootwin); +GtkWidget *g_paste_ui_history_actions_new (GPasteClient *client, + GPasteSettings *settings, + GtkWindow *rootwin); G_END_DECLS 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/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-panel.c new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-panel.c --- old/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-panel.c 2018-03-09 15:18:06.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-panel.c 2018-04-13 22:46:43.000000000 +0200 @@ -351,7 +351,7 @@ priv->client = g_object_ref (client); priv->settings = g_object_ref (settings); - priv->actions = G_PASTE_UI_HISTORY_ACTIONS (g_paste_ui_history_actions_new (client, rootwin)); + priv->actions = G_PASTE_UI_HISTORY_ACTIONS (g_paste_ui_history_actions_new (client, settings, rootwin)); priv->search_entry = GTK_WIDGET (search_entry); priv->c_signals[C_DELETE_HISTORY] = g_signal_connect (priv->client, 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/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-window.c new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-window.c --- old/gpaste-3.28.0/src/libgpaste/ui/gpaste-ui-window.c 2018-03-12 00:03:18.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/ui/gpaste-ui-window.c 2018-04-13 22:46:43.000000000 +0200 @@ -30,6 +30,7 @@ GPasteUiHeader *header; GPasteUiHistory *history; GPasteClient *client; + GPasteSettings *settings; GtkSearchBar *search_bar; GtkSearchEntry *search_entry; @@ -54,7 +55,7 @@ g_autofree gchar *history = data[1]; g_free (data); - g_paste_util_empty_history (GTK_WINDOW (self), priv->client, history); + g_paste_util_empty_history (GTK_WINDOW (self), priv->client, priv->settings, history); return G_SOURCE_REMOVE; } @@ -319,6 +320,7 @@ priv->history = G_PASTE_UI_HISTORY (history); priv->client = g_object_ref (client); + priv->settings = g_paste_settings_new(); gtk_window_set_titlebar (win, header); gtk_application_window_set_help_overlay (GTK_APPLICATION_WINDOW (user_data), GTK_SHORTCUTS_WINDOW (g_paste_ui_shortcuts_window_new (settings))); 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/gpaste-3.28.0/src/libgpaste/util/gpaste-util.c new/gpaste-3.28.2/src/libgpaste/util/gpaste-util.c --- old/gpaste-3.28.0/src/libgpaste/util/gpaste-util.c 2018-03-11 23:30:37.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/util/gpaste-util.c 2018-04-13 22:46:43.000000000 +0200 @@ -325,18 +325,21 @@ * g_paste_util_empty_history: * @parent_window: (nullable): the parent #GtkWindow * @client: a #GPasteClient instance + * @settings: a #GPasteSettings instance * @history: the name of the history to empty * * Empty history after prompting user for confirmation */ G_PASTE_VISIBLE void -g_paste_util_empty_history (GtkWindow *parent_window, - GPasteClient *client, - const gchar *history) +g_paste_util_empty_history (GtkWindow *parent_window, + GPasteClient *client, + GPasteSettings *settings, + const gchar *history) { - /* Translators: this is the translation for emptying the history */ - if (g_paste_util_confirm_dialog (parent_window, _("Empty"), _("Do you really want to empty the history?"))) - g_paste_client_empty_history (client, history, NULL, NULL); + if (!g_paste_settings_get_empty_history_confirmation (settings) || + /* Translators: this is the translation for emptying the history */ + g_paste_util_confirm_dialog (parent_window, _("Empty"), _("Do you really want to empty the history?"))) + g_paste_client_empty_history (client, history, NULL, NULL); } /** 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/gpaste-3.28.0/src/libgpaste/util/gpaste-util.h new/gpaste-3.28.2/src/libgpaste/util/gpaste-util.h --- old/gpaste-3.28.0/src/libgpaste/util/gpaste-util.h 2018-03-11 23:30:12.000000000 +0100 +++ new/gpaste-3.28.2/src/libgpaste/util/gpaste-util.h 2018-04-13 22:46:43.000000000 +0200 @@ -34,9 +34,10 @@ const gchar *substitution); gchar *g_paste_util_compute_checksum (GdkPixbuf *image); -void g_paste_util_empty_history (GtkWindow *parent_window, - GPasteClient *client, - const gchar *history); +void g_paste_util_empty_history (GtkWindow *parent_window, + GPasteClient *client, + GPasteSettings *settings, + const gchar *history); gboolean g_paste_util_has_gnome_shell (void);
