Hello community,

here is the log from the commit of package gpaste for openSUSE:Factory checked 
in at 2016-08-05 18:17:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gpaste (Old)
 and      /work/SRC/openSUSE:Factory/.gpaste.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gpaste"

Changes:
--------
--- /work/SRC/openSUSE:Factory/gpaste/gpaste.changes    2016-06-19 
10:49:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gpaste.new/gpaste.changes       2016-08-05 
18:17:31.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jul 29 19:38:41 UTC 2016 - [email protected]
+
+- Update to version 3.20.4
+  + Fix some extensive CPU usage in some cases 
+
+-------------------------------------------------------------------

Old:
----
  gpaste-3.20.3.tar.xz

New:
----
  gpaste-3.20.4.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gpaste.spec ++++++
--- /var/tmp/diff_new_pack.TXLY3O/_old  2016-08-05 18:17:32.000000000 +0200
+++ /var/tmp/diff_new_pack.TXLY3O/_new  2016-08-05 18:17:32.000000000 +0200
@@ -18,7 +18,7 @@
 
 
 Name:           gpaste
-Version:        3.20.3
+Version:        3.20.4
 Release:        0
 Summary:        Clipboard management system for GNOME
 License:        BSD-2-Clause

++++++ gpaste-3.20.3.tar.xz -> gpaste-3.20.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gpaste-3.20.3/ChangeLog new/gpaste-3.20.4/ChangeLog
--- old/gpaste-3.20.3/ChangeLog 2016-06-14 08:56:38.000000000 +0200
+++ new/gpaste-3.20.4/ChangeLog 2016-06-28 15:52:43.000000000 +0200
@@ -1,6 +1,32 @@
 # Generated by Makefile. Do not edit.
 
 
+commit 6b62d0f0377616e0d34be5a51ec915e87aecaea5
+Merge: 13b2d6e c66d528
+Author: Marc-Antoine Perennou <[email protected]>
+Date:   Tue Jun 28 09:33:52 2016 +0200
+
+    Merge branch 'gpaste-3.18' into gpaste-3.20
+    
+    * gpaste-3.18:
+      clipboard: avoid infinite event loop when clearing
+
+commit c66d5283f7319c4ffd3aa009f5db8f22c92f9e08
+Author: Marc-Antoine Perennou <[email protected]>
+Date:   Tue Jun 28 09:32:16 2016 +0200
+
+    clipboard: avoid infinite event loop when clearing
+    
+    Signed-off-by: Marc-Antoine Perennou <[email protected]>
+
+commit 13b2d6e95357e943cdefa2058e978d9a1e89a832
+Author: Marc-Antoine Perennou <[email protected]>
+Date:   Tue Jun 14 08:57:31 2016 +0200
+
+    Release GPaste 3.20.3
+    
+    Signed-off-by: Marc-Antoine Perennou <[email protected]>
+
 commit d917e87176329fcae6649e7243ada272c7260104
 Author: Marc-Antoine Perennou <[email protected]>
 Date:   Tue May 24 09:08:32 2016 +0200
@@ -7006,7 +7032,7 @@
     This reverts commit 29cf75a37ba68db525173c87f27f94b666e3adaf.
     
     Conflicts:
-       data/completions/_gpaste
+            data/completions/_gpaste
 
 commit d1095430f9e07135c02aa4b947c330039cf2d3b5
 Author: Marc-Antoine Perennou <[email protected]>
@@ -7187,9 +7213,9 @@
       gnome-shell-client: drop unused methods
     
     Conflicts:
-       NEWS
-       README.md
-       configure.ac
+            NEWS
+            README.md
+            configure.ac
 
 commit 6fef46aa65f3856ca7d39798abd1a03b2bdbeff9
 Author: Marc-Antoine Perennou <[email protected]>
@@ -7272,7 +7298,7 @@
       gpaste: rework --help/version
     
     Conflicts:
-       src/gpaste/gpaste.c
+            src/gpaste/gpaste.c
 
 commit 11054f3b1e32369a80cc53b88b0e553cf08621ac
 Author: Marc-Antoine Perennou <[email protected]>
@@ -7860,9 +7886,9 @@
       Release GPaste 3.10.4.1
     
     Conflicts:
-       NEWS
-       README.md
-       configure.ac
+            NEWS
+            README.md
+            configure.ac
 
 commit 52619584e4ffbadda313fab9b1cdea2cb2151f03
 Merge: 5846d50 e8022ea
@@ -8024,9 +8050,9 @@
       remove TODO
     
     Conflicts:
-       NEWS
-       README.md
-       configure.ac
+            NEWS
+            README.md
+            configure.ac
 
 commit b20e03c09b8dd1f0bd5b4efb03749478075386e8
 Merge: 3ac0289 6227d5f
@@ -8125,7 +8151,7 @@
       update NEWS
     
     Conflicts:
-       NEWS
+            NEWS
 
 commit 10be16556b77a9d45aed9d5def0512de8231380c
 Author: Marc-Antoine Perennou <[email protected]>
@@ -9017,7 +9043,7 @@
       add missing LDADD
     
     Conflicts:
-       README.md
+            README.md
 
 commit 5b3e7199d6894db2d40583f3452727c6bdc01c94
 Author: Marc-Antoine Perennou <[email protected]>
@@ -9041,12 +9067,12 @@
     Signed-off-by: Marc-Antoine Perennou <[email protected]>
     
     Conflicts:
-       README.md
-       po/de.po
-       po/es.po
-       po/fi.po
-       po/fr.po
-       po/pt_BR.po
+            README.md
+            po/de.po
+            po/es.po
+            po/fi.po
+            po/fr.po
+            po/pt_BR.po
 
 commit 46048b69fba7708bca6efdc3e0f9753bf72ec158
 Author: Marc-Antoine Perennou <[email protected]>
@@ -9495,8 +9521,8 @@
       udpate NEWS
     
     Conflicts:
-       NEWS
-       configure.ac
+            NEWS
+            configure.ac
 
 commit 23d8c54203dc2c6274f20b6b0ed747f71adfb3e6
 Author: Marc-Antoine Perennou <[email protected]>
@@ -9607,7 +9633,7 @@
       daemon: actually emit changed 1s after startup
     
     Conflicts:
-       README.md
+            README.md
 
 commit 3cfcb9dd1c97918ccc7dbc3317f54c60b80a0170
 Merge: 55edb59 bce22df
@@ -9646,7 +9672,7 @@
       udpate README
     
     Conflicts:
-       README.md
+            README.md
 
 commit 7a4b2ae29288d42732f27d3446695872bff6d9a5
 Author: Marc-Antoine Perennou <[email protected]>
@@ -9668,7 +9694,7 @@
       daemon: actually emit changed 1s after startup
     
     Conflicts:
-       NEWS
+            NEWS
 
 commit f104ca84949ada73d80ca8108e1e5d9161b2b9f0
 Author: Marc-Antoine Perennou <[email protected]>
@@ -10262,7 +10288,7 @@
       update README
     
     Conflicts:
-       README.md
+            README.md
 
 commit 139dd0a3c2da05e38fbf2c1bb2d79d04812ab918
 Author: Marc-Antoine Perennou <[email protected]>
@@ -10783,7 +10809,7 @@
       fix DBusApplicationLaunching
     
     Conflicts:
-       NEWS
+            NEWS
 
 commit 4e474f037945e727d4166de3f479ec4f5ce5b98e
 Author: Marc-Antoine Perennou <[email protected]>
@@ -10899,9 +10925,9 @@
       Revert "gnome-shell: select first on open"
     
     Conflicts:
-       Makefile.am
-       NEWS
-       configure.ac
+            Makefile.am
+            NEWS
+            configure.ac
 
 commit 93a19ff98f76c420eb4ab4950177d5522d4bd1c8
 Author: Marc-Antoine Perennou <[email protected]>
@@ -11589,7 +11615,7 @@
     Some formulation and spelling issues
     
     Conflicts:
-       README.md
+            README.md
 
 commit ae6a9c638c30a1eb68dd9525dd62a642d60f8a1c
 Author: Elan Ruusamäe <[email protected]>
@@ -11739,8 +11765,8 @@
       libgpaste-core: fix gpaste-image-item display str
     
     Conflicts:
-       NEWS
-       configure.ac
+            NEWS
+            configure.ac
 
 commit 74af4278243e1acc1cbb24dcedd38c5d5a400487
 Author: Marc-Antoine Perennou <[email protected]>
@@ -12034,7 +12060,7 @@
       about; update date
     
     Conflicts:
-       TODO
+            TODO
 
 commit ba5cf272b14f14ffce74862d45d71dc0f6f8231b
 Author: Marc-Antoine Perennou <[email protected]>
@@ -12160,10 +12186,10 @@
     Signed-off-by: Marc-Antoine Perennou <[email protected]>
     
     Conflicts:
-       NEWS
-       README.md
-       bindings/gi.mk
-       configure.ac
+            NEWS
+            README.md
+            bindings/gi.mk
+            configure.ac
 
 commit 14cd4ea6a658e32678b63f4a21f577d5a28396d7
 Author: Marc-Antoine Perennou <[email protected]>
@@ -12481,7 +12507,7 @@
       macros: add app boilerplate
     
     Conflicts:
-       TODO
+            TODO
 
 commit 89737fc148cb841495a275b3ef121d4d50a4208e
 Author: Marc-Antoine Perennou <[email protected]>
@@ -13320,7 +13346,7 @@
       ...
     
     Conflicts:
-       src/applets/gnome-shell/metadata.json.in
+            src/applets/gnome-shell/metadata.json.in
 
 commit fc1cee8e886f00cc2d779c1bb5cd52d839702812
 Author: Marc-Antoine Perennou <[email protected]>
@@ -13739,8 +13765,8 @@
     Signed-off-by: Marc-Antoine Perennou <[email protected]>
     
     Conflicts:
-       NEWS
-       README.md
+            NEWS
+            README.md
 
 commit 5ace9307f0425450ef37c6b390bcb589b207dbfd
 Author: Marc-Antoine Perennou <[email protected]>
@@ -13759,7 +13785,7 @@
     Signed-off-by: Marc-Antoine Perennou <[email protected]>
     
     Conflicts:
-       NEWS
+            NEWS
 
 commit 138f7b05d8cf59665263d500b84b04ed5d168ad7
 Author: Marc-Antoine Perennou <[email protected]>
@@ -14231,7 +14257,7 @@
       gnome-shell-client: add async ctor
     
     Conflicts:
-       tests/gnome-shell-client/test-gnome-shell-client.c
+            tests/gnome-shell-client/test-gnome-shell-client.c
 
 commit 7c4789f6731aeadd7631f20c452a5c58238b0409
 Author: Marc-Antoine Perennou <[email protected]>
@@ -14470,11 +14496,11 @@
       core: fix segv when poping last element
     
     Conflicts:
-       NEWS
-       README.md
-       configure.ac
-       libgpaste/core/gpaste-clipboards-manager.c
-       libgpaste/core/gpaste-history.c
+            NEWS
+            README.md
+            configure.ac
+            libgpaste/core/gpaste-clipboards-manager.c
+            libgpaste/core/gpaste-history.c
 
 commit d625a69f36b0422026cb957c0871967123db8ca2
 Author: Marc-Antoine Perennou <[email protected]>
@@ -14536,9 +14562,9 @@
     Signed-off-by: Marc-Antoine Perennou <[email protected]>
     
     Conflicts:
-       libgpaste/keybinder/gpaste-paste-and-pop-keybinding.c
-       libgpaste/keybinder/gpaste-paste-and-pop-keybinding.h
-       src/gpasted/gpasted.c
+            libgpaste/keybinder/gpaste-paste-and-pop-keybinding.c
+            libgpaste/keybinder/gpaste-paste-and-pop-keybinding.h
+            src/gpasted/gpasted.c
 
 commit f48acf87d6f124c23b59e608442914544ad9ff05
 Merge: 50465a6 39935bf dddc3a6
@@ -14613,8 +14639,8 @@
     Signed-off-by: Marc-Antoine Perennou <[email protected]>
     
     Conflicts:
-       libgpaste/daemon/gpaste-daemon.c
-       libgpaste/keybinder/gpaste-paste-and-pop-keybinding.c
+            libgpaste/daemon/gpaste-daemon.c
+            libgpaste/keybinder/gpaste-paste-and-pop-keybinding.c
 
 commit 672498b8c4ce69f4b679e01a1045325aa766f320
 Author: Marc-Antoine Perennou <[email protected]>
@@ -14653,23 +14679,23 @@
       make g_paste_history_add transfer full
     
     Conflicts:
-       NEWS
-       README.md
-       configure.ac
-       libgpaste/common/gpaste-settings-keys.h
-       libgpaste/core/gpaste-clipboards-manager.c
-       libgpaste/core/gpaste-history.c
-       libgpaste/keybinder/gpaste-paste-and-pop-keybinding.c
-       libgpaste/keybinder/gpaste-paste-and-pop-keybinding.h
-       libgpaste/keybinder/gpaste-pop-keybinding-private.h
-       libgpaste/settings/gpaste-settings.c
-       libgpaste/settings/gpaste-settings.h
-       libgpaste/settings/ui/gpaste-settings-ui-stack.c
-       po/es.po
-       po/fi.po
-       po/fr.po
-       po/pt_BR.po
-       src/gpasted/gpasted.c
+            NEWS
+            README.md
+            configure.ac
+            libgpaste/common/gpaste-settings-keys.h
+            libgpaste/core/gpaste-clipboards-manager.c
+            libgpaste/core/gpaste-history.c
+            libgpaste/keybinder/gpaste-paste-and-pop-keybinding.c
+            libgpaste/keybinder/gpaste-paste-and-pop-keybinding.h
+            libgpaste/keybinder/gpaste-pop-keybinding-private.h
+            libgpaste/settings/gpaste-settings.c
+            libgpaste/settings/gpaste-settings.h
+            libgpaste/settings/ui/gpaste-settings-ui-stack.c
+            po/es.po
+            po/fi.po
+            po/fr.po
+            po/pt_BR.po
+            src/gpasted/gpasted.c
 
 commit ff0ce772a4d614d498bae569ba2695f7bd6529fc
 Author: Marc-Antoine Perennou <[email protected]>
@@ -15844,8 +15870,8 @@
       remove TODO
     
     Conflicts:
-       TODO
-       libgpaste/settings/ui/gpaste-settings-ui-stack.c
+            TODO
+            libgpaste/settings/ui/gpaste-settings-ui-stack.c
 
 commit 78a97418b01e74a1b3b5b599e391b30a4b85fcfd
 Author: Marc-Antoine Perennou <[email protected]>
@@ -16300,9 +16326,9 @@
       history: fix missing signal
     
     Conflicts:
-       NEWS
-       libgpaste/core/gpaste-clipboard.c
-       libgpaste/core/gpaste-clipboards-manager.c
+            NEWS
+            libgpaste/core/gpaste-clipboard.c
+            libgpaste/core/gpaste-clipboards-manager.c
 
 commit 3fc00495d3620f456c1c486f3bd7e95e06a0762b
 Author: Marc-Antoine Perennou <[email protected]>
@@ -16329,7 +16355,7 @@
     Signed-off-by: Marc-Antoine Perennou <[email protected]>
     
     Conflicts:
-       libgpaste/core/gpaste-clipboards-manager.c
+            libgpaste/core/gpaste-clipboards-manager.c
 
 commit aa17cac7070b8557435263903c64ca8232f8e805
 Author: Marc-Antoine Perennou <[email protected]>
@@ -16348,7 +16374,7 @@
     Signed-off-by: Marc-Antoine Perennou <[email protected]>
     
     Conflicts:
-       libgpaste/core/gpaste-clipboard.c
+            libgpaste/core/gpaste-clipboard.c
 
 commit 16292fb7c50e8dc12a7ade51dbace14fc23a196f
 Author: Marc-Antoine Perennou <[email protected]>
@@ -16414,8 +16440,8 @@
       core: small performance improvements
     
     Conflicts:
-       configure.ac
-       libgpaste/core/gpaste-clipboards-manager.c
+            configure.ac
+            libgpaste/core/gpaste-clipboards-manager.c
 
 commit c3948080e116d500f5de60565557bd1158d32204
 Author: Marc-Antoine Perennou <[email protected]>
@@ -16458,7 +16484,7 @@
     Signed-off-by: Marc-Antoine Perennou <[email protected]>
     
     Conflicts:
-       libgpaste/core/gpaste-clipboards-manager.c
+            libgpaste/core/gpaste-clipboards-manager.c
 
 commit f38dff3bf409e13378ac22cdc67df6d97294a6a5
 Author: Marc-Antoine Perennou <[email protected]>
@@ -16520,7 +16546,7 @@
       paste-and-pop: add guards
     
     Conflicts:
-       libgpaste/keybinder/gpaste-paste-and-pop-keybinding.c
+            libgpaste/keybinder/gpaste-paste-and-pop-keybinding.c
 
 commit dd7852f0a54e6d9f9d7486effc668ceb9c1ed683
 Author: Marc-Antoine Perennou <[email protected]>
@@ -16539,7 +16565,7 @@
     Signed-off-by: Marc-Antoine Perennou <[email protected]>
     
     Conflicts:
-       libgpaste/keybinder/gpaste-paste-and-pop-keybinding.c
+            libgpaste/keybinder/gpaste-paste-and-pop-keybinding.c
 
 commit aac91edf462790fa3c9d6f78853fdd9ea4bfbbb2
 Author: Marc-Antoine Perennou <[email protected]>
@@ -16611,11 +16637,11 @@
       gpaste-client: track connection errors
     
     Conflicts:
-       README.md
-       TODO
-       libgpaste/core/gpaste-clipboards-manager.c
-       libgpaste/settings/ui/gpaste-settings-ui-stack.c
-       src/gpaste/gpaste.c
+            README.md
+            TODO
+            libgpaste/core/gpaste-clipboards-manager.c
+            libgpaste/settings/ui/gpaste-settings-ui-stack.c
+            src/gpaste/gpaste.c
 
 commit 0d647504c316c785dee022ff43bc45407128384c
 Author: Marc-Antoine Perennou <[email protected]>
@@ -16634,7 +16660,7 @@
     Signed-off-by: Marc-Antoine Perennou <[email protected]>
     
     Conflicts:
-       libgpaste/core/gpaste-clipboards-manager.c
+            libgpaste/core/gpaste-clipboards-manager.c
 
 commit d3dfa6ecd5bb673e3f7bc0da6c7aeec4979e9ded
 Author: Marc-Antoine Perennou <[email protected]>
@@ -16653,7 +16679,7 @@
     Signed-off-by: Marc-Antoine Perennou <[email protected]>
     
     Conflicts:
-       src/gpaste/gpaste.c
+            src/gpaste/gpaste.c
 
 commit 36a9cf62d101455a8c2025e9879c0d12af12aad7
 Author: Marc-Antoine Perennou <[email protected]>
@@ -16746,7 +16772,7 @@
       Release GPaste 3.1
     
     Conflicts:
-       NEWS
+            NEWS
 
 commit e3040a684a882040964f2b3144e1a354f518c242
 Author: Marc-Antoine Perennou <[email protected]>
@@ -16802,7 +16828,7 @@
       update TODO
     
     Conflicts:
-       TODO
+            TODO
 
 commit 44052c7cb280ffd30bb446401a20cb3821ef39cc
 Author: Marc-Antoine Perennou <[email protected]>
@@ -16824,7 +16850,7 @@
       update TODO
     
     Conflicts:
-       TODO
+            TODO
 
 commit fa63fdd1b2d31236af57c576e4dcfc026e307a03
 Author: Marc-Antoine Perennou <[email protected]>
@@ -16883,7 +16909,7 @@
       add NEWS entry
     
     Conflicts:
-       NEWS
+            NEWS
 
 commit b44486bffbf592d32197f0c66ffca6b3b3310d51
 Author: Marc-Antoine Perennou <[email protected]>
@@ -18327,8 +18353,8 @@
     Signed-off-by: Marc-Antoine Perennou <[email protected]>
     
     Conflicts:
-       configure.ac
-       libgpaste/keybinder/gpaste-xcb-wrapper.c
+            configure.ac
+            libgpaste/keybinder/gpaste-xcb-wrapper.c
 
 commit 03db7c2b7fd840835c10707b718e75b15ecfe17d
 Author: Marc-Antoine Perennou <[email protected]>
@@ -19437,7 +19463,7 @@
       update snanish translation by Toni TC <[email protected]>
     
     Conflicts:
-       po/es.po
+            po/es.po
 
 commit c5ee13e9dbb7885956a30b989748499a06b333a8
 Author: Marc-Antoine Perennou <[email protected]>
@@ -19795,8 +19821,8 @@
       Fix wrong usage of g_paste_daemon_tracking
     
     Conflicts:
-       NEWS
-       configure.ac
+            NEWS
+            configure.ac
 
 commit b5cce2c85755f83a9e1b9ee65a7696d9fb2dc829
 Author: Marc-Antoine Perennou <[email protected]>
@@ -20145,7 +20171,7 @@
       update translations
     
     Conflicts:
-       src/gpaste.vala
+            src/gpaste.vala
 
 commit 57384fa0a9a6984864a2013f6b5e6e74e29f05f5
 Author: Marc-Antoine Perennou <[email protected]>
@@ -21374,8 +21400,8 @@
       Release GPaste 2.2.1
     
     Conflicts:
-       NEWS
-       configure.ac
+            NEWS
+            configure.ac
 
 commit 62d8aff3493cf84e686e62bb47aa4eff769acfbb
 Author: Marc-Antoine Perennou <[email protected]>
@@ -21404,10 +21430,10 @@
       Release GPaste 2.2
     
     Conflicts:
-       NEWS
-       po/es.po
-       po/fi.po
-       po/fr.po
+            NEWS
+            po/es.po
+            po/fi.po
+            po/fr.po
 
 commit 269766e227e267f5bee1b1bbb76c31f8539e3ffe
 Author: Marc-Antoine Perennou <[email protected]>
@@ -21626,9 +21652,9 @@
       adding two new settings min/max-text-item-size
     
     Conflicts:
-       src/gpasted/clipboard.vala
-       src/gpasted/gpasted.vala
-       src/gpasted/settings.vala
+            src/gpasted/clipboard.vala
+            src/gpasted/gpasted.vala
+            src/gpasted/settings.vala
 
 commit a4cd96dd2f4008fb9c6d1f0452acf07be9fdc1ed
 Author: Marc-Antoine Perennou <[email protected]>
@@ -21650,10 +21676,10 @@
     
     Conflicts:
     
-       libgpaste/gpaste-clipboard.c
-       libgpaste/gpaste-settings.c
-       libgpaste/gpaste-settings.h
-       libgpaste/libgpaste.sym
+            libgpaste/gpaste-clipboard.c
+            libgpaste/gpaste-settings.c
+            libgpaste/gpaste-settings.h
+            libgpaste/libgpaste.sym
     
     Based on commit by Lukáš Zapletal in master
     
@@ -21741,7 +21767,7 @@
       oops
     
     Conflicts:
-       src/gpasted/gpasted.vala
+            src/gpasted/gpasted.vala
 
 commit f20a2c6537aa06e22d3dc9ed2fe8de18167c6722
 Author: Marc-Antoine Perennou <[email protected]>
@@ -21770,8 +21796,8 @@
       reword key name
     
     Conflicts:
-       src/gpasted/gpasted.vala
-       src/gpasted/settings.vala
+            src/gpasted/gpasted.vala
+            src/gpasted/settings.vala
 
 commit 43768ca731929157c1020f284f69e4e3202ec373
 Author: Marc-Antoine Perennou <[email protected]>
@@ -21793,8 +21819,8 @@
       Allow syncing daemon state with extension's one
     
     Conflicts:
-       src/gpasted/gpasted.vala
-       src/gpasted/settings.vala
+            src/gpasted/gpasted.vala
+            src/gpasted/settings.vala
     
     Signed-off-by: Marc-Antoine Perennou <[email protected]>
 
@@ -21864,9 +21890,9 @@
       gpaste: don't display applet stuff in help
     
     Conflicts:
-       src/gpasted/clipboard.vala
-       src/gpasted/gpasted.vala
-       src/gpasted/settings.vala
+            src/gpasted/clipboard.vala
+            src/gpasted/gpasted.vala
+            src/gpasted/settings.vala
 
 commit 2cce0d6b7a6aa19e4b815d8ed9b16eb6685b3c90
 Author: Marc-Antoine Perennou <[email protected]>
@@ -21975,7 +22001,7 @@
       only override contents for clipboard, not primary
     
     Conflicts:
-       src/gpasted/clipboard.vala
+            src/gpasted/clipboard.vala
 
 commit 6034d32c1f49bcefe0b84115d363f5a0aa7948aa
 Author: Marc-Antoine Perennou <[email protected]>
@@ -22078,8 +22104,8 @@
       gpasted: fix mutter failure to grab keyboard with keyboard shortcut
     
     Conflicts:
-       Makefile.am
-       src/gpasted/keybinder.vala
+            Makefile.am
+            src/gpasted/keybinder.vala
 
 commit 3ea5eb8b111dd94043b0f5f87ec1582309b9a660
 Author: Marc-Antoine Perennou <[email protected]>
@@ -22100,7 +22126,7 @@
       conditionnally override clipboard contents
     
     Conflicts:
-       src/gpasted/clipboard.vala
+            src/gpasted/clipboard.vala
     
     Signed-off-by: Marc-Antoine Perennou <[email protected]>
 
@@ -22123,9 +22149,9 @@
       gpasted: get rid of has_value
     
     Conflicts:
-       src/gpasted/clipboard.vala
-       src/gpasted/gpasted.vala
-       src/gpasted/item.vala
+            src/gpasted/clipboard.vala
+            src/gpasted/gpasted.vala
+            src/gpasted/item.vala
     
     Signed-off-by: Marc-Antoine Perennou <[email protected]>
 
@@ -22156,7 +22182,7 @@
       gpasted: actually override clipboard contents with the stripped one
     
     Conflicts:
-       src/gpasted/clipboard.vala
+            src/gpasted/clipboard.vala
 
 commit 3226db58c482f301d68e531f851cd217d53f271b
 Author: Marc-Antoine Perennou <[email protected]>
@@ -22178,10 +22204,10 @@
       gpasted: strip content
     
     Conflicts:
-       NEWS
-       configure.ac
-       src/gpasted/clipboard.vala
-       src/gpasted/gpasted.vala
+            NEWS
+            configure.ac
+            src/gpasted/clipboard.vala
+            src/gpasted/gpasted.vala
 
 commit 41c1115b1eff291f84912fccfd83f5cbd0498077
 Author: Marc-Antoine Perennou <[email protected]>
@@ -22418,8 +22444,8 @@
       Split ChangeLog
     
     Conflicts:
-       NEWS
-       src/gpasted/history.vala
+            NEWS
+            src/gpasted/history.vala
 
 commit c8d49a0b1de970207de40c2f1689d50f69388631
 Author: Marc-Antoine Perennou <[email protected]>
@@ -22798,8 +22824,8 @@
       Release 1.3.1 (just to regen with no boggous vala)
     
     Conflicts:
-       NEWS
-       configure.ac
+            NEWS
+            configure.ac
 
 commit 0cfa3ef6ae69d07a18e5da9dc415edfbda062d5c
 Merge: 816c91e 6a692ae
@@ -23735,7 +23761,7 @@
     Merge branch 'wip/hotkey'
     
     Conflicts:
-       po/fr.po
+            po/fr.po
 
 commit 6210936cdd539d7a971e4077491ac2aa32a37ed8
 Author: Marc-Antoine Perennou <[email protected]>
@@ -23776,7 +23802,7 @@
     Merge branch 'wip/hotkey'
     
     Conflicts:
-       NEWS
+            NEWS
 
 commit d0f3be233fcf5d6e5f7c490cdfadd6004482fbba
 Author: Marc-Antoine Perennou <[email protected]>
@@ -23867,7 +23893,7 @@
     Merge branch 'wip/images-support'
     
     Conflicts:
-       src/gpasted/history.vala
+            src/gpasted/history.vala
 
 commit 6654c44c5239fefd111caf804a238074d1bf621f
 Author: Marc-Antoine Perennou <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gpaste-3.20.3/Makefile.in 
new/gpaste-3.20.4/Makefile.in
--- old/gpaste-3.20.3/Makefile.in       2016-06-14 08:56:19.000000000 +0200
+++ new/gpaste-3.20.4/Makefile.in       2016-06-28 15:52:28.000000000 +0200
@@ -147,10 +147,9 @@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gpaste.m4 \
-       $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gpaste-3.20.3/NEWS new/gpaste-3.20.4/NEWS
--- old/gpaste-3.20.3/NEWS      2016-06-14 08:53:41.000000000 +0200
+++ new/gpaste-3.20.4/NEWS      2016-06-28 15:50:48.000000000 +0200
@@ -1,3 +1,8 @@
+NEW in 3.20.4 (28/06/2016)
+=============
+
+- fix some extensive CPU usage in some cases
+
 NEW in 3.20.3 (14/06/2016)
 =============
 
@@ -43,6 +48,11 @@
 - Implement the new shotcut window from gtk+
 - Various code cleanups
 
+NEW in 3.18.5 (28/06/2016)
+=============
+
+- fix some extensive CPU usage in some cases
+
 NEW in 3.18.4 (22/05/2016)
 =============
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gpaste-3.20.3/README.md new/gpaste-3.20.4/README.md
--- old/gpaste-3.20.3/README.md 2016-06-14 08:54:29.000000000 +0200
+++ new/gpaste-3.20.4/README.md 2016-06-28 15:51:26.000000000 +0200
@@ -45,6 +45,6 @@
 
 You can see everything I'll post about GPaste 
[there](http://www.imagination-land.org/tags/GPaste.html).
 
-Latest release for GNOME 3.20 is: [GPaste 
3.20.3](http://www.imagination-land.org/posts/2016-06-14-gpaste-3.20.3-released.html).
+Latest release for GNOME 3.20 is: [GPaste 
3.20.4](http://www.imagination-land.org/posts/2016-06-28-gpaste-3.20.4-released.html).
 
-Direct link to download: 
<http://www.imagination-land.org/files/gpaste/gpaste-3.20.3.tar.xz>
+Direct link to download: 
<http://www.imagination-land.org/files/gpaste/gpaste-3.20.4.tar.xz>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gpaste-3.20.3/aclocal.m4 new/gpaste-3.20.4/aclocal.m4
--- old/gpaste-3.20.3/aclocal.m4        2016-06-14 08:56:11.000000000 +0200
+++ new/gpaste-3.20.4/aclocal.m4        2016-06-28 15:52:26.000000000 +0200
@@ -191,6 +191,196 @@
 ]
 )
 
+
+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+# serial 42 IT_PROG_INTLTOOL
+AC_DEFUN([IT_PROG_INTLTOOL], [
+AC_PREREQ([2.50])dnl
+AC_REQUIRE([AM_NLS])dnl
+
+case "$am__api_version" in
+    1.[01234])
+       AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+    ;;
+    *)
+    ;;
+esac
+
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 
* 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ 
print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+if test -n "$1"; then
+    AC_MSG_CHECKING([for intltool >= $1])
+    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 
"$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+       AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or 
later.])
+fi
+
+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z 
"$INTLTOOL_EXTRACT"; then
+    AC_MSG_ERROR([The intltool scripts were not found. Please install 
intltool.])
+fi
+
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+AC_SUBST([AM_DEFAULT_VERBOSITY])
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " [$]@;'
+AC_SUBST(INTLTOOL_V_MERGE)
+AC_SUBST(INTLTOOL__v_MERGE_)
+AC_SUBST(INTLTOOL__v_MERGE_0)
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
+AC_SUBST(intltool__v_merge_options_)
+AC_SUBST(intltool__v_merge_options_0)
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) 
; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x 
-u --no-translations $< [$]@'
+else
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) 
; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir 
[$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x 
-u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
+fi
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
+_IT_SUBST(INTLTOOL_KEYS_RULE)
+_IT_SUBST(INTLTOOL_PROP_RULE)
+_IT_SUBST(INTLTOOL_OAF_RULE)
+_IT_SUBST(INTLTOOL_PONG_RULE)
+_IT_SUBST(INTLTOOL_SERVER_RULE)
+_IT_SUBST(INTLTOOL_SHEET_RULE)
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
+_IT_SUBST(INTLTOOL_UI_RULE)
+_IT_SUBST(INTLTOOL_XAM_RULE)
+_IT_SUBST(INTLTOOL_KBD_RULE)
+_IT_SUBST(INTLTOOL_XML_RULE)
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+_IT_SUBST(INTLTOOL_CAVES_RULE)
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
+_IT_SUBST(INTLTOOL_THEME_RULE)
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
+_IT_SUBST(INTLTOOL_POLICY_RULE)
+
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
+AC_PATH_PROG(MSGFMT, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+
+AC_PATH_PROG(INTLTOOL_PERL, perl)
+if test -z "$INTLTOOL_PERL"; then
+   AC_MSG_ERROR([perl not found])
+fi
+AC_MSG_CHECKING([for perl >= 5.8.1])
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
+else
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
+   AC_MSG_RESULT([$IT_PERL_VERSION])
+fi
+if test "x$2" != "xno-xml"; then
+   AC_MSG_CHECKING([for XML::Parser])
+   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+       AC_MSG_RESULT([ok])
+   else
+       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+   fi
+fi
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
+IT_PO_SUBDIR([po])
+
+])
+
+
+# IT_PO_SUBDIR(DIRNAME)
+# ---------------------
+# All po subdirs have to be declared with this macro; the subdir "po" is
+# declared by IT_PROG_INTLTOOL.
+#
+AC_DEFUN([IT_PO_SUBDIR],
+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+dnl
+dnl The following CONFIG_COMMANDS should be executed at the very end
+dnl of config.status.
+AC_CONFIG_COMMANDS_PRE([
+  AC_CONFIG_COMMANDS([$1/stamp-it], [
+    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
+       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
+    fi
+    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+    >"$1/stamp-it.tmp"
+    [sed '/^#/d
+        s/^[[].*] *//
+        /^[    ]*$/d
+       '"s|^|  $ac_top_srcdir/|" \
+      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+    ]
+    [sed '/^POTFILES =/,/[^\\]$/ {
+               /^POTFILES =/!d
+               r $1/POTFILES
+         }
+        ' "$1/Makefile.in" >"$1/Makefile"]
+    rm -f "$1/Makefile.tmp"
+    mv "$1/stamp-it.tmp" "$1/stamp-it"
+  ])
+])dnl
+])
+
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+#
+AC_DEFUN([_IT_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
+# deprecated macros
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+
+
 dnl -*- mode: autoconf -*-
 dnl Copyright 2009 Johan Dahlin
 dnl
@@ -1926,7 +2116,6 @@
 ]) # _AM_PROG_TAR
 
 m4_include([m4/gpaste.m4])
-m4_include([m4/intltool.m4])
 m4_include([m4/libtool.m4])
 m4_include([m4/ltoptions.m4])
 m4_include([m4/ltsugar.m4])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gpaste-3.20.3/configure new/gpaste-3.20.4/configure
--- old/gpaste-3.20.3/configure 2016-06-14 08:56:18.000000000 +0200
+++ new/gpaste-3.20.4/configure 2016-06-28 15:52:27.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GPaste 3.20.3.
+# Generated by GNU Autoconf 2.69 for GPaste 3.20.4.
 #
 # Report bugs to <[email protected]>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='GPaste'
 PACKAGE_TARNAME='gpaste'
-PACKAGE_VERSION='3.20.3'
-PACKAGE_STRING='GPaste 3.20.3'
+PACKAGE_VERSION='3.20.4'
+PACKAGE_STRING='GPaste 3.20.4'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -1455,7 +1455,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GPaste 3.20.3 to adapt to many kinds of systems.
+\`configure' configures GPaste 3.20.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1525,7 +1525,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GPaste 3.20.3:";;
+     short | recursive ) echo "Configuration of GPaste 3.20.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1701,7 +1701,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GPaste configure 3.20.3
+GPaste configure 3.20.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2124,7 +2124,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GPaste $as_me 3.20.3, which was
+It was created by GPaste $as_me 3.20.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2476,7 +2476,7 @@
 
 
 
-LIBGPASTE_LT_VERSION="6:2:0"
+LIBGPASTE_LT_VERSION="6:3:0"
 
 
 
@@ -12179,7 +12179,7 @@
 
 # Define the identity of the package.
  PACKAGE='gpaste'
- VERSION='3.20.3'
+ VERSION='3.20.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17079,7 +17079,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GPaste $as_me 3.20.3, which was
+This file was extended by GPaste $as_me 3.20.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17145,7 +17145,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GPaste config.status 3.20.3
+GPaste config.status 3.20.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gpaste-3.20.3/configure.ac 
new/gpaste-3.20.4/configure.ac
--- old/gpaste-3.20.3/configure.ac      2016-06-14 08:53:00.000000000 +0200
+++ new/gpaste-3.20.4/configure.ac      2016-06-28 15:52:03.000000000 +0200
@@ -2,14 +2,14 @@
 ##
 ## Copyright (c) 2010-2016, Marc-Antoine Perennou <[email protected]>
 
-m4_define([gpaste_version],      [3.20.3])
+m4_define([gpaste_version],      [3.20.4])
 
 # 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],   [6:2:0])
+m4_define([gpaste_lt_version],   [6:3:0])
 
 # Build system requirements
 m4_define([autoconf_required],   [2.69])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gpaste-3.20.3/m4/intltool.m4 
new/gpaste-3.20.4/m4/intltool.m4
--- old/gpaste-3.20.3/m4/intltool.m4    2016-03-10 15:19:52.000000000 +0100
+++ new/gpaste-3.20.4/m4/intltool.m4    1970-01-01 01:00:00.000000000 +0100
@@ -1,212 +0,0 @@
-## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
-## Copyright (C) 2001 Eazel, Inc.
-## Author: Maciej Stachowiak <[email protected]>
-##         Kenneth Christiansen <[email protected]>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 42 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL], [
-AC_PREREQ([2.50])dnl
-AC_REQUIRE([AM_NLS])dnl
-
-case "$am__api_version" in
-    1.[01234])
-       AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-    ;;
-    *)
-    ;;
-esac
-
-INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 
* 100 + $ 3; }'`
-INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ 
print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-if test -n "$1"; then
-    AC_MSG_CHECKING([for intltool >= $1])
-    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 
"$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-       AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or 
later.])
-fi
-
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z 
"$INTLTOOL_EXTRACT"; then
-    AC_MSG_ERROR([The intltool scripts were not found. Please install 
intltool.])
-fi
-
-if test -z "$AM_DEFAULT_VERBOSITY"; then
-  AM_DEFAULT_VERBOSITY=1
-fi
-AC_SUBST([AM_DEFAULT_VERBOSITY])
-
-INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
-INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
-INTLTOOL__v_MERGE_0='@echo "  ITMRG " [$]@;'
-AC_SUBST(INTLTOOL_V_MERGE)
-AC_SUBST(INTLTOOL__v_MERGE_)
-AC_SUBST(INTLTOOL__v_MERGE_0)
-
-INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
-intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
-intltool__v_merge_options_0='-q'
-AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
-AC_SUBST(intltool__v_merge_options_)
-AC_SUBST(intltool__v_merge_options_0)
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) 
; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x 
-u --no-translations $< [$]@'
-else
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) 
; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir 
[$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x 
-u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
-fi
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) 
$(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C 
$(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
-
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
-   AC_MSG_ERROR([perl not found])
-fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-else
-   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
-   AC_MSG_RESULT([$IT_PERL_VERSION])
-fi
-if test "x$2" != "xno-xml"; then
-   AC_MSG_CHECKING([for XML::Parser])
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       AC_MSG_RESULT([ok])
-   else
-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-IT_PO_SUBDIR([po])
-
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be executed at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
-  AC_CONFIG_COMMANDS([$1/stamp-it], [
-    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-    fi
-    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-    >"$1/stamp-it.tmp"
-    [sed '/^#/d
-        s/^[[].*] *//
-        /^[    ]*$/d
-       '"s|^|  $ac_top_srcdir/|" \
-      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-    ]
-    [sed '/^POTFILES =/,/[^\\]$/ {
-               /^POTFILES =/!d
-               r $1/POTFILES
-         }
-        ' "$1/Makefile.in" >"$1/Makefile"]
-    rm -f "$1/Makefile.tmp"
-    mv "$1/stamp-it.tmp" "$1/stamp-it"
-  ])
-])dnl
-])
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gpaste-3.20.3/po/de.po new/gpaste-3.20.4/po/de.po
--- old/gpaste-3.20.3/po/de.po  2016-06-14 08:56:37.000000000 +0200
+++ new/gpaste-3.20.4/po/de.po  2016-06-28 15:52:43.000000000 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GPaste\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2016-06-14 08:56+0200\n"
+"POT-Creation-Date: 2016-06-28 15:52+0200\n"
 "PO-Revision-Date: 2014-03-27 21:03+0100\n"
 "Last-Translator: Christian Kluge <[email protected]>\n"
 "Language-Team: \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gpaste-3.20.3/po/es.po new/gpaste-3.20.4/po/es.po
--- old/gpaste-3.20.3/po/es.po  2016-06-14 08:56:37.000000000 +0200
+++ new/gpaste-3.20.4/po/es.po  2016-06-28 15:52:43.000000000 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GPaste\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2016-06-14 08:56+0200\n"
+"POT-Creation-Date: 2016-06-28 15:52+0200\n"
 "PO-Revision-Date: 2011-11-20 16:30+0100\n"
 "Last-Translator: Antonio Trujillo <[email protected]>\n"
 "Language-Team: Spanish\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gpaste-3.20.3/po/fr.po new/gpaste-3.20.4/po/fr.po
--- old/gpaste-3.20.3/po/fr.po  2016-06-14 08:56:37.000000000 +0200
+++ new/gpaste-3.20.4/po/fr.po  2016-06-28 15:52:43.000000000 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GPaste\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2016-06-14 08:56+0200\n"
+"POT-Creation-Date: 2016-06-28 15:52+0200\n"
 "PO-Revision-Date: 2011-01-25 16:05+0100\n"
 "Last-Translator: Marc-Antoine Perennou <[email protected]>\n"
 "Language-Team: French\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gpaste-3.20.3/po/pt_BR.po 
new/gpaste-3.20.4/po/pt_BR.po
--- old/gpaste-3.20.3/po/pt_BR.po       2016-06-14 08:56:37.000000000 +0200
+++ new/gpaste-3.20.4/po/pt_BR.po       2016-06-28 15:52:43.000000000 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GPaste\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2016-06-14 08:56+0200\n"
+"POT-Creation-Date: 2016-06-28 15:52+0200\n"
 "PO-Revision-Date: 2015-10-10 20:03-0300\n"
 "Last-Translator: Elder Marco <[email protected]>\n"
 "Language-Team: \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/gpaste-3.20.3/src/libgpaste/core/gpaste-clipboard.c 
new/gpaste-3.20.4/src/libgpaste/core/gpaste-clipboard.c
--- old/gpaste-3.20.3/src/libgpaste/core/gpaste-clipboard.c     2016-05-23 
10:41:17.000000000 +0200
+++ new/gpaste-3.20.4/src/libgpaste/core/gpaste-clipboard.c     2016-06-28 
15:49:55.000000000 +0200
@@ -433,6 +433,10 @@
 
     GPasteClipboardPrivate *priv = g_paste_clipboard_get_instance_private 
(self);
 
+    /* We're already clear, don't enter an infinite event loop */
+    if (!priv->text && !priv->image_checksum)
+        return;
+
     g_debug("%s: clear", gdk_atom_name (priv->target));
 
     g_clear_pointer (&priv->text, g_free);


Reply via email to