- Fix color sliders with recent GTK (#467431)

This commit is contained in:
Lubomir Rintel 2008-10-17 16:44:59 +00:00
parent f227316bdf
commit 9af88a9706
2 changed files with 28 additions and 1 deletions

View File

@ -0,0 +1,22 @@
Fix the color slider with a recent GTK, to fix #467431 [1], patch from
upstream #19816 [2].
[1] https://bugzilla.redhat.com/show_bug.cgi?id=467431
[2] http://inkscape.svn.sourceforge.net/viewvc/inkscape/inkscape/trunk/src/widgets/sp-color-slider.cpp?r1=16358&r2=19816
--- inkscape/trunk/src/widgets/sp-color-slider.cpp 2007/10/30 06:16:09 16358
+++ inkscape/trunk/src/widgets/sp-color-slider.cpp 2008/09/08 07:52:36 19816
@@ -330,8 +330,11 @@
g_return_if_fail (SP_IS_COLOR_SLIDER (slider));
if (!adjustment) {
- adjustment = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 1.0, 0.01, 0.1, 0.1);
- }
+ adjustment = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 1.0, 0.01, 0.0, 0.0);
+ } else {
+ gtk_adjustment_set_page_increment(adjustment, 0.0);
+ gtk_adjustment_set_page_size(adjustment, 0.0);
+ }
if (slider->adjustment != adjustment) {
if (slider->adjustment) {

View File

@ -1,6 +1,6 @@
Name: inkscape Name: inkscape
Version: 0.46 Version: 0.46
Release: 5%{?dist} Release: 6%{?dist}
Summary: Vector-based drawing program using SVG Summary: Vector-based drawing program using SVG
Group: Applications/Productivity Group: Applications/Productivity
@ -15,6 +15,7 @@ Patch4: inkscape-0.46-gtkopen.patch
Patch5: inkscape-0.46-gtk2.13.3.patch Patch5: inkscape-0.46-gtk2.13.3.patch
Patch6: inkscape-0.46-poppler-0.8.3.patch Patch6: inkscape-0.46-poppler-0.8.3.patch
Patch7: inkscape-0.46-uniconv.patch Patch7: inkscape-0.46-uniconv.patch
Patch8: inkscape-0.46-colors.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -83,6 +84,7 @@ C and C++, using the Gtk+ toolkit and optionally some Gnome libraries.
%patch5 -p1 -b .gtk2.13.3 %patch5 -p1 -b .gtk2.13.3
%patch6 -p1 -b .poppler-0.8.3 %patch6 -p1 -b .poppler-0.8.3
%patch7 -p1 -b .uniconv %patch7 -p1 -b .uniconv
%patch8 -p2 -b .colors
find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';' find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';' find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
dos2unix -k -q share/extensions/*.py dos2unix -k -q share/extensions/*.py
@ -142,6 +144,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog %changelog
* Fri Oct 17 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.46-6
- Fix color sliders with recent GTK (#467431)
* Wed Aug 13 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.46-5 * Wed Aug 13 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.46-5
- Rediff patches for zero fuzz - Rediff patches for zero fuzz
- Use uniconvertor to handle CDR and WMF (#458845) - Use uniconvertor to handle CDR and WMF (#458845)