[jd/f13/master] - Patch to fix segfault with icon settings (rev 3818)

[Mamoru Tasaka]

commit cfde857729cf2b3bd02836c3dd42b0e3e6dccc3c
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Thu Jan 20 02:06:36 2011 +0900

    - Patch to fix segfault with icon settings (rev 3818)

 jd-rev3818-icon-settings.patch |   13 +++++++++++++
 jd.spec                        |    8 +++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/jd-rev3818-icon-settings.patch b/jd-rev3818-icon-settings.patch
new file mode 100644
index 0000000..9e7695f
--- /dev/null
+++ b/jd-rev3818-icon-settings.patch
@@ -0,0 +1,13 @@
+Index: src/skeleton/tablabel.cpp
+===================================================================
+--- src/skeleton/tablabel.cpp	(revision 3817)
++++ src/skeleton/tablabel.cpp	(revision 3818)
+@@ -135,7 +135,7 @@
+             + m_hbox.get_spacing() + m_hbox.get_border_width()*2
+             + get_border_width()*2;
+ 
+-        if( ICON::get_icon( m_id_icon ) ) label_margin += ICON::get_icon( m_id_icon )->get_width();
++        if( CONFIG::get_show_tab_icon() && m_id_icon < ICON::NUM_ICONS ) label_margin += ICON::get_icon( m_id_icon )->get_width();
+     }
+ 
+ #ifdef _DEBUG
diff --git a/jd.spec b/jd.spec
index 3662ff5..65658b0 100644
--- a/jd.spec
+++ b/jd.spec
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    3
+%define         vendor_rel    4
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -52,6 +52,8 @@ URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 Patch0:         jd-2.6.0-rc100130-env-pkg-distro-specific.patch
+# http://hibari.2ch.net/test/read.cgi/linux/1276299375/786
+Patch10:        jd-rev3818-icon-settings.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -83,6 +85,7 @@ JD is a 2ch browser based on gtkmm2.
 if ( uname -n | grep -q 'fedoraproject\.org' ) ; then
 %patch0 -p1 -b .env_fedora
 fi
+%patch10 -p0 -b .rev3818
 
 sh autogen.sh
 
@@ -141,6 +144,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{icondir}/%{name}.png
 
 %changelog
+* Thu Jan 20 2011 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.8.0-0.4.beta110118
+- Patch to fix segfault with icon settings (rev 3818)
+
 * Tue Jan 18 2011 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.8.0-0.3.beta110118
 - 2.8.0 beta 110118