Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 66229 Details for
Bug 45095
F-Spot - Personal Photo Manager
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
First patch: f-spot-0.0.13-corruption.patch
f-spot-0.0.13-corruption.patch (text/plain), 2.23 KB, created by
pjv
on 2005-08-18 06:38:46 UTC
(
hide
)
Description:
First patch: f-spot-0.0.13-corruption.patch
Filename:
MIME Type:
Creator:
pjv
Created:
2005-08-18 06:38:46 UTC
Size:
2.23 KB
patch
obsolete
>Index: src/PhotoStore.cs >=================================================================== >RCS file: /cvs/gnome/f-spot/src/PhotoStore.cs,v >retrieving revision 1.58 >diff -u -r1.58 PhotoStore.cs >--- src/PhotoStore.cs 20 Feb 2005 06:41:28 -0000 1.58 >+++ src/PhotoStore.cs 23 Mar 2005 11:16:41 -0000 >@@ -585,9 +585,14 @@ > while (reader.Read ()) { > uint tag_id = Convert.ToUInt32 (reader [0]); > Tag tag = tag_store.Get (tag_id) as Tag; >- photo.AddTagUnsafely (tag); >+ if(tag == null) { >+ Console.Error.WriteLine(String.Format( >+ "Photo {0} has invalid tag {1} in database", >+ photo.Path, tag_id)); >+ } >+ photo.AddTag (tag); > } >- >+ > command.Dispose (); > } > >@@ -644,10 +649,16 @@ > continue; > } > >- if (reader [1] != null) { >+ if (reader [1] != null) { > uint tag_id = Convert.ToUInt32 (reader [1]); > Tag tag = tag_store.Get (tag_id) as Tag; >- photo.AddTagUnsafely (tag); >+ if(tag == null) { >+ Console.Error.WriteLine(String.Format( >+ "Photo {0} has invalid tag {1} in database", >+ photo.Path, tag_id)); >+ continue; >+ } >+ photo.AddTag (tag); > } > } > } >@@ -675,10 +686,16 @@ > continue; > } > >- if (reader [1] != null) { >+ if (reader [1] != null) { > uint tag_id = Convert.ToUInt32 (reader [1]); > Tag tag = tag_store.Get (tag_id) as Tag; >- photo.AddTagUnsafely (tag); >+ if(tag == null) { >+ Console.Error.WriteLine(String.Format( >+ "Photo {0} has invalid tag {1} in database", >+ photo.Path, tag_id)); >+ } else { >+ photo.AddTag (tag); >+ } > } > if (reader [2] != null) { > uint version_id = Convert.ToUInt32 (reader [2]); >@@ -701,10 +718,16 @@ > SqliteDataReader reader = command.ExecuteReader (); > > while (reader.Read ()) { >- if (reader [0] != null) { >+ if (reader [0] != null) { > uint tag_id = Convert.ToUInt32 (reader [0]); > Tag tag = tag_store.Get (tag_id) as Tag; >- photo.AddTagUnsafely (tag); >+ if(tag == null) { >+ Console.Error.WriteLine(String.Format( >+ "Photo {0} has invalid tag {1} in database", >+ photo.Path, tag_id)); >+ } else { >+ photo.AddTag (tag); >+ } > } > if (reader [1] != null) { > uint version_id = Convert.ToUInt32 (reader [1]);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 45095
:
52050
|
53303
|
54330
|
60220
|
66020
|
66050
|
66051
|
66076
|
66077
|
66090
|
66228
| 66229 |
66230
|
66375
|
67161
|
67168
|
69548
|
70163