← Back to branch summary

~ubuntu-branches/ubuntu/vivid/xiphos/vivid-proposed

« back to all changes in this revision

Viewing changes to src/backend/module_manager.cc

  • Committer: Package Import Robot
  • Author(s): Dimitri John Ledkov
  • Date: 2014-07-12 17:08:46 UTC
  • mfrom: (17.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20140712170846-1lcybpijz5fn72fg
Tags: 3.2.2+dfsg1-1
* New upstream release.
* Bump standards version.
* Switch uscan to sf.net redirector.
* Unpack waf in get-orig-source target.
* Bump to debhelper 9.
* Add uuid-dev build-dep.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/backend/module_manager.cc
2
2
 * Xiphos Bible Study Tool
3
3
 * module_manager.cc
4
4
 *
5
 
 * Copyright (C) 2000-2011 Xiphos Developer Team
 
5
 * Copyright (C) 2000-2014 Xiphos Developer Team
6
6
 *
7
7
 * This program is free software; you can redistribute it and/or modify
8
8
 * it under the terms of the GNU General Public License as published by
122
122
 
123
123
}
124
124
 
125
 
char *backend_mod_mgr_get_config_entry(char *module_name,
 
125
char *backend_mod_mgr_get_config_entry(const char *module_name,
126
126
                                       const char *entry) {
127
127
        SWModule *mod;
128
128
        ModMap::iterator it;    //-- iteratior
168
168
        if (list_it != list_end) {
169
169
                module = list_it->second;
170
170
                mod_info = g_new(MOD_MGR, 1);
171
 
                gchar *name = module->Name();
 
171
                const gchar *name = module->getName();
172
172
 
173
173
                if (name) {
174
174
                        mod_info->name = g_strdup(name);
175
175
                        mod_info->language =
176
 
                            main_get_language_map(module->Lang());
177
 
                        mod_info->type = g_strdup(module->Type());
 
176
                            main_get_language_map(module->getLanguage());
 
177
                        mod_info->type = g_strdup(module->getType());
178
178
                        mod_info->about = g_strdup((char *)module->getConfigEntry("About"));
179
179
 
180
180
                        char *vers = (char *)module->getConfigEntry("Version");
213
213
                            backend_mod_mgr_get_config_entry(name, "Version");
214
214
                        mod_info->installed =
215
215
                            backend_mod_mgr_is_module(name);
216
 
                        mod_info->description = module->Description();
 
216
                        mod_info->description = g_strdup(module->getDescription());
217
217
                        mod_info->locked =
218
218
                            ((module->getConfigEntry("CipherKey")) ? 1 : 0);
219
219
                        list_it++;
318
318
                return -1;
319
319
        }
320
320
        module = it->second;
321
 
        retval = installMgr->removeModule(tmp_mgr, module->Name());
 
321
        retval = installMgr->removeModule(tmp_mgr, module->getName());
322
322
        delete tmp_mgr;
323
323
        return retval;
324
324
}