rpms/planner/devel planner-gnome604355-scrolling.patch, NONE, 1.1 planner.spec, 1.72, 1.73

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/planner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6669/devel

Modified Files:
	planner.spec 
Added Files:
	planner-gnome604355-scrolling.patch 
Log Message:
Resolves: rhbz#546515 allow scrolling

planner-gnome604355-scrolling.patch:
 planner-gantt-view.c |    8 ++++++--
 planner-usage-view.c |    6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE planner-gnome604355-scrolling.patch ---
diff -ru planner-0.14.4.orig/src/planner-gantt-view.c planner-0.14.4/src/planner-gantt-view.c
--- planner-0.14.4.orig/src/planner-gantt-view.c	2008-08-02 21:00:12.000000000 +0100
+++ planner-0.14.4/src/planner-gantt-view.c	2009-12-11 10:21:01.000000000 +0000
@@ -201,19 +201,23 @@
 static gboolean
 gantt_view_chart_scroll_event (GtkWidget * gki, GdkEventScroll * event, PlannerGanttView *view)
 {
+	gboolean dontpropogate = FALSE;
+
 	gboolean can_in, can_out;
 	PlannerGanttViewPriv *priv;
-	
+
 	if (event->state & GDK_CONTROL_MASK) {
 		priv = view->priv;
 		planner_gantt_chart_can_zoom (PLANNER_GANTT_CHART (priv->gantt), &can_in, &can_out);
 		switch (event->direction) {
       			case GDK_SCROLL_UP: {
+      				dontpropogate = TRUE;
 				if (can_in)
 					gantt_view_zoom_in_cb  (NULL, view);
 	        		break;
 			}
 			case GDK_SCROLL_DOWN:
+      				dontpropogate = TRUE;
 				if (can_out)
 					gantt_view_zoom_out_cb  (NULL, view);
 			        break;
@@ -222,7 +226,7 @@
 		}
     	}
 
-	return TRUE;
+	return dontpropogate;
 }
 
 static void
diff -ru planner-0.14.4.orig/src/planner-usage-view.c planner-0.14.4/src/planner-usage-view.c
--- planner-0.14.4.orig/src/planner-usage-view.c	2008-08-02 20:56:19.000000000 +0100
+++ planner-0.14.4/src/planner-usage-view.c	2009-12-11 10:22:01.000000000 +0000
@@ -122,6 +122,8 @@
 static gboolean
 usage_view_chart_scroll_event (GtkWidget * gki, GdkEventScroll * event, PlannerView *view)
 {
+	gboolean dontpropogate = FALSE;
+
 	gboolean can_in, can_out;
 	PlannerUsageViewPriv *priv;
 	
@@ -130,11 +132,13 @@
 		planner_usage_chart_can_zoom (priv->chart, &can_in, &can_out);
 		switch (event->direction) {
       			case GDK_SCROLL_UP: {
+				dontpropogate = TRUE;
 				if (can_in)
 					usage_view_zoom_in_cb  (NULL, view);
 	        		break;
 			}
 			case GDK_SCROLL_DOWN:
+				dontpropogate = TRUE;
 				if (can_out)
 					usage_view_zoom_out_cb  (NULL, view);
 			        break;
@@ -143,7 +147,7 @@
 		}
     	}
 
-	return TRUE;
+	return dontpropogate;
 }
 
 


Index: planner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/planner/devel/planner.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- planner.spec	9 Dec 2009 12:36:21 -0000	1.72
+++ planner.spec	11 Dec 2009 10:34:31 -0000	1.73
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.4
-Release:   7%{?dist}
+Release:   8%{?dist}
 License:   GPLv2+
 Group:     Applications/Productivity
 URL:       http://live.gnome.org/Planner
@@ -25,6 +25,7 @@ Patch3: planner-gnome550559-fitzoom.patc
 Patch4: planner-buildfix.patch
 Patch5: planner-gnome603693-planner-calendar-for-edittask.patch
 Patch6: planner-gnome604169-comboboxentry.patch
+Patch7: planner-gnome604355-scrolling.patch
 
 %description
 Planner is a visual project management application which allows users to
@@ -61,6 +62,7 @@ This package provides a plugin to integr
 %patch4 -p1 -b .buildfix
 %patch5 -p1 -b .edittask
 %patch6 -p1 -b .combobox
+%patch7 -p1 -b .scrolling
 
 %build
 rm -rf libegg
@@ -159,6 +161,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Dec 11 2009 Caolán McNamara <caolanm at redhat.com> - 0.14.4-8
+- Resolves: rhbz#546515 allow scrolling
+
 * Wed Dec 09 2009 Caolán McNamara <caolanm at redhat.com> - 0.14.4-7
 - Resolves: rhbz#545711 use GtkComboBoxEntry instead of GtkCombo