1
=== modified file 'debian/changelog'
2
--- debian/changelog	2011-01-16 11:39:50 +0000
3
+++ debian/changelog	2011-02-22 12:42:02 +0000
4
@@ -1,3 +1,10 @@
5
1
nautilus (1:2.32.2.1-0ubuntu6) UNRELEASED; urgency=low
6
2
7
3
  * debian/patches/96_no-null-in-g-str-hash.patch:
8
4
    - Added patch to avoid crashing on g_str_hash (LP: #718098)
9
5
10
6
 -- Rodrigo Moya <rodrigo.moya@canonical.com>  Tue, 22 Feb 2011 13:27:37 +0100
11
7
12
1
nautilus (1:2.32.2.1-0ubuntu5) natty; urgency=low
8
nautilus (1:2.32.2.1-0ubuntu5) natty; urgency=low
13
2
9
14
3
  * 04_additional_marge_for_unity.patch:
10
  * 04_additional_marge_for_unity.patch:
15
4
11
16
=== added file 'debian/patches/96_no-null-in-g-str-hash.patch'
17
--- debian/patches/96_no-null-in-g-str-hash.patch	1970-01-01 00:00:00 +0000
18
+++ debian/patches/96_no-null-in-g-str-hash.patch	2011-02-22 12:42:02 +0000
19
@@ -0,0 +1,13 @@
20
1
diff --git a/libnautilus-private/nautilus-icon-info.c b/libnautilus-private/nautilus-icon-info.c
21
2
index f39ad42..e23413e 100644
22
3
--- a/libnautilus-private/nautilus-icon-info.c
23
4
+++ b/libnautilus-private/nautilus-icon-info.c
24
5
@@ -293,7 +293,7 @@ loadable_icon_key_free (LoadableIconKey *key)
25
6
 static guint
26
7
 themed_icon_key_hash (ThemedIconKey *key)
27
8
 {
28
9
-	return g_str_hash (key->filename) ^ key->size;
29
10
+	return g_str_hash (key->filename ? key->filename : "") ^ key->size;
30
11
 }
31
12
 
32
13
 static gboolean
33
0
14
34
=== modified file 'debian/patches/series'
35
--- debian/patches/series	2011-01-11 16:47:28 +0000
36
+++ debian/patches/series	2011-02-22 12:42:02 +0000
37
@@ -13,4 +13,4 @@
38
13
90_git_audio_preview_url.patch
13
90_git_audio_preview_url.patch
39
14
#91_correct_rgba_use.patch
14
#91_correct_rgba_use.patch
40
15
95_no-initial-fade.patch
15
95_no-initial-fade.patch
42
16
16
96_no-null-in-g-str-hash.patch
Reviewer	Review Type	Date Requested	Status
Martin Pitt		2011-02-22	Approve on 2011-02-22
Review via email: mp+50734@code.launchpad.net