Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge trunk from 19853 to 19947

Browse Source 
svn: r19949
This commit is contained in:
Benny Malengier
2012-07-05 00:38:18 +00:00
parent aba47d38cb e73eec36aa
commit 226a3eee2b
360 changed files with 9231 additions and 4315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/view/htmlrenderer.py
View File

@@ -59,10 +59,10 @@ from gi.repository import Gtk
#-------------------------------------------------------------------------
from gui.views.navigationview import NavigationView
from gui.views.bookmarks import PersonBookmarks
import Utils
from gen.utils.file import get_empty_tempdir
from gen.constfunc import lin, mac, win
from gen.config import config
from const import TEMP_DIR
from gen.const import TEMP_DIR
#-------------------------------------------------------------------------
#
@@ -92,8 +92,8 @@ def get_identity():
# I think we should set the two following variable in const.py
# They are used only with gtkmozembed.
MOZEMBED_PATH = TEMP_DIR
MOZEMBED_SUBPATH = Utils.get_empty_tempdir('mozembed_gramps')
GEOVIEW_SUBPATH = Utils.get_empty_tempdir('geoview')
MOZEMBED_SUBPATH = get_empty_tempdir('mozembed_gramps')
GEOVIEW_SUBPATH = get_empty_tempdir('geoview')
NOWEB = 0
WEBKIT = 1
MOZILLA = 2