rpms/inkscape/devel inkscape-0.46-gtkopen.patch, NONE, 1.1 inkscape.spec, 1.53, 1.54

[Lubomir Rintel (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7015

Modified Files:
	inkscape.spec 
Added Files:
	inkscape-0.46-gtkopen.patch 
Log Message:
Fix assert fail on useless piece of code

inkscape-0.46-gtkopen.patch:

--- NEW FILE inkscape-0.46-gtkopen.patch ---
------------------------------------------------------------------------
r18721 | buliabyak | 2008-05-24 21:32:40 +0200 (Sat, 24 May 2008) | 1 line

this hack does not seem to be needed with modern gtk, and it prevents remembering of last-browsed directory from working

Index: src/ui/dialog/filedialogimpl-gtkmm.cpp
===================================================================
--- src/ui/dialog/filedialogimpl-gtkmm.cpp	(revision 18720)
+++ src/ui/dialog/filedialogimpl-gtkmm.cpp	(revision 18721)
@@ -761,10 +761,6 @@
 bool
 FileOpenDialogImplGtk::show()
 {
-    Glib::ustring s = Glib::filename_to_utf8 (get_current_folder());
-    if (s.length() == 0)
-        s = getcwd (NULL, 0);
-    set_current_folder(Glib::filename_from_utf8(s)); //hack to force initial dir listing
     set_modal (TRUE);                      //Window
     sp_transientize((GtkWidget *)gobj());  //Make transient
     gint b = run();                        //Dialog


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- inkscape.spec	11 Apr 2008 09:55:23 -0000	1.53
+++ inkscape.spec	26 Jun 2008 08:22:24 -0000	1.54
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.46
-Release:        2%{?dist}.1
+Release:        3%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -11,6 +11,7 @@
 Patch1:         inkscape-0.45.1-desktop.patch
 Patch2:         inkscape-0.46pre2-icons.patch
 Patch3:         inkscape-0.46-fixlatex.patch
+Patch4:         inkscape-0.46-gtkopen.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -74,6 +75,7 @@
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .icons
 %patch3 -p1 -b .fixlatex
+%patch4 -p0 -b .gtkopen
 find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
 find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
 dos2unix -k -q share/extensions/*.py
@@ -133,6 +135,9 @@
 
 
 %changelog
+* Thu Jun 26 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.46-3
+- Remove useless old hack, that triggered an assert after gtkfilechooser switched to gio
+
 * Fri Apr 11 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.46-2.1
 - More buildrequires more flexible, so that this builds on RHEL