diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-27 10:50:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-27 11:12:41 +0100 |
| commit | 207313157688d79cb0d53e920a03423c81a7bc23 (patch) | |
| tree | 3a736cb0b7362fb3fff156b36fea1f76542a70ec /cui/source/inc/cuires.hrc | |
| parent | 70115479f1775788ffedf6e0436b09d539491c89 (diff) | |
Resolves: fdo#39825 Make detection of certificate folder ui-configurable
Display in the (unix) options gui the NSS cert dir that has been auto-detected
for use with digital signatures. Show the other detected possibilities and
allow it to be overridden.
The autodetection should basically work out of the box, but if there's some
bustage at least the UI can be used to sort it out and/or let developers
debug it.
This removes the need for the horrible MOZILLA_CERTIFICATE_FOLDER hack,
though that's still supported.
Diffstat (limited to 'cui/source/inc/cuires.hrc')
| -rw-r--r-- | cui/source/inc/cuires.hrc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index b78294249515..17ca8b58357d 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -173,7 +173,7 @@ #define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256) #define RID_SVXERR_JRE_FAILED_VERSION (RID_SVX_START + 257) #define RID_SVX_MSGBOX_JAVA_RESTART ( RID_SVX_START + 0 ) -#define RID_SVX_MSGBOX_JAVA_RESTART2 ( RID_SVX_START + 1 ) +#define RID_SVX_MSGBOX_OPTIONS_RESTART ( RID_SVX_START + 1 ) #define RID_SVXDLG_LNG_ED_NUM_PREBREAK (RID_SVX_START + 830) #define RID_SVXDLG_EDIT_MODULES (RID_SVX_START + 831) #define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003) @@ -434,6 +434,8 @@ #define RID_CUISTR_CONTROLS_INVISIBLE (RID_SVX_START + 1196) #define RID_CUISTR_CONTROLS_INSERTTABLE (RID_SVX_START + 1197) +#define RID_SVXDLG_CERTPATH (RID_SVX_START + 1198) + #define RID_CUI_DIALOG_COLORPICKER (RID_SVX_START + 3) #endif |