rpms/jd/FC-5 jd-1.8.5-rc070121-mouse-one-click.patch, NONE, 1.1 jd.spec, 1.17, 1.18

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20766

Modified Files:
	jd.spec 
Added Files:
	jd-1.8.5-rc070121-mouse-one-click.patch 
Log Message:
* Sun Jan 21 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.3.rc071121.dist.1
- Patch for one click behavior problem


jd-1.8.5-rc070121-mouse-one-click.patch:

--- NEW FILE jd-1.8.5-rc070121-mouse-one-click.patch ---
--- jd-1.8.5-rc070121/src/config/buttonconfig.cpp	2007-01-18 20:46:27.000000000 +0900
+++ jd-build/src/config/buttonconfig.cpp	2007-01-24 01:04:58.000000000 +0900
@@ -174,12 +174,14 @@
 // タブで開くボタンを入れ替える
 void ButtonConfig::toggle_tab_button()
 {
+    bool tab = tab_midbutton();
+
     remove_items( CONTROL::OpenBoardButton );
     remove_items( CONTROL::OpenBoardTabButton );
     remove_items( CONTROL::OpenArticleButton );
     remove_items( CONTROL::OpenArticleTabButton );
 
-    if( tab_midbutton() ){
+    if( tab ){
 
         set_one_motion( "OpenBoardButton", "Mid" );
         set_one_motion( "OpenBoardTabButton", "Left" );
@@ -207,8 +209,10 @@
 // ポップアップ表示の時にクリックでワープする
 void ButtonConfig::toggle_popup_warpmode()
 {
+    bool warp = is_popup_warpmode();
+
     remove_items( CONTROL::PopupWarpButton );
 
-    if( is_popup_warpmode() ) set_one_motion( "PopupWarpButton", "" );
+    if( warp ) set_one_motion( "PopupWarpButton", "" );
     else set_one_motion( "PopupWarpButton", "Left" );
 }


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jd.spec	21 Jan 2007 14:32:05 -0000	1.17
+++ jd.spec	23 Jan 2007 16:25:45 -0000	1.18
@@ -27,7 +27,7 @@
 %define         pre_release   1
 
 %if %{pre_release}
-%define         rel           0.%{vendor_rel}.%{strtag}%{?dist}
+%define         rel           0.%{vendor_rel}.%{strtag}%{?dist}.1
 %else
 %define         rel           %{vendor_rel}%{?dist}
 %endif
@@ -45,6 +45,7 @@
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Patch0:		jd-1.8.5-rc070121-mouse-one-click.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -60,6 +61,7 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+%patch0 -p1 -b .one_click
 find . -name CVS | sort -r | xargs %{__rm} -rf
 
 %build
@@ -106,6 +108,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Jan 21 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.3.rc071121.dist.1
+- Patch for one click behavior problem
+
 * Sun Jan 21 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.3.rc071121
 - 1.8.5 rc 071121