Ubuntu
nautilus package

Merge lp:~rodrigo-moya/ubuntu/natty/nautilus/fix-718098 into lp:~ubuntu-desktop/nautilus/ubuntu

  1. Natty (11.04)
  2. fix-718098
  3. Merge into ubuntu
Proposed by Rodrigo Moya
Status: Merged
Merged at revision: 119
Proposed branch: lp:~rodrigo-moya/ubuntu/natty/nautilus/fix-718098
Merge into: lp:~ubuntu-desktop/nautilus/ubuntu
Diff against target: 42 lines (+21/-1)
3 files modified
debian/changelog (+7/-0)
debian/patches/96_no-null-in-g-str-hash.patch (+13/-0)
debian/patches/series (+1/-1)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntu/natty/nautilus/fix-718098
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+50734@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Looks fine, thanks! Please forward/commit it upstream as well, though.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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+nautilus (1:2.32.2.1-0ubuntu6) UNRELEASED; urgency=low
6+
7+ * debian/patches/96_no-null-in-g-str-hash.patch:
8+ - Added patch to avoid crashing on g_str_hash (LP: #718098)
9+
10+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Tue, 22 Feb 2011 13:27:37 +0100
11+
12 nautilus (1:2.32.2.1-0ubuntu5) natty; urgency=low
13
14 * 04_additional_marge_for_unity.patch:
15
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+diff --git a/libnautilus-private/nautilus-icon-info.c b/libnautilus-private/nautilus-icon-info.c
21+index f39ad42..e23413e 100644
22+--- a/libnautilus-private/nautilus-icon-info.c
23++++ b/libnautilus-private/nautilus-icon-info.c
24+@@ -293,7 +293,7 @@ loadable_icon_key_free (LoadableIconKey *key)
25+ static guint
26+ themed_icon_key_hash (ThemedIconKey *key)
27+ {
28+- return g_str_hash (key->filename) ^ key->size;
29++ return g_str_hash (key->filename ? key->filename : "") ^ key->size;
30+ }
31+
32+ static gboolean
33
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 90_git_audio_preview_url.patch
39 #91_correct_rgba_use.patch
40 95_no-initial-fade.patch
41-
42+96_no-null-in-g-str-hash.patch

Subscribers

People subscribed via source and target branches

to all changes: