DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Adapt to the new API for the Error class

Browse Source
This commit is contained in:
Pierre Pronchery 2015-11-24 00:40:37 +01:00
parent 4b11fdbb84
commit 6f8f510edc
8 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/browser.c
View File

@ -779,7 +779,7 @@ int browser_config_load(Browser * browser)
if((filename = _common_config_filename(BROWSER_CONFIG_FILE)) == NULL) if((filename = _common_config_filename(BROWSER_CONFIG_FILE)) == NULL)
return -1; return -1;
if(config_load(browser->config, filename) != 0) if(config_load(browser->config, filename) != 0)
browser_error(NULL, error_get(), 1); browser_error(NULL, error_get(NULL), 1);
free(filename); free(filename);
#if GTK_CHECK_VERSION(2, 6, 0) #if GTK_CHECK_VERSION(2, 6, 0)
/* XXX deserves a rework (enum) */ /* XXX deserves a rework (enum) */
@ -1016,17 +1016,17 @@ int browser_load(Browser * browser, char const * plugin)
if(_browser_plugin_is_enabled(browser, plugin)) if(_browser_plugin_is_enabled(browser, plugin))
return 0; return 0;
if((p = plugin_new(LIBDIR, PACKAGE, "plugins", plugin)) == NULL) if((p = plugin_new(LIBDIR, PACKAGE, "plugins", plugin)) == NULL)
return -browser_error(NULL, error_get(), 1); return -browser_error(NULL, error_get(NULL), 1);
if((bpd = plugin_lookup(p, "plugin")) == NULL) if((bpd = plugin_lookup(p, "plugin")) == NULL)
{ {
plugin_delete(p); plugin_delete(p);
return -browser_error(NULL, error_get(), 1); return -browser_error(NULL, error_get(NULL), 1);
} }
if(bpd->init == NULL || bpd->destroy == NULL || bpd->get_widget == NULL if(bpd->init == NULL || bpd->destroy == NULL || bpd->get_widget == NULL
|| (bp = bpd->init(&browser->pl_helper)) == NULL) || (bp = bpd->init(&browser->pl_helper)) == NULL)
{ {
plugin_delete(p); plugin_delete(p);
return -browser_error(NULL, error_get(), 1); return -browser_error(NULL, error_get(NULL), 1);
} }
widget = bpd->get_widget(bp); widget = bpd->get_widget(bp);
gtk_widget_hide(widget); gtk_widget_hide(widget);
@ -2462,7 +2462,7 @@ static char const * _browser_config_get(Browser * browser, char const * section,
if(section != NULL && (s = string_new_append("plugin::", section, NULL)) if(section != NULL && (s = string_new_append("plugin::", section, NULL))
== NULL) == NULL)
{ {
browser_error(NULL, error_get(), 1); browser_error(NULL, error_get(NULL), 1);
return NULL; return NULL;
} }
ret = config_get(browser->config, s, variable); ret = config_get(browser->config, s, variable);
@ -2481,13 +2481,13 @@ static int _browser_config_set(Browser * browser, char const * section,
if(section != NULL && (s = string_new_append("plugin::", section, NULL)) if(section != NULL && (s = string_new_append("plugin::", section, NULL))
== NULL) == NULL)
return -browser_error(NULL, error_get(), 1); return -browser_error(NULL, error_get(NULL), 1);
if((ret = config_set(browser->config, s, variable, value)) == 0 if((ret = config_set(browser->config, s, variable, value)) == 0
&& (filename = _common_config_filename( && (filename = _common_config_filename(
BROWSER_CONFIG_FILE)) != NULL) BROWSER_CONFIG_FILE)) != NULL)
{ {
if(config_save(browser->config, filename) != 0) if(config_save(browser->config, filename) != 0)
browser_error(NULL, error_get(), 1); browser_error(NULL, error_get(NULL), 1);
free(filename); free(filename);
} }
string_delete(s); string_delete(s);

2
src/desktop.c
View File

@ -1368,7 +1368,7 @@ static int _error_text(char const * message, char const * error, int ret)
/* desktop_serror */ /* desktop_serror */
static int _desktop_serror(Desktop * desktop, char const * message, int ret) static int _desktop_serror(Desktop * desktop, char const * message, int ret)
{ {
return _desktop_error(desktop, message, error_get(), ret); return _desktop_error(desktop, message, error_get(NULL), ret);
} }

4
src/plugins/cvs.c
View File

@ -431,7 +431,7 @@ static void _refresh_error(CVS * cvs, char const * message)
BrowserPluginHelper * helper = cvs->helper; BrowserPluginHelper * helper = cvs->helper;
error_set("%s: %s", message, strerror(errno)); error_set("%s: %s", message, strerror(errno));
helper->error(helper->browser, error_get(), 1); helper->error(helper->browser, error_get(NULL), 1);
} }
static void _refresh_file(CVS * cvs) static void _refresh_file(CVS * cvs)
@ -611,7 +611,7 @@ static int _cvs_add_task(CVS * cvs, char const * title, char const * directory,
cvs->tasks = p; cvs->tasks = p;
if((task = _common_task_new(helper, &plugin, title, directory, argv, if((task = _common_task_new(helper, &plugin, title, directory, argv,
callback, cvs)) == NULL) callback, cvs)) == NULL)
return -helper->error(helper->browser, error_get(), 1); return -helper->error(helper->browser, error_get(NULL), 1);
cvs->tasks[cvs->tasks_cnt++] = task; cvs->tasks[cvs->tasks_cnt++] = task;
return 0; return 0;
} }

4
src/plugins/git.c
View File

@ -327,7 +327,7 @@ static void _refresh_error(Git * git, char const * message)
BrowserPluginHelper * helper = git->helper; BrowserPluginHelper * helper = git->helper;
error_set("%s: %s", message, strerror(errno)); error_set("%s: %s", message, strerror(errno));
helper->error(helper->browser, error_get(), 1); helper->error(helper->browser, error_get(NULL), 1);
} }
static void _refresh_file(Git * git) static void _refresh_file(Git * git)
@ -411,7 +411,7 @@ static int _git_add_task(Git * git, char const * title,
git->tasks = p; git->tasks = p;
if((task = _common_task_new(helper, &plugin, title, directory, argv, if((task = _common_task_new(helper, &plugin, title, directory, argv,
callback, git)) == NULL) callback, git)) == NULL)
return -helper->error(helper->browser, error_get(), 1); return -helper->error(helper->browser, error_get(NULL), 1);
git->tasks[git->tasks_cnt++] = task; git->tasks[git->tasks_cnt++] = task;
return 0; return 0;
} }

4
src/plugins/make.c
View File

@ -333,7 +333,7 @@ static void _refresh_error(Make * make, char const * message)
BrowserPluginHelper * helper = make->helper; BrowserPluginHelper * helper = make->helper;
error_set("%s: %s", message, strerror(errno)); error_set("%s: %s", message, strerror(errno));
helper->error(helper->browser, error_get(), 1); helper->error(helper->browser, error_get(NULL), 1);
} }
static void _refresh_file(Make * make) static void _refresh_file(Make * make)
@ -459,7 +459,7 @@ static int _make_add_task(Make * make, char const * title,
make->tasks = p; make->tasks = p;
if((task = _common_task_new(helper, &plugin, title, directory, argv, if((task = _common_task_new(helper, &plugin, title, directory, argv,
NULL, NULL)) == NULL) NULL, NULL)) == NULL)
return -helper->error(helper->browser, error_get(), 1); return -helper->error(helper->browser, error_get(NULL), 1);
make->tasks[make->tasks_cnt++] = task; make->tasks[make->tasks_cnt++] = task;
return 0; return 0;
} }

4
src/plugins/subversion.c
View File

@ -317,7 +317,7 @@ static void _refresh_error(SVN * svn, char const * message)
BrowserPluginHelper * helper = svn->helper; BrowserPluginHelper * helper = svn->helper;
error_set("%s: %s", message, strerror(errno)); error_set("%s: %s", message, strerror(errno));
helper->error(helper->browser, error_get(), 1); helper->error(helper->browser, error_get(NULL), 1);
} }
static void _refresh_hide(SVN * svn, gboolean name) static void _refresh_hide(SVN * svn, gboolean name)
@ -390,7 +390,7 @@ static int _subversion_add_task(SVN * svn, char const * title,
svn->tasks = p; svn->tasks = p;
if((task = _common_task_new(helper, &plugin, title, directory, argv, if((task = _common_task_new(helper, &plugin, title, directory, argv,
NULL, NULL)) == NULL) NULL, NULL)) == NULL)
return -helper->error(helper->browser, error_get(), 1); return -helper->error(helper->browser, error_get(NULL), 1);
svn->tasks[svn->tasks_cnt++] = task; svn->tasks[svn->tasks_cnt++] = task;
return 0; return 0;
} }

6
src/properties.c
View File

@ -203,11 +203,11 @@ static Properties * _properties_new(Mime * mime, char const * plugin,
gtk_container_add(GTK_CONTAINER(bbox), widget); gtk_container_add(GTK_CONTAINER(bbox), widget);
gtk_widget_show_all(bbox); gtk_widget_show_all(bbox);
if(_new_load(properties, plugin) != 0) if(_new_load(properties, plugin) != 0)
_properties_error(properties, error_get(), -1); _properties_error(properties, error_get(NULL), -1);
else if(filename != NULL) else if(filename != NULL)
{ {
if(_properties_set_location(properties, filename) != 0) if(_properties_set_location(properties, filename) != 0)
_properties_error(properties, error_get(), -1); _properties_error(properties, error_get(NULL), -1);
else else
gtk_widget_show(properties->window); gtk_widget_show(properties->window);
} }
@ -454,7 +454,7 @@ static int _properties_helper_set_location(Properties * properties,
int res; int res;
if((res = _properties_set_location(properties, filename)) != 0) if((res = _properties_set_location(properties, filename)) != 0)
return -_properties_error(properties, error_get(), 1); return -_properties_error(properties, error_get(NULL), 1);
return 0; return 0;
} }

4
src/view.c
View File

@ -524,7 +524,7 @@ static int _view_helper_set_location(View * view, char const * filename)
int res; int res;
if((res = _view_set_location(view, filename)) != 0) if((res = _view_set_location(view, filename)) != 0)
return -_view_error(view, error_get(), 1); return -_view_error(view, error_get(NULL), 1);
return 0; return 0;
} }
@ -682,7 +682,7 @@ int main(int argc, char * argv[])
return _usage(); return _usage();
} }
if((mime = mime_new(NULL)) == NULL) if((mime = mime_new(NULL)) == NULL)
return _view_error(NULL, error_get(), 2); return _view_error(NULL, error_get(NULL), 2);
if(optind == argc) if(optind == argc)
_view_new_open(mime); _view_new_open(mime);
else else