evince r3154 - in trunk: . shell

[carlosgc svn gnome org]

Author: carlosgc
Date: Fri Sep  5 16:52:36 2008
New Revision: 3154
URL: http://svn.gnome.org/viewvc/evince?rev=3154&view=rev

Log:
2008-09-05  Carlos Garcia Campos  <carlosgc gnome org>

	* shell/ev-view.c: (ev_view_motion_notify_event):

	Make sure the cursor is correctly restored after showing the right
	click menu.


Modified:
   trunk/ChangeLog
   trunk/shell/ev-view.c

Modified: trunk/shell/ev-view.c
==============================================================================
--- trunk/shell/ev-view.c	(original)
+++ trunk/shell/ev-view.c	Fri Sep  5 16:52:36 2008
@@ -3038,15 +3038,20 @@
 		}
 	}
 	
-	/* For the Evince 0.4.x release, we limit selection to un-rotated
-	 * documents only.
-	 */
-	if (view->pressed_button == 1 && view->rotation == 0) {
+	switch (view->pressed_button) {
+	case 1:
+		/* For the Evince 0.4.x release, we limit selection to un-rotated
+		 * documents only.
+		 */
+		if (view->rotation != 0)
+			return FALSE;
 
 		/* Schedule timeout to scroll during selection and additionally 
 		 * scroll once to allow arbitrary speed. */
 		if (!view->selection_scroll_id)
-		    view->selection_scroll_id = g_timeout_add (SCROLL_TIME, (GSourceFunc)selection_scroll_timeout_cb, view);
+		    view->selection_scroll_id = g_timeout_add (SCROLL_TIME,
+							       (GSourceFunc)selection_scroll_timeout_cb,
+							       view);
 		else 
 		    selection_scroll_timeout_cb (view);
 
@@ -3063,7 +3068,7 @@
 			view->selection_update_id = g_idle_add ((GSourceFunc)selection_update_idle_cb, view);
 
 		return TRUE;
-	} else if (view->pressed_button == 2) {
+	case 2:
 		if (!view->drag_info.in_drag) {
 			gboolean start;
 			int i;
@@ -3113,10 +3118,11 @@
 
 			return TRUE;
 		}
-	} else if (view->pressed_button <= 0) {
+
+		break;
+	default:
 		ev_view_handle_cursor_over_xy (view, x, y);
-		return TRUE;
-	}
+	} 
 
 	return FALSE;
 }