← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/irssi/oneiric

« back to all changes in this revision

Viewing changes to src/core/settings.c

  • Committer: Bazaar Package Importer
  • Author(s): Christian Bjälevik
  • Date: 2007-04-28 02:52:01 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20070428025201-2c4swxnpn4wr7fpg
Tags: 0.8.11-0ubuntu1
* New upstream release:
  - http://www.irssi.org/news/ChangeLog
* debian/{control,compat}:
  - Bump Standards.
* debian/patches/00list:
  - Disable 05upgrade-check-binary.patch, applied upstream.
  - Disable 08doublefree.patch, applied upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/settings.c
181
181
                                  "setting '%s' with different type.", key);
182
182
                        return;
183
183
                }
 
184
                rec->refcount++;
184
185
        } else {
185
186
                rec = g_new(SETTINGS_REC, 1);
 
187
                rec->refcount = 1;
186
188
                rec->module = g_strdup(module);
187
189
                rec->key = g_strdup(key);
188
190
                rec->section = g_strdup(section);
191
193
                rec->default_value = *default_value;
192
194
                g_hash_table_insert(settings, rec->key, rec);
193
195
        }
194
 
 
195
 
        rec->refcount++;
196
196
}
197
197
 
198
198
void settings_add_str_module(const char *module, const char *section,
692
692
                config = config_open(NULL, -1);
693
693
        }
694
694
 
695
 
        if (path != NULL)
 
695
        if (config->fname != NULL)
696
696
                config_parse(config);
697
697
        else
698
698
                config_parse_data(config, default_config, "internal");