[gentoo-commits] gentoo-x86 commit in app-text/epdfview/files: epdfview-0.1.7-mouse-scrolling.patch

[Peter Alfredsen (loki_val)]

loki_val    09/04/26 14:28:55

  Modified:             epdfview-0.1.7-mouse-scrolling.patch
  Log:
  Run dos2unix on mouse-scrolling patch
  (Portage version: 2.2_rc28/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  app-text/epdfview/files/epdfview-0.1.7-mouse-scrolling.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/epdfview/files/epdfview-0.1.7-mouse-scrolling.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/epdfview/files/epdfview-0.1.7-mouse-scrolling.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/epdfview/files/epdfview-0.1.7-mouse-scrolling.patch?r1=1.1&r2=1.2

Index: epdfview-0.1.7-mouse-scrolling.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/epdfview/files/epdfview-0.1.7-mouse-scrolling.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- epdfview-0.1.7-mouse-scrolling.patch	26 Apr 2009 13:22:25 -0000	1.1
+++ epdfview-0.1.7-mouse-scrolling.patch	26 Apr 2009 14:28:55 -0000	1.2
@@ -1,60 +1,60 @@
-Index: /trunk/src/gtk/MainView.cxx
-===================================================================
---- /trunk/src/gtk/MainView.cxx (revision 325)
-+++ /trunk/src/gtk/MainView.cxx (revision 329)
-@@ -78,5 +78,5 @@
- static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
- static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer);
--static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
-+static gboolean main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
- 
- #if defined (HAVE_CUPS)
-@@ -1480,5 +1480,5 @@
- }
- 
--void 
-+gboolean 
- main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data)
- {
-@@ -1487,10 +1487,17 @@
-     MainPter *pter = (MainPter *)data;
-     // Only zoom when the CTRL-Button is down...
--    if ( !(event->state & GDK_CONTROL_MASK) ) return;
--    if ( event->direction == GDK_SCROLL_UP ) {
--        pter->zoomInActivated ();
--    } else if ( event->direction == GDK_SCROLL_DOWN ) {
--        pter->zoomOutActivated ();
--    }
--}
--
-+    if ( GDK_CONTROL_MASK == (event->state & GDK_CONTROL_MASK) )
-+    {
-+        if ( event->direction == GDK_SCROLL_UP )
-+        {
-+            pter->zoomInActivated ();
-+        }
-+        else if ( event->direction == GDK_SCROLL_DOWN )
-+        {
-+            pter->zoomOutActivated ();
-+        }
-+        return TRUE;
-+    }
-+    return FALSE;
-+}
-+
-Index: /trunk/src/gtk/PageView.cxx
-===================================================================
---- /trunk/src/gtk/PageView.cxx (revision 325)
-+++ /trunk/src/gtk/PageView.cxx (revision 329)
-@@ -528,11 +528,4 @@
-     g_assert ( NULL != data && "The data parameter is NULL.");
- 
--    // don't scroll when the CRTL-Button is down, because then the page should
--    // actually be zoomed and not scrolled. Zooming is handelt by the MainView
--    // class.
--    if ( event->state & GDK_CONTROL_MASK )
--    {
--        return FALSE;
--    }
-     PagePter *pter = (PagePter *)data;
-     GtkAdjustment *adjustment = 
+Index: /trunk/src/gtk/MainView.cxx
+===================================================================
+--- /trunk/src/gtk/MainView.cxx (revision 325)
++++ /trunk/src/gtk/MainView.cxx (revision 329)
+@@ -78,5 +78,5 @@
+ static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
+ static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer);
+-static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
++static gboolean main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
+ 
+ #if defined (HAVE_CUPS)
+@@ -1480,5 +1480,5 @@
+ }
+ 
+-void 
++gboolean 
+ main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data)
+ {
+@@ -1487,10 +1487,17 @@
+     MainPter *pter = (MainPter *)data;
+     // Only zoom when the CTRL-Button is down...
+-    if ( !(event->state & GDK_CONTROL_MASK) ) return;
+-    if ( event->direction == GDK_SCROLL_UP ) {
+-        pter->zoomInActivated ();
+-    } else if ( event->direction == GDK_SCROLL_DOWN ) {
+-        pter->zoomOutActivated ();
+-    }
+-}
+-
++    if ( GDK_CONTROL_MASK == (event->state & GDK_CONTROL_MASK) )
++    {
++        if ( event->direction == GDK_SCROLL_UP )
++        {
++            pter->zoomInActivated ();
++        }
++        else if ( event->direction == GDK_SCROLL_DOWN )
++        {
++            pter->zoomOutActivated ();
++        }
++        return TRUE;
++    }
++    return FALSE;
++}
++
+Index: /trunk/src/gtk/PageView.cxx
+===================================================================
+--- /trunk/src/gtk/PageView.cxx (revision 325)
++++ /trunk/src/gtk/PageView.cxx (revision 329)
+@@ -528,11 +528,4 @@
+     g_assert ( NULL != data && "The data parameter is NULL.");
+ 
+-    // don't scroll when the CRTL-Button is down, because then the page should
+-    // actually be zoomed and not scrolled. Zooming is handelt by the MainView
+-    // class.
+-    if ( event->state & GDK_CONTROL_MASK )
+-    {
+-        return FALSE;
+-    }
+     PagePter *pter = (PagePter *)data;
+     GtkAdjustment *adjustment =