Merge lp:~compiz-team/compiz-libcompizconfig/compiz-libcompizconfig.fix_872922 into lp:compiz-libcompizconfig

Proposed by Sam Spilsbury on 2011-10-12
Status: Merged
Merged at revision: 427
Proposed branch: lp:~compiz-team/compiz-libcompizconfig/compiz-libcompizconfig.fix_872922
Merge into: lp:compiz-libcompizconfig
Diff against target: 13 lines (+1/-1)
1 file modified
src/main.c (+1/-1)
To merge this branch: bzr merge lp:~compiz-team/compiz-libcompizconfig/compiz-libcompizconfig.fix_872922
Reviewer Review Type Date Requested Status
Tim Penhey (community) 2011-10-12 Approve on 2011-11-08
Review via email: mp+79156@code.launchpad.net

Description of the change

To post a comment you must log in.
Tim Penhey (thumper) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/main.c'
2--- src/main.c 2011-09-15 13:12:45 +0000
3+++ src/main.c 2011-10-12 17:12:10 +0000
4@@ -2467,8 +2467,8 @@
5 {
6 if (!conflict)
7 {
8+ conflict = calloc (1, sizeof (CCSPluginConflict));
9 conflict->refCount = 1;
10- conflict = calloc (1, sizeof (CCSPluginConflict));
11 if (conflict)
12 {
13 conflict->value = strdup (plugin->name);

Subscribers

People subscribed via source and target branches

to all changes: