diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-03-17 15:43:23 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-03-17 15:43:23 -0400 |
| commit | 3a05470820f9bc3a88eeb6eb97599a8eb895f325 (patch) | |
| tree | cba8ea1ed592d7a3fb3c6199035d2caf6d985ce5 /lib/sisu/v2/sysenv.rb | |
| parent | debian: NEWS.Debian, changelog, control, sisu.install, sisu.lintian-overrides... (diff) | |
| parent | plaintext docoration (more flexible markings) (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v2/sysenv.rb')
| -rw-r--r-- | lib/sisu/v2/sysenv.rb | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb index 9f69ccfe..ddb48bba 100644 --- a/lib/sisu/v2/sysenv.rb +++ b/lib/sisu/v2/sysenv.rb @@ -1004,9 +1004,9 @@ module SiSU_Env elsif widget.search? db=if rc['search']['sisu']['flag']==true \ and rc['search']['sisu']['db']=~/\S+/ - (rc['search']['sisu']['db']=~/^SiSU_\S+/) \ + (rc['search']['sisu']['db']=~/^#{Db[:name_prefix]}\S+/) \ ? rc['search']['sisu']['db'] \ - : "SiSU_#{rc['search']['sisu']['db']}" + : "#{Db[:name_prefix]}#{rc['search']['sisu']['db']}" else nil end action=rc['search']['sisu']['action'] @@ -1074,9 +1074,9 @@ WOK elsif widget.search_fixed? db=if rc['search']['sisu']['flag']==true \ and rc['search']['sisu']['db']=~/\S+/ - (rc['search']['sisu']['db']=~/^SiSU_\S+/) \ + (rc['search']['sisu']['db']=~/^#{Db[:name_prefix]}\S+/) \ ? rc['search']['sisu']['db'] \ - : "SiSU_#{rc['search']['sisu']['db']}" + : "#{Db[:name_prefix]}#{rc['search']['sisu']['db']}" else nil end action=rc['search']['sisu']['action'] @@ -1171,9 +1171,9 @@ WOK elsif widget_static.search? \ and rc['search']['sisu']['flag']==true db=if rc['search']['sisu']['db']=~/\S+/ - (rc['search']['sisu']['db']=~/^SiSU_\S+/) \ + (rc['search']['sisu']['db']=~/^#{Db[:name_prefix]}\S+/) \ ? rc['search']['sisu']['db'] \ - : "SiSU_#{rc['search']['sisu']['db']}" + : "#{Db[:name_prefix]}#{rc['search']['sisu']['db']}" else nil end action=rc['search']['sisu']['action'] @@ -1948,12 +1948,6 @@ WOK ? @rc['program_select']['odf_viewer'] \ : 'oowriter' #'odf-viewer','oowriter' end - def epub_viewer - ((defined? @rc['program_select']['epub_viewer']) \ - && @rc['program_select']['epub_viewer'] =~/\S\S+/) \ - ? @rc['program_select']['epub_viewer'] \ - : web_browser - end def manpage_generator ((defined? @rc['program_select']['man']) \ && @rc['program_select']['man'] =~/\S\S+/) \ |