[Pkg-xfce-commits] r7095 - in desktop/trunk/mousepad/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2012-06-30 13:58:22 +0000 (Sat, 30 Jun 2012)
New Revision: 7095

Added:
   desktop/trunk/mousepad/debian/patches/02_fix-typos-in-test.patch
Modified:
   desktop/trunk/mousepad/debian/changelog
   desktop/trunk/mousepad/debian/patches/series
Log:
* debian/patches:
  - 02_fix-typos-in-test added, fix typos in various tests, which led to
    infinite loops and freezes in some cases.                 closes: #631114

Modified: desktop/trunk/mousepad/debian/changelog
===================================================================
--- desktop/trunk/mousepad/debian/changelog	2012-06-30 13:53:11 UTC (rev 7094)
+++ desktop/trunk/mousepad/debian/changelog	2012-06-30 13:58:22 UTC (rev 7095)
@@ -1,7 +1,13 @@
 mousepad (0.2.16-6) UNRELEASED; urgency=low
 
+  [ Lionel Le Folgoc ]
   * debian/patches: add missing DEP3 headers.
 
+  [ Yves-Alexis Perez ]
+  * debian/patches:
+    - 02_fix-typos-in-test added, fix typos in various tests, which led to
+      infinite loops and freezes in some cases.                 closes: #631114
+
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Mon, 20 Feb 2012 21:44:50 +0100
 
 mousepad (0.2.16-5) unstable; urgency=low

Added: desktop/trunk/mousepad/debian/patches/02_fix-typos-in-test.patch
===================================================================
--- desktop/trunk/mousepad/debian/patches/02_fix-typos-in-test.patch	                        (rev 0)
+++ desktop/trunk/mousepad/debian/patches/02_fix-typos-in-test.patch	2012-06-30 13:58:22 UTC (rev 7095)
@@ -0,0 +1,37 @@
+diff --git a/src/keyevent.c b/src/keyevent.c
+index ee6389c..549db21 100644
+--- a/src/keyevent.c
++++ b/src/keyevent.c
+@@ -36,7 +36,7 @@ guint keyevent_getval(void)
+ 	gchar flag = 0;
+ 	
+ 	gdk_window_get_pointer(gdkwin, NULL, NULL, &mask);
+-	if (mask &= GDK_CONTROL_MASK)
++	if (mask & GDK_CONTROL_MASK)
+ 		flag = 1;
+ 	
+ 	return keyval + 0x10000 * flag;
+@@ -89,19 +89,19 @@ static gboolean cb_key_press_event(GtkWidget *text_view, GdkEventKey *event)
+ 	case GDK_Return:
+ 		if (check_preedit(text_view))
+ 			return FALSE;
+-		if ((indent_get_state() && !(event->state &= GDK_SHIFT_MASK)) ||
+-			(!indent_get_state() && (event->state &= GDK_SHIFT_MASK))) {
++		if ((indent_get_state() && !(event->state & GDK_SHIFT_MASK)) ||
++			(!indent_get_state() && (event->state & GDK_SHIFT_MASK))) {
+ 			indent_real(text_view);
+ 			return TRUE;
+ 		}
+ 		break;
+ 	case GDK_Tab:
+-		if (event->state &= GDK_CONTROL_MASK) {
++		if (event->state & GDK_CONTROL_MASK) {
+ 			indent_toggle_tab_width(text_view);
+ 			return TRUE;
+ 		}
+ 	case GDK_ISO_Left_Tab:
+-		if (event->state &= GDK_SHIFT_MASK) {
++		if (event->state & GDK_SHIFT_MASK) {
+ 			keyval = 0;
+ 			indent_multi_line_unindent(buffer);
+ 		} else if (!check_selection_bound(buffer))

Modified: desktop/trunk/mousepad/debian/patches/series
===================================================================
--- desktop/trunk/mousepad/debian/patches/series	2012-06-30 13:53:11 UTC (rev 7094)
+++ desktop/trunk/mousepad/debian/patches/series	2012-06-30 13:58:22 UTC (rev 7095)
@@ -1,2 +1,3 @@
 00_resensitize-find-button.patch
 01_fix-first-replace.patch
+02_fix-typos-in-test.patch