[Pkg-xfce-commits] r9430 - in /desktop/trunk/mousepad/debian: changelog patches/0001-Prevent-a-weird-cycle-in-GSettings-use.patch patches/01_do-not-manually-update-the-view-theme.patch patches/02_prevent-a-g_settings-cycle.patch patches/series
Yves-Alexis Perez
corsac at moszumanska.debian.org
Sun Jun 12 16:32:40 UTC 2016
Author: corsac
Date: Sun Jun 12 16:32:40 2016
New Revision: 9430
URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=9430
Log:
replace patches with updated versions
Added:
desktop/trunk/mousepad/debian/patches/01_do-not-manually-update-the-view-theme.patch
desktop/trunk/mousepad/debian/patches/02_prevent-a-g_settings-cycle.patch
Removed:
desktop/trunk/mousepad/debian/patches/0001-Prevent-a-weird-cycle-in-GSettings-use.patch
Modified:
desktop/trunk/mousepad/debian/changelog
desktop/trunk/mousepad/debian/patches/series
Modified: desktop/trunk/mousepad/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/mousepad/debian/changelog?rev=9430&op=diff
==============================================================================
--- desktop/trunk/mousepad/debian/changelog (original)
+++ desktop/trunk/mousepad/debian/changelog Sun Jun 12 16:32:40 2016
@@ -1,8 +1,9 @@
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
+ - 01_do-not-manually-update-the-view-theme and
+ 02_prevent-a-g_settings-cycle added, fix bug 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/01_do-not-manually-update-the-view-theme.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/mousepad/debian/patches/01_do-not-manually-update-the-view-theme.patch?rev=9430&op=file
==============================================================================
--- desktop/trunk/mousepad/debian/patches/01_do-not-manually-update-the-view-theme.patch (added)
+++ desktop/trunk/mousepad/debian/patches/01_do-not-manually-update-the-view-theme.patch Sun Jun 12 16:32:40 2016
@@ -0,0 +1,68 @@
+From 376432b8061956d40e957fb64924e488e0837a1a Mon Sep 17 00:00:00 2001
+From: Alistair Buxton <a.j.buxton at gmail.com>
+Date: Mon, 21 Mar 2016 23:36:05 +0000
+Subject: [PATCH 3/3] Do not manually update the view theme.
+
+The view property is bound directly to the g_setting, so it will
+be updated autoatically whenever that changes. The action group
+updates the g_setting so we don't need to manually propagate the
+setting.
+---
+ mousepad/mousepad-window.c | 34 ----------------------------------
+ 1 file changed, 34 deletions(-)
+
+diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
+index adae7cd..a3fda7a 100644
+--- a/mousepad/mousepad-window.c
++++ b/mousepad/mousepad-window.c
+@@ -712,33 +712,6 @@ mousepad_window_create_languages_menu (MousepadWindow *window)
+
+
+ static void
+-mousepad_window_action_group_style_scheme_changed (MousepadWindow *window,
+- GParamSpec *pspec,
+- MousepadActionGroup *group)
+-{
+- GtkSourceStyleScheme *scheme;
+- const gchar *scheme_id = NULL;
+- gint npages, i;
+-
+- /* get the new active language */
+- scheme = mousepad_action_group_get_active_style_scheme (group);
+- if (scheme != NULL)
+- scheme_id = gtk_source_style_scheme_get_id (scheme);
+-
+- /* update the color scheme on all the documents */
+- npages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (window->notebook));
+- for (i = 0; i < npages; i++)
+- {
+- MousepadDocument *document;
+-
+- document = MOUSEPAD_DOCUMENT (gtk_notebook_get_nth_page (GTK_NOTEBOOK (window->notebook), i));
+- mousepad_view_set_color_scheme (document->textview, scheme_id);
+- }
+-}
+-
+-
+-
+-static void
+ mousepad_window_create_style_schemes_menu (MousepadWindow *window)
+ {
+ GtkWidget *menu, *item;
+@@ -752,13 +725,6 @@ mousepad_window_create_style_schemes_menu (MousepadWindow *window)
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
+ gtk_widget_show_all (menu);
+ gtk_widget_show (item);
+-
+- /* watch for activations of the style schemes actions */
+- g_signal_connect_object (window->action_group,
+- "notify::active-style-scheme",
+- G_CALLBACK (mousepad_window_action_group_style_scheme_changed),
+- window,
+- G_CONNECT_SWAPPED);
+ }
+
+
+--
+2.5.0
+
Added: desktop/trunk/mousepad/debian/patches/02_prevent-a-g_settings-cycle.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/mousepad/debian/patches/02_prevent-a-g_settings-cycle.patch?rev=9430&op=file
==============================================================================
--- desktop/trunk/mousepad/debian/patches/02_prevent-a-g_settings-cycle.patch (added)
+++ desktop/trunk/mousepad/debian/patches/02_prevent-a-g_settings-cycle.patch Sun Jun 12 16:32:40 2016
@@ -0,0 +1,70 @@
+From 320deb1ec28ddb5e9647b154f2c08f358ba2c4cb Mon Sep 17 00:00:00 2001
+From: Alistair Buxton <a.j.buxton at gmail.com>
+Date: Mon, 21 Mar 2016 23:34:12 +0000
+Subject: [PATCH 2/3] Prevent a g_settings cycle.
+
+When the selected menu item changes, only update the g_setting.
+When the g_setting changes, only update the selected menu item.
+
+This prevents g_setting changes from bouncing between windows
+endlessly.
+---
+ mousepad/mousepad-action-group.c | 21 ++++++++++-----------
+ 1 file changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/mousepad/mousepad-action-group.c b/mousepad/mousepad-action-group.c
+index acea132..f9a7fa1 100644
+--- a/mousepad/mousepad-action-group.c
++++ b/mousepad/mousepad-action-group.c
+@@ -284,8 +284,6 @@ mousepad_action_group_set_active_style_scheme (MousepadActionGroup *self,
+ GtkSourceStyleScheme *scheme)
+ {
+ GtkAction *action;
+- const gchar *scheme_name = NULL;
+-
+ g_return_if_fail (MOUSEPAD_IS_ACTION_GROUP (self));
+
+ if (GTK_SOURCE_IS_STYLE_SCHEME (self->active_scheme))
+@@ -303,14 +301,6 @@ mousepad_action_group_set_active_style_scheme (MousepadActionGroup *self,
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
+ self->locked = FALSE;
+
+- /* update the setting when the active action is changed */
+- if (scheme != NULL)
+- scheme_name = gtk_source_style_scheme_get_id(scheme);
+-
+- self->locked = TRUE;
+- MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, scheme_name);
+- self->locked = FALSE;
+-
+ g_object_notify (G_OBJECT (self), "active-style-scheme");
+ }
+
+@@ -477,6 +467,8 @@ static void
+ mousepad_action_group_style_scheme_action_activate (MousepadActionGroup *self,
+ MousepadStyleSchemeAction *action)
+ {
++ const gchar *scheme_name = NULL;
++
+ /* only update the active action if we're not already in the process of
+ * setting it and the sender action is actually active */
+ if (! self->locked &&
+@@ -485,7 +477,14 @@ mousepad_action_group_style_scheme_action_activate (MousepadActionGroup *s
+ GtkSourceStyleScheme *scheme;
+
+ scheme = mousepad_style_scheme_action_get_style_scheme (action);
+- mousepad_action_group_set_active_style_scheme (self, scheme);
++
++ /* update the setting when the active action is changed */
++ if (scheme != NULL)
++ scheme_name = gtk_source_style_scheme_get_id(scheme);
++
++ self->locked = TRUE;
++ MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, scheme_name);
++ self->locked = FALSE;
+ }
+ }
+
+--
+2.5.0
+
Modified: desktop/trunk/mousepad/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/mousepad/debian/patches/series?rev=9430&op=diff
==============================================================================
--- desktop/trunk/mousepad/debian/patches/series (original)
+++ desktop/trunk/mousepad/debian/patches/series Sun Jun 12 16:32:40 2016
@@ -1 +1,2 @@
-0001-Prevent-a-weird-cycle-in-GSettings-use.patch
+01_do-not-manually-update-the-view-theme.patch
+02_prevent-a-g_settings-cycle.patch
More information about the Pkg-xfce-commits
mailing list