rpms/gsynaptics/devel .cvsignore, 1.9, 1.10 gsynaptics-0.9.14-scrollmethods.patch, 1.1, 1.2 gsynaptics.spec, 1.22, 1.23 sources, 1.9, 1.10
Peter Hutterer
whot at fedoraproject.org
Thu Apr 2 01:54:06 UTC 2009
Author: whot
Update of /cvs/pkgs/rpms/gsynaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17978
Modified Files:
.cvsignore gsynaptics-0.9.14-scrollmethods.patch
gsynaptics.spec sources
Log Message:
* Thu Apr 02 2009 Peter Hutterer <peter.hutterer at redhat.com> - 0.9.16-1
- rebase to 0.9.16
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gsynaptics/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 27 Jul 2008 00:30:51 -0000 1.9
+++ .cvsignore 2 Apr 2009 01:53:34 -0000 1.10
@@ -1,2 +1,2 @@
-gsynaptics-0.9.14.tar.gz
gsynaptics-touchpad.png
+gsynaptics-0.9.16.tar.gz
gsynaptics-0.9.14-scrollmethods.patch:
Index: gsynaptics-0.9.14-scrollmethods.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gsynaptics/devel/gsynaptics-0.9.14-scrollmethods.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gsynaptics-0.9.14-scrollmethods.patch 2 Apr 2009 00:34:30 -0000 1.1
+++ gsynaptics-0.9.14-scrollmethods.patch 2 Apr 2009 01:53:34 -0000 1.2
@@ -1,18 +1,18 @@
-From ed0ff114f059eab1c18e354b665fe858b5022301 Mon Sep 17 00:00:00 2001
+From 7c958b0d8ae28ad980036849ffdf7def56b6e072 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Wed, 1 Apr 2009 13:39:12 +1000
-Subject: [PATCH] Add radiobuttons for twofinger/edge scrolling
+Date: Thu, 2 Apr 2009 11:33:30 +1000
+Subject: [PATCH] foo
---
- data/gsynaptics.glade | 74 +++++++++++++++++++++++++++++++++++++++-------
+ data/gsynaptics.glade | 71 +++++++++++++++++++++++++++++++++++++++-----
src/gsynaptics-conf.h | 2 +-
src/gsynaptics.c | 78 ++++++++++++++++++++++++++++++++++++++++--------
src/gsynaptics.h | 12 +++++--
src/main.c | 54 ++++++++++++++++++++++++---------
- 5 files changed, 176 insertions(+), 44 deletions(-)
+ 5 files changed, 176 insertions(+), 41 deletions(-)
diff --git a/data/gsynaptics.glade b/data/gsynaptics.glade
-index c3fa58d..b8a7a13 100644
+index c3fa58d..8e09d99 100644
--- a/data/gsynaptics.glade
+++ b/data/gsynaptics.glade
@@ -558,16 +558,69 @@
@@ -95,10 +95,10 @@
<packing>
<property name="padding">0</property>
diff --git a/src/gsynaptics-conf.h b/src/gsynaptics-conf.h
-index 8dc788b..df58daf 100644
+index f8c8bcc..8e903a4 100644
--- a/src/gsynaptics-conf.h
+++ b/src/gsynaptics-conf.h
-@@ -29,7 +29,7 @@ G_BEGIN_DECLS
+@@ -30,7 +30,7 @@ G_BEGIN_DECLS
#define MAXTAPTIME_KEY "/desktop/gnome/peripherals/touchpad/max_tap_time"
#define HORIZSCROLLDELTA_KEY "/desktop/gnome/peripherals/touchpad/horiz_scroll_delta"
#define VERTSCROLLDELTA_KEY "/desktop/gnome/peripherals/touchpad/vert_scroll_delta"
@@ -108,7 +108,7 @@
#define EDGEMOTIONUSEALWAYS_KEY "/desktop/gnome/peripherals/touchpad/edge_motion_use_always"
#define COASTENABLE_KEY "/desktop/gnome/peripherals/touchpad/coast_enable"
diff --git a/src/gsynaptics.c b/src/gsynaptics.c
-index 6f9b6a3..93706f5 100644
+index 6f9b6a3..1e294a2 100644
--- a/src/gsynaptics.c
+++ b/src/gsynaptics.c
@@ -299,11 +299,13 @@ g_synaptics_is_horizontal_scroll_enabled (GSynaptics *synaptics)
@@ -253,7 +253,7 @@
void
diff --git a/src/gsynaptics.h b/src/gsynaptics.h
-index 8fced65..30bb3af 100644
+index 8fced65..ec9350c 100644
--- a/src/gsynaptics.h
+++ b/src/gsynaptics.h
@@ -58,6 +58,12 @@ typedef enum
@@ -290,7 +290,7 @@
gint delta);
void g_synaptics_set_vertical_scroll_delta (GSynaptics *synaptics,
diff --git a/src/main.c b/src/main.c
-index c7089f3..fbbb19b 100644
+index cea688e..93e00cd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -131,20 +131,30 @@ cb_touchpad_toggled (GtkToggleButton *button, GladeXML *dialog)
@@ -332,7 +332,7 @@
}
static void
-@@ -517,7 +527,7 @@ setup_dialog (GladeXML *dialog)
+@@ -518,7 +528,7 @@ setup_dialog (GladeXML *dialog)
{
GdkPixbuf *icon_pixbuf = NULL;
GtkWidget *widget, *button;
@@ -341,13 +341,13 @@
GSynaptics *synaptics;
gchar *path;
-@@ -571,12 +581,25 @@ setup_dialog (GladeXML *dialog)
- g_signal_connect (G_OBJECT (scale), "change-value",
+@@ -572,12 +582,25 @@ setup_dialog (GladeXML *dialog)
+ g_signal_connect (scale, "change-value",
G_CALLBACK (cb_vertical_scroll_change), dialog);
- check = WID ("vertical_scroll_check");
- value = g_synaptics_is_vertical_scroll_enabled (synaptics);
-- g_signal_connect (G_OBJECT (check), "toggled",
+- g_signal_connect (check, "toggled",
- G_CALLBACK (cb_vertical_scroll_toggled), dialog);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
- value);
@@ -373,13 +373,13 @@
scale = WID ("horizontal_scroll_scale");
num = g_synaptics_horizontal_scroll_delta (synaptics);
-@@ -585,6 +608,7 @@ setup_dialog (GladeXML *dialog)
+@@ -586,6 +609,7 @@ setup_dialog (GladeXML *dialog)
G_CALLBACK (cb_horizontal_scroll_change), dialog);
check = WID ("horizontal_scroll_check");
+ gtk_widget_set_sensitive(check, (value != ScrollingDisabled));
value = g_synaptics_is_horizontal_scroll_enabled (synaptics);
- g_signal_connect (G_OBJECT (check), "toggled",
+ g_signal_connect (check, "toggled",
G_CALLBACK (cb_horizontal_scroll_toggled), dialog);
--
1.6.0.6
Index: gsynaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsynaptics/devel/gsynaptics.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gsynaptics.spec 2 Apr 2009 01:19:21 -0000 1.22
+++ gsynaptics.spec 2 Apr 2009 01:53:34 -0000 1.23
@@ -1,6 +1,6 @@
Name: gsynaptics
-Version: 0.9.14
-Release: 6%{?dist}
+Version: 0.9.16
+Release: 1%{?dist}
Summary: Settings tool for Synaptics touchpad driver
Group: Applications/System
@@ -11,11 +11,6 @@
# until http://sourceforge.jp/tracker/index.php?func=detail&aid=11265&group_id=1720&atid=6433 gets fixed
Patch0: gsynaptics-0.9.14-dot-fixes.patch
Patch1: gsynaptics-0.9.14-do-not-set-zero.patch
-Patch2: gsynaptics-0.9.14-pixmap.patch
-# 3 4 5 are merged upstream
-Patch3: gsynaptics-0.9.14-fix-tap-statecheck.patch
-Patch4: gsynaptics-0.9.14-enable-tapping.patch
-Patch5: gsynaptics-0.9.14-dont-reset-taptime.patch
Patch6: gsynaptics-0.9.14-scrolling-checkboxes.patch
Patch7: gsynaptics-0.9.14-driver-header.patch
Patch8: gsynaptics-0.9.14-fix-scrolling-checkboxes.patch
@@ -53,10 +48,6 @@
install -p %{SOURCE1} data/touchpad.png
%patch0 -p1 -b .dot-fixes
%patch1 -p1 -b .zero
-%patch2 -p1 -b .pixmap
-%patch3 -p1 -b .tap-checkbox
-%patch4 -p1 -b .tapping
-%patch5 -p1 -b .taptime
%patch6 -p1 -b .scrl-chkbx
%patch7 -p1 -b .header
%patch8 -p1 -b .scrl-chkbx-fix
@@ -105,6 +96,9 @@
%changelog
+* Thu Apr 02 2009 Peter Hutterer <peter.hutterer at redhat.com> - 0.9.16-1
+- rebase to 0.9.16
+
* Thu Apr 02 2009 Peter Hutterer <peter.hutterer at redhat.com> - 0.9.14-6
- gsynaptics-0.9.14-tapping-gconf.patch: set a gconf key when tapping is
enabled or disabled.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gsynaptics/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 27 Jul 2008 00:30:51 -0000 1.9
+++ sources 2 Apr 2009 01:53:34 -0000 1.10
@@ -1,2 +1,2 @@
-5cf556b26085444288f087587a92484c gsynaptics-0.9.14.tar.gz
d2fc5db12827fc363f655daebca46e8e gsynaptics-touchpad.png
+571828ddca2f1d9d6ea47e072db1959d gsynaptics-0.9.16.tar.gz
More information about the scm-commits
mailing list