Ubuntu
gnome-settings-daemon package

Merge lp:~rodrigo-moya/ubuntu/natty/gnome-settings-daemon/fix_685785 into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

  1. Natty (11.04)
  2. fix_685785
  3. Merge into ubuntu
Proposed by Rodrigo Moya
Status: Merged
Merged at revision: 129
Proposed branch: lp:~rodrigo-moya/ubuntu/natty/gnome-settings-daemon/fix_685785
Merge into: lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/patches/06_use_application_indicator.patch (+1/-1)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntu/natty/gnome-settings-daemon/fix_685785
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+46620@code.launchpad.net
To post a comment you must log in.

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-10 21:27:56 +0000
3+++ debian/changelog 2011-01-18 15:28:36 +0000
4@@ -1,3 +1,10 @@
5+gnome-settings-daemon (2.32.1-0ubuntu5) UNRELEASED; urgency=low
6+
7+ * debian/patches/06_use_application_indicator.patch:
8+ - Initialize variable to avoid crashes on free (LP: #685785)
9+
10+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Tue, 18 Jan 2011 16:23:55 +0100
11+
12 gnome-settings-daemon (2.32.1-0ubuntu4) natty; urgency=low
13
14 * debian/control.in: build-depends on libpolkit-gobject-1-dev
15
16=== modified file 'debian/patches/06_use_application_indicator.patch'
17--- debian/patches/06_use_application_indicator.patch 2010-12-20 23:26:35 +0000
18+++ debian/patches/06_use_application_indicator.patch 2011-01-18 15:28:36 +0000
19@@ -794,7 +794,7 @@
20 + gchar * guide = "XXX";
21 + gchar ** shortnames;
22 + gchar ** longnames;
23-+ gchar * layout_name;
24++ gchar * layout_name = NULL;
25 + gchar * lname = NULL;
26 + GHashTable *ln2cnt_map = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, NULL);
27 +

Subscribers

People subscribed via source and target branches

to all changes: