[Pkg-cli-apps-commits] [SCM] f-spot branch, master-experimental, updated. debian/0.7.3-1-5-ga74b728

[Iain Lane]

The following commit has been merged in the master-experimental branch:
commit 6d29af4ae9a2c20cd7ba455d3206ca91778712a7
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed Sep 15 19:24:18 2010 +0100

    Don't crash with empty databases.
    
    Add patch taken from upstream commit 9054153b3b40 to fix crash when
    the database is empty.

diff --git a/debian/patches/series b/debian/patches/series
index 1edd940..d022e24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ ubuntu_xdg-photo-dir.patch
 #ubuntu_clear_selection_on_crop.patch
 #ubuntu_only_update_timestamp_of_unprotected_versions.patch
 #ubuntu_handle_broken_uris_to_view_mode.patch
+upstream_fix_empty_database_crash
diff --git a/debian/patches/upstream_fix_empty_database_crash b/debian/patches/upstream_fix_empty_database_crash
new file mode 100644
index 0000000..e8eaa6b
--- /dev/null
+++ b/debian/patches/upstream_fix_empty_database_crash
@@ -0,0 +1,13 @@
+Index: f-spot.git/src/Clients/MainApp/FSpot/App.cs
+===================================================================
+--- f-spot.git.orig/src/Clients/MainApp/FSpot/App.cs	2010-09-15 19:21:06.978891732 +0100
++++ f-spot.git/src/Clients/MainApp/FSpot/App.cs	2010-09-15 19:21:26.041679597 +0100
+@@ -223,7 +223,7 @@
+         {
+             // Some users get wonky URIs here, trying to work around below.
+             // https://bugzilla.gnome.org/show_bug.cgi?id=629248
+-            if (path.StartsWith ("gphoto2:usb:")) {
++            if (path != null && path.StartsWith ("gphoto2:usb:")) {
+                 path = String.Format ("gphoto2://[{0}]", path.Substring (8));
+             }
+ 

-- 
f-spot