Midori Web Browser

Merge lp:~kalikiana/midori/nojstest into lp:midori

  1. nojstest
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: André Stösel
Approved revision: 6309
Merged at revision: 6311
Proposed branch: lp:~kalikiana/midori/nojstest
Merge into: lp:midori
Diff against target: 16 lines (+0/-5)
1 file modified
extensions/nojs/nojs.c (+0/-5)
To merge this branch: bzr merge lp:~kalikiana/midori/nojstest
Reviewer Review Type Date Requested Status
André Stösel Approve
Review via email: mp+178404@code.launchpad.net

Commit message

Silently skip config loading in nojs if config path is unset

Description of the change

This makes the test not fail - it won't magically get better coverage, but at least it passes.

To post a comment you must log in.
Revision history for this message
André Stösel (ivaldi) wrote :

hm... I'm just wondering if there is a real world scenario in which there is no config dir (when the extension is prepared)... I guess not -> looks good ;)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'extensions/nojs/nojs.c'
2--- extensions/nojs/nojs.c 2013-07-05 16:08:28 +0000
3+++ extensions/nojs/nojs.c 2013-08-02 23:51:31 +0000
4@@ -186,12 +186,7 @@
5 /* Build path to database file */
6 configDir=midori_extension_get_config_dir(priv->extension);
7 if(!configDir)
8- {
9- g_warning(_("Could not get path to configuration of extension: path is NULL"));
10-
11- _nojs_error(self, _("Could not get path to configuration of extension."));
12 return;
13- }
14
15 if(katze_mkdir_with_parents(configDir, 0700))
16 {

Subscribers

People subscribed via source and target branches

to all changes: