[Pkg-xfce-commits] r9432 - in /desktop/trunk/mousepad/debian/patches: 01_prevent-a-g_settings-cycle.patch 02_do-not-manually-update-the-view-theme.patch
Yves-Alexis Perez
corsac at moszumanska.debian.org
Sun Jun 12 17:06:05 UTC 2016
Author: corsac
Date: Sun Jun 12 17:06:05 2016
New Revision: 9432
URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=9432
Log:
edit patches so they apply against 0.4.0
Modified:
desktop/trunk/mousepad/debian/patches/01_prevent-a-g_settings-cycle.patch
desktop/trunk/mousepad/debian/patches/02_do-not-manually-update-the-view-theme.patch
Modified: desktop/trunk/mousepad/debian/patches/01_prevent-a-g_settings-cycle.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/mousepad/debian/patches/01_prevent-a-g_settings-cycle.patch?rev=9432&op=diff
==============================================================================
--- desktop/trunk/mousepad/debian/patches/01_prevent-a-g_settings-cycle.patch (original)
+++ desktop/trunk/mousepad/debian/patches/01_prevent-a-g_settings-cycle.patch Sun Jun 12 17:06:05 2016
@@ -12,35 +12,21 @@
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,
+@@ -302,11 +302,6 @@ mousepad_action_group_set_active_style_s
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);
+- MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, gtk_source_style_scheme_get_id (scheme));
- self->locked = FALSE;
-
g_object_notify (G_OBJECT (self), "active-style-scheme");
}
-@@ -477,6 +467,8 @@ static void
+@@ -473,6 +468,8 @@ static void
mousepad_action_group_style_scheme_action_activate (MousepadActionGroup *self,
MousepadStyleSchemeAction *action)
{
@@ -49,7 +35,7 @@
/* 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
+@@ -481,7 +478,14 @@ mousepad_action_group_style_scheme_actio
GtkSourceStyleScheme *scheme;
scheme = mousepad_style_scheme_action_get_style_scheme (action);
@@ -65,6 +51,3 @@
}
}
---
-2.5.0
-
Modified: desktop/trunk/mousepad/debian/patches/02_do-not-manually-update-the-view-theme.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/mousepad/debian/patches/02_do-not-manually-update-the-view-theme.patch?rev=9432&op=diff
==============================================================================
--- desktop/trunk/mousepad/debian/patches/02_do-not-manually-update-the-view-theme.patch (original)
+++ desktop/trunk/mousepad/debian/patches/02_do-not-manually-update-the-view-theme.patch Sun Jun 12 17:06:05 2016
@@ -11,26 +11,24 @@
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)
+@@ -711,29 +711,6 @@ mousepad_window_create_languages_menu (M
- static void
+
+-static void
-mousepad_window_action_group_style_scheme_changed (MousepadWindow *window,
- GParamSpec *pspec,
- MousepadActionGroup *group)
-{
- GtkSourceStyleScheme *scheme;
-- const gchar *scheme_id = NULL;
+- const gchar *scheme_id;
- 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);
+- 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));
@@ -42,18 +40,13 @@
- 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);
+
+
+
+@@ -752,12 +729,6 @@ mousepad_window_create_style_schemes_men
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",
@@ -63,6 +56,3 @@
}
---
-2.5.0
-
More information about the Pkg-xfce-commits
mailing list