← Back to branch summary

~ubuntu-branches/ubuntu/trusty/compiz/trusty

« back to all changes in this revision

Viewing changes to compizconfig/libcompizconfig/src/ccs_settings_upgrade_internal.c

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2013-08-22 06:58:07 UTC
  • mto: This revision was merged to the branch mainline in revision 3352.
  • Revision ID: package-import@ubuntu.com-20130822065807-17nlzez0d30y09so
Tags: upstream-0.9.10+13.10.20130822
Import upstream version 0.9.10+13.10.20130822

Show diffs side-by-side

added added

removed removed

Lines of Context:
compizconfig/libcompizconfig/src/ccs_settings_upgrade_internal.c
98
98
        if (!nexttok)
99
99
            return FALSE;
100
100
 
101
 
        nexttok++;
 
101
        ++nexttok;
102
102
        nextnexttok = strchr (nexttok, '.');
103
103
 
104
104
        if (!nextnexttok)
105
105
            return FALSE;
106
106
 
107
 
        nextnexttok++;
 
107
        ++nextnexttok;
108
108
        bit = strndup (nexttok, strlen (nexttok) - (strlen (nextnexttok) + 1));
109
109
 
110
110
        if (sscanf (bit, "%ld", &numTmp) == 1)
240
240
                    /* We found a matching value, remove it */
241
241
                    if (olv)
242
242
                    {
243
 
                        count++;
 
243
                        ++count;
244
244
                        nl = ccsSettingValueListRemove (nl, olv->data, TRUE);
245
245
                    }
246
246
 
320
320
                     * list and we should append the value to nl */
321
321
                    if (!olv)
322
322
                    {
323
 
                        count++;
 
323
                        ++count;
324
324
 
325
325
                        /* Before we do that, make sure that the setting parent
326
326
                         * is set to the real setting, so that it behaves