rpms/gthumb/devel gthumb-import-dir.patch, NONE, 1.1 gthumb.spec, 1.99, 1.100

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gthumb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9289

Modified Files:
	gthumb.spec 
Added Files:
	gthumb-import-dir.patch 
Log Message:
fix import location


gthumb-import-dir.patch:

--- NEW FILE gthumb-import-dir.patch ---
--- gthumb-2.10.11/src/dlg-photo-importer.c	2009-02-24 05:18:11.000000000 -0500
+++ hacked/src/dlg-photo-importer.c	2009-03-27 23:32:03.820303933 -0400
@@ -2051,8 +2051,12 @@
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->reset_exif_tag_on_import_checkbutton), eel_gconf_get_boolean (PREF_PHOTO_IMPORT_RESET_EXIF_ORIENTATION, TRUE));
 
 	default_path = eel_gconf_get_path (PREF_PHOTO_IMPORT_DESTINATION, NULL);
-	if ((default_path == NULL) || (*default_path == 0))
-		default_path = xdg_user_dir_lookup ("PICTURES");
+	if ((default_path == NULL) || (*default_path == 0)) {
+		char *pictures_dir;
+		pictures_dir = xdg_user_dir_lookup ("PICTURES");
+		default_path = g_strconcat ("file://", pictures_dir, NULL);
+		free (pictures_dir);
+	}
 	
 	gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (data->destination_filechooserbutton),
 					         default_path);


Index: gthumb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- gthumb.spec	27 Feb 2009 06:08:34 -0000	1.99
+++ gthumb.spec	28 Mar 2009 03:42:04 -0000	1.100
@@ -11,14 +11,14 @@
 Summary: Image viewer, editor, organizer
 Name: gthumb
 Version: 2.10.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: http://download.gnome.org/sources/gthumb/2.10/%{name}-%{version}.tar.bz2
 Source1: gthumb-importer
 Source2: gthumb-importer.desktop
 License: GPLv2+
 Group: User Interface/X
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -55,6 +55,8 @@
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
 
 Patch0: gthumb-libdir.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=577042
+Patch1: gthumb-import-dir.patch
 
 %description
 gthumb is an application for viewing, editing, and organizing
@@ -63,6 +65,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .libdir
+%patch1 -p1 -b .import-dir
 
 autoreconf -i -f
 
@@ -138,6 +141,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Fri Mar 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.10.11-2
+- Fix the photo import location (#492179)
+
 * Fri Feb 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.10.11-1
 - Update to 2.10.11
 
@@ -154,7 +160,7 @@
 - Update to 2.10.10
 
 * Tue Aug  5 2008 Matthias Clasen  <mclasen at redhat.com> - 2.10.9-1
-- Update to 2.10.9 
+- Update to 2.10.9
 
 * Fri Jul 18 2008 Matthias Clasen  <mclasen at redhat.com> - 2.10.8-4
 - Try to fix a crash (#453181)