[Pkg-xfce-commits] r9429 - in /desktop/trunk/mousepad/debian: changelog control patches/0001-Prevent-a-weird-cycle-in-GSettings-use.patch patches/series

[Yves-Alexis Perez]

Author: corsac
Date: Sun Jun 12 16:20:07 2016
New Revision: 9429

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=9429
Log:
* debian/patches:
  - 0001-Prevent-a-weird-cycle-in-GSettings-use added, fix loop in GSettings
    leading to huge DBus trafic and large CPU usage.          closes: #795192
* debian/control:
  - update standards version to 3.9.8.

Added:
    desktop/trunk/mousepad/debian/patches/0001-Prevent-a-weird-cycle-in-GSettings-use.patch
    desktop/trunk/mousepad/debian/patches/series
Modified:
    desktop/trunk/mousepad/debian/changelog
    desktop/trunk/mousepad/debian/control

Modified: desktop/trunk/mousepad/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/mousepad/debian/changelog?rev=9429&op=diff
==============================================================================
--- desktop/trunk/mousepad/debian/changelog	(original)
+++ desktop/trunk/mousepad/debian/changelog	Sun Jun 12 16:20:07 2016
@@ -1,3 +1,13 @@
+mousepad (0.4.0-4) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - 0001-Prevent-a-weird-cycle-in-GSettings-use added, fix loop in GSettings
+      leading to huge DBus trafic and large CPU usage.          closes: #795192
+  * debian/control:
+    - update standards version to 3.9.8.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 27 Sep 2015 22:53:07 +0200
+
 mousepad (0.4.0-3) unstable; urgency=medium
 
   * debian/menu dropped following CTTE #741573, along with

Modified: desktop/trunk/mousepad/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/mousepad/debian/control?rev=9429&op=diff
==============================================================================
--- desktop/trunk/mousepad/debian/control	(original)
+++ desktop/trunk/mousepad/debian/control	Sun Jun 12 16:20:07 2016
@@ -6,7 +6,7 @@
  Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: debhelper (>= 9), pkg-config, libxml-parser-perl, intltool,
  libgtksourceview2.0-dev, libglib2.0-dev, xfce4-dev-tools, dh-autoreconf
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/mousepad/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/desktop/trunk/mousepad/
 

Added: desktop/trunk/mousepad/debian/patches/0001-Prevent-a-weird-cycle-in-GSettings-use.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/mousepad/debian/patches/0001-Prevent-a-weird-cycle-in-GSettings-use.patch?rev=9429&op=file
==============================================================================
--- desktop/trunk/mousepad/debian/patches/0001-Prevent-a-weird-cycle-in-GSettings-use.patch	(added)
+++ desktop/trunk/mousepad/debian/patches/0001-Prevent-a-weird-cycle-in-GSettings-use.patch	Sun Jun 12 16:20:07 2016
@@ -0,0 +1,37 @@
+From f07cc75f2aa77d14f16b5506321ac6a2413706ba Mon Sep 17 00:00:00 2001
+From: Matthew Brush <mbrush at codebrainz.ca>
+Date: Sun, 27 Sep 2015 12:29:15 -0700
+Subject: [PATCH] Prevent a weird cycle in GSettings use
+
+Was causing it to continuously update the "color-scheme" setting,
+resulting in lots of DBus spam and CPU/disk activity. I'm not sure
+why only this setting was causing the issue, and why it still updates
+across all the instances while using the `G_SETTINGS_BIND_GET_NO_CHANGES`
+flag, since it shouldn't (and doesn't if it's used on other settings).
+
+Closes bug #12134
+---
+ mousepad/mousepad-view.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/mousepad/mousepad-view.c
++++ b/mousepad/mousepad-view.c
+@@ -323,10 +323,17 @@ mousepad_view_init (MousepadView *view)
+   BIND_ (SHOW_RIGHT_MARGIN,      "show-right-margin");
+   BIND_ (SMART_HOME_END,         "smart-home-end");
+   BIND_ (TAB_WIDTH,              "tab-width");
+-  BIND_ (COLOR_SCHEME,           "color-scheme");
+   BIND_ (WORD_WRAP,              "word-wrap");
+   BIND_ (MATCH_BRACES,           "match-braces");
+ 
++  /* for color-scheme, use G_SETTINGS_BIND_GET_NO_CHANGES to stop
++   * a cycle that was causing DBus thrashing. See:
++   * https://bugzilla.xfce.org/show_bug.cgi?id=12134 */
++  printf("toto\n");
++  MOUSEPAD_SETTING_BIND (COLOR_SCHEME, view, "color-scheme",
++                         G_SETTINGS_BIND_DEFAULT |
++                           G_SETTINGS_BIND_GET_NO_CHANGES);
++
+   /* override with default font when the setting is enabled */
+   MOUSEPAD_SETTING_CONNECT_OBJECT (USE_DEFAULT_FONT,
+                                    G_CALLBACK (mousepad_view_use_default_font_setting_changed),

Added: desktop/trunk/mousepad/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/mousepad/debian/patches/series?rev=9429&op=file
==============================================================================
--- desktop/trunk/mousepad/debian/patches/series	(added)
+++ desktop/trunk/mousepad/debian/patches/series	Sun Jun 12 16:20:07 2016
@@ -0,0 +1 @@
+0001-Prevent-a-weird-cycle-in-GSettings-use.patch