From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Ly5Lm-0008Qq-1d for garchives@archives.gentoo.org; Sun, 26 Apr 2009 14:28:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68116E044D; Sun, 26 Apr 2009 14:28:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1691BE044D for ; Sun, 26 Apr 2009 14:28:57 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 9C250653A6 for ; Sun, 26 Apr 2009 14:28:56 +0000 (UTC) Received: from loki_val by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1Ly5Lj-0007fn-Uy for gentoo-commits@lists.gentoo.org; Sun, 26 Apr 2009 14:28:56 +0000 From: "Peter Alfredsen (loki_val)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, loki_val@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-text/epdfview/files: epdfview-0.1.7-mouse-scrolling.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: epdfview-0.1.7-mouse-scrolling.patch X-VCS-Directories: app-text/epdfview/files X-VCS-Committer: loki_val X-VCS-Committer-Name: Peter Alfredsen Content-Type: text/plain; charset=utf8 Message-Id: Sender: Peter Alfredsen Date: Sun, 26 Apr 2009 14:28:55 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 60eefd3b-c55b-4995-b59e-3d2cd8be645c X-Archives-Hash: 36a7252f6d8c679fa8b8b8ab427d0cbd 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-scrolli= ng.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/epdfview/= files/epdfview-0.1.7-mouse-scrolling.patch?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/epdfview/= files/epdfview-0.1.7-mouse-scrolling.patch?rev=3D1.2&content-type=3Dtext/= plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/epdfview/= files/epdfview-0.1.7-mouse-scrolling.patch?r1=3D1.1&r2=3D1.2 Index: epdfview-0.1.7-mouse-scrolling.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- /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, GdkEventSc= roll *event, gpointer data); -+static gboolean main_window_page_scrolled_cb (GtkWidget *widget, GdkEve= ntScroll *event, gpointer data); -=20 - #if defined (HAVE_CUPS) -@@ -1480,5 +1480,5 @@ - } -=20 --void=20 -+gboolean=20 - main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event,= gpointer data) - { -@@ -1487,10 +1487,17 @@ - MainPter *pter =3D (MainPter *)data; - // Only zoom when the CTRL-Button is down... -- if ( !(event->state & GDK_CONTROL_MASK) ) return; -- if ( event->direction =3D=3D GDK_SCROLL_UP ) { -- pter->zoomInActivated (); -- } else if ( event->direction =3D=3D GDK_SCROLL_DOWN ) { -- pter->zoomOutActivated (); -- } --} -- -+ if ( GDK_CONTROL_MASK =3D=3D (event->state & GDK_CONTROL_MASK) ) -+ { -+ if ( event->direction =3D=3D GDK_SCROLL_UP ) -+ { -+ pter->zoomInActivated (); -+ } -+ else if ( event->direction =3D=3D GDK_SCROLL_DOWN ) -+ { -+ pter->zoomOutActivated (); -+ } -+ return TRUE; -+ } -+ return FALSE; -+} -+ -Index: /trunk/src/gtk/PageView.cxx -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- /trunk/src/gtk/PageView.cxx (revision 325) -+++ /trunk/src/gtk/PageView.cxx (revision 329) -@@ -528,11 +528,4 @@ - g_assert ( NULL !=3D data && "The data parameter is NULL."); -=20 -- // 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 M= ainView -- // class. -- if ( event->state & GDK_CONTROL_MASK ) -- { -- return FALSE; -- } - PagePter *pter =3D (PagePter *)data; - GtkAdjustment *adjustment =3D=20 +Index: /trunk/src/gtk/MainView.cxx +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- /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, GdkEventSc= roll *event, gpointer data); ++static gboolean main_window_page_scrolled_cb (GtkWidget *widget, GdkEve= ntScroll *event, gpointer data); +=20 + #if defined (HAVE_CUPS) +@@ -1480,5 +1480,5 @@ + } +=20 +-void=20 ++gboolean=20 + main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event,= gpointer data) + { +@@ -1487,10 +1487,17 @@ + MainPter *pter =3D (MainPter *)data; + // Only zoom when the CTRL-Button is down... +- if ( !(event->state & GDK_CONTROL_MASK) ) return; +- if ( event->direction =3D=3D GDK_SCROLL_UP ) { +- pter->zoomInActivated (); +- } else if ( event->direction =3D=3D GDK_SCROLL_DOWN ) { +- pter->zoomOutActivated (); +- } +-} +- ++ if ( GDK_CONTROL_MASK =3D=3D (event->state & GDK_CONTROL_MASK) ) ++ { ++ if ( event->direction =3D=3D GDK_SCROLL_UP ) ++ { ++ pter->zoomInActivated (); ++ } ++ else if ( event->direction =3D=3D GDK_SCROLL_DOWN ) ++ { ++ pter->zoomOutActivated (); ++ } ++ return TRUE; ++ } ++ return FALSE; ++} ++ +Index: /trunk/src/gtk/PageView.cxx +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- /trunk/src/gtk/PageView.cxx (revision 325) ++++ /trunk/src/gtk/PageView.cxx (revision 329) +@@ -528,11 +528,4 @@ + g_assert ( NULL !=3D data && "The data parameter is NULL."); +=20 +- // 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 M= ainView +- // class. +- if ( event->state & GDK_CONTROL_MASK ) +- { +- return FALSE; +- } + PagePter *pter =3D (PagePter *)data; + GtkAdjustment *adjustment =3D=20