~mc-return/compiz/compiz.merge-src-header-files-cleanup

« back to all changes in this revision

Viewing changes to plugins/titleinfo/src/titleinfo.cpp

  • Committer: MC Return
  • Date: 2013-06-20 05:56:13 UTC
  • mfrom: (3724.2.16 0.9.10)
  • Revision ID: mc.return@gmx.net-20130620055613-8dp00nmw2jpm3ptu
Merged latest lp:compiz and fixed conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
138
138
    }
139
139
 
140
140
    if (retval_c)
 
141
    {
141
142
        retval = CompString (retval_c);
 
143
        free (retval_c);
 
144
    }
142
145
 
143
146
    if (val)
144
147
        XFree (val);
173
176
    }
174
177
 
175
178
    if (retval_c)
 
179
    {
176
180
        retval = CompString (retval_c);
 
181
        free (retval_c);
 
182
    }
177
183
 
178
184
    return retval;
179
185
}