|
 |
ec4b96 |
diff -up ./esc/src/app/xul/esc/chrome/content/esc/ESC.js.fix16 ./esc/src/app/xul/esc/chrome/content/esc/ESC.js
|
|
|
ec4b96 |
--- ./esc/src/app/xul/esc/chrome/content/esc/ESC.js.fix16 2012-11-28 14:47:47.510976503 -0800
|
|
|
ec4b96 |
+++ ./esc/src/app/xul/esc/chrome/content/esc/ESC.js 2012-11-28 14:49:58.889984069 -0800
|
|
|
ec4b96 |
@@ -133,7 +133,6 @@ jsNotify.prototype = {
|
|
|
ec4b96 |
var gNotify=null;
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
netkey = Components.classes["@redhat.com/rhCoolKey;1"].getService();
|
|
|
ec4b96 |
netkey = netkey.QueryInterface(Components.interfaces.rhICoolKey);
|
|
|
ec4b96 |
gNotify = new jsNotify;
|
|
|
ec4b96 |
@@ -152,7 +151,6 @@ function cleanup()
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
TrayRemoveWindow(null);
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
netkey.rhCoolKeyUnSetNotifyCallback(gNotify);
|
|
|
ec4b96 |
} catch(e) {
|
|
|
ec4b96 |
MyAlert(getBundleString("errorUniversalXPConnect") + e);
|
|
|
ec4b96 |
@@ -425,7 +423,6 @@ function commitConfigValues()
|
|
|
ec4b96 |
var res = 0;
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
res = netkey.SetCoolKeyConfigValue("esc.tps.url",tps_uri_value);
|
|
|
ec4b96 |
|
|
|
ec4b96 |
} catch(e) {
|
|
|
ec4b96 |
@@ -434,7 +431,6 @@ function commitConfigValues()
|
|
|
ec4b96 |
}
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
res = netkey.SetCoolKeyConfigValue("esc.enroll.ui.url",esc_enroll_value);
|
|
|
ec4b96 |
grantPrivilegesURL(esc_enroll_value);
|
|
|
ec4b96 |
@@ -466,7 +462,6 @@ function InitializeConfigUI()
|
|
|
ec4b96 |
if(netkey)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
tps_uri = netkey.GetCoolKeyConfigValue("esc.tps.url");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -487,7 +482,6 @@ function InitializeConfigUI()
|
|
|
ec4b96 |
var esc_enroll_uri = null;
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
esc_enroll_uri = netkey.GetCoolKeyConfigValue("esc.enroll.ui.url");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -550,7 +544,6 @@ function CoolKeySetDataValue(aKeyType,aK
|
|
|
ec4b96 |
if(netkey)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
netkey.SetCoolKeyDataValue(aKeyType,aKeyID,name,value);
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -567,7 +560,6 @@ function CoolKeySetTokenPin(pin)
|
|
|
ec4b96 |
if(netkey)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
netkey.SetCoolKeyDataValue(gCurKeyType,gCurKeyID,"TokenPin",pin);
|
|
|
ec4b96 |
|
|
|
ec4b96 |
} catch(e) {
|
|
|
ec4b96 |
@@ -581,7 +573,6 @@ function CoolKeySetUidPassword(uid,pwd)
|
|
|
ec4b96 |
if(netkey)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
netkey.SetCoolKeyDataValue(gCurKeyType,gCurKeyID,"UserId",uid);
|
|
|
ec4b96 |
netkey.SetCoolKeyDataValue(gCurKeyType,gCurKeyID,"Password",pwd);
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -646,7 +637,6 @@ function ReportException(msg, e)
|
|
|
ec4b96 |
function GetCoolKeyStatus(keyType, keyID)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
return netkey.GetCoolKeyStatus(keyType, keyID);
|
|
|
ec4b96 |
} catch (e) {
|
|
|
ec4b96 |
ReportException(getBundleString("errorCoolKeyGetStatus"), e);
|
|
|
ec4b96 |
@@ -665,7 +655,6 @@ function ConfigValueWithKeyID(keyID,conf
|
|
|
ec4b96 |
function GetCoolKeyPolicy(keyType, keyID)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
return netkey.GetCoolKeyPolicy(keyType, keyID);
|
|
|
ec4b96 |
} catch (e) {
|
|
|
ec4b96 |
//ReportException(getBundleString("errorCoolKeyGetPolicy"), e);
|
|
|
ec4b96 |
@@ -676,7 +665,6 @@ function GetCoolKeyPolicy(keyType, keyID
|
|
|
ec4b96 |
function GetCoolKeyRequiresAuth(keyType, keyID)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
return netkey.GetCoolKeyRequiresAuthentication(keyType, keyID);
|
|
|
ec4b96 |
} catch(e) {
|
|
|
ec4b96 |
ReportException(getBundleString("errorCoolKeyRequiresAuth"), e);
|
|
|
ec4b96 |
@@ -687,7 +675,6 @@ function GetCoolKeyRequiresAuth(keyType,
|
|
|
ec4b96 |
function AuthenticateCoolKey(keyType, keyID,aPIN)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
return netkey.AuthenticateCoolKey(keyType, keyID,"netscape");
|
|
|
ec4b96 |
} catch(e) {
|
|
|
ec4b96 |
ReportException(getBundleString("errorAuthCoolKey"), e);
|
|
|
ec4b96 |
@@ -698,7 +685,6 @@ function AuthenticateCoolKey(keyType, ke
|
|
|
ec4b96 |
function GetCoolKeyIsAuthed(keyType, keyID)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
return netkey.GetCoolKeyIsAuthenticated(keyType, keyID);
|
|
|
ec4b96 |
} catch(e) {
|
|
|
ec4b96 |
ReportException(getBundleString("errorCoolKeyIsAuth"), e);
|
|
|
ec4b96 |
@@ -717,7 +703,6 @@ function GetCoolKeyIssuer(keyType,keyID)
|
|
|
ec4b96 |
if(!issuer && (GetStatusForKeyID(keyType, keyID) == getBundleString("statusEnrolled")))
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
issuer = netkey.GetCoolKeyIssuer(keyType,keyID);
|
|
|
ec4b96 |
|
|
|
ec4b96 |
var issuer_url = ConfigValueWithKeyID(keyID,KEY_ISSUER_URL);
|
|
|
ec4b96 |
@@ -757,7 +742,6 @@ function GetCoolKeyIssuedTo(keyType,keyI
|
|
|
ec4b96 |
var issuedTo = null;
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
issuedTo = netkey.GetCoolKeyIssuedTo(keyType,keyID);
|
|
|
ec4b96 |
|
|
|
ec4b96 |
} catch (e)
|
|
|
ec4b96 |
@@ -895,7 +879,6 @@ function GetCoolKeyCertNicknames(aKeyTyp
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
var nameArr;
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
var inArray = netkey.GetCoolKeyCertNicknames(aKeyType,aKeyId, {} );
|
|
|
ec4b96 |
nameArr = new Array(inArray.length);
|
|
|
ec4b96 |
var i;
|
|
|
ec4b96 |
@@ -915,7 +898,6 @@ function GetCoolKeyVersion()
|
|
|
ec4b96 |
var result = null;
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
result = netkey.GetCoolKeyVersion();
|
|
|
ec4b96 |
return result;
|
|
|
ec4b96 |
} catch(e) {
|
|
|
ec4b96 |
@@ -928,7 +910,6 @@ function GetCoolKeyCertInfo(aKeyType,aKe
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
var info = null;
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
info = netkey.GetCoolKeyCertInfo(aKeyType,aKeyId, aCertNickname );
|
|
|
ec4b96 |
return info;
|
|
|
ec4b96 |
} catch(e) {
|
|
|
ec4b96 |
@@ -942,7 +923,6 @@ function GetAvailableCoolKeys()
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
var keyArr;
|
|
|
ec4b96 |
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
var inArray = netkey.GetAvailableCoolKeys( {} );
|
|
|
ec4b96 |
keyArr = new Array(inArray.length);
|
|
|
ec4b96 |
var i;
|
|
|
ec4b96 |
@@ -963,7 +943,6 @@ function CoolKeyLogMsg(aLogLevel,aMessag
|
|
|
ec4b96 |
return;
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
netkey.CoolKeyLogMsg(aLogLevel,aMessage);
|
|
|
ec4b96 |
} catch(e) {
|
|
|
ec4b96 |
}
|
|
|
ec4b96 |
@@ -972,7 +951,6 @@ function CoolKeyLogMsg(aLogLevel,aMessag
|
|
|
ec4b96 |
function ChallengeCoolKey(keyType, keyID, data)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
return netkey.ChallengeCoolKey(keyType, keyID, data);
|
|
|
ec4b96 |
} catch(e) {
|
|
|
ec4b96 |
return [];
|
|
|
ec4b96 |
@@ -982,7 +960,6 @@ function ChallengeCoolKey(keyType, keyID
|
|
|
ec4b96 |
function EnrollCoolKey(keyType, keyID, enrollmentType, screenname, pin,screennamepwd,tokencode)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
netkey.EnrollCoolKey(keyType, keyID, enrollmentType, screenname, pin,screennamepwd,tokencode);
|
|
|
ec4b96 |
} catch(e) {
|
|
|
ec4b96 |
ReportException(getBundleString("errorEnollCoolKey"), e);
|
|
|
ec4b96 |
@@ -995,7 +972,6 @@ function EnrollCoolKey(keyType, keyID, e
|
|
|
ec4b96 |
function GetCoolKeyIsEnrolled(keyType, keyID)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
return netkey.GetCoolKeyIsEnrolled(keyType, keyID);
|
|
|
ec4b96 |
} catch(e) {
|
|
|
ec4b96 |
ReportException(getBundleString("errorCoolKeyIsEnrolled"), e);
|
|
|
ec4b96 |
@@ -1006,7 +982,6 @@ function GetCoolKeyIsEnrolled(keyType, k
|
|
|
ec4b96 |
function ResetCoolKeyPIN(keyType, keyID, screenname, pin,screennamepwd)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
netkey.ResetCoolKeyPIN(keyType, keyID, screenname, pin,screennamepwd);
|
|
|
ec4b96 |
} catch(e) {
|
|
|
ec4b96 |
ReportException(getBundleString("errorResetCoolKeyPIN"), e);
|
|
|
ec4b96 |
@@ -1017,7 +992,6 @@ function ResetCoolKeyPIN(keyType, keyID,
|
|
|
ec4b96 |
function FormatCoolKey(keyType, keyID, type, screenname, pin,screennamepwd,tokencode)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
netkey.FormatCoolKey(keyType, keyID, type, screenname, pin,screennamepwd,tokencode);
|
|
|
ec4b96 |
} catch(e) {
|
|
|
ec4b96 |
ReportException(getBundleString("errorFormatCoolKey"), e);
|
|
|
ec4b96 |
@@ -1029,7 +1003,6 @@ function FormatCoolKey(keyType, keyID, t
|
|
|
ec4b96 |
function CancelCoolKeyOperation(keyType, keyID)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
netkey.CancelCoolKeyOperation(keyType, keyID);
|
|
|
ec4b96 |
} catch(e) {
|
|
|
ec4b96 |
ReportException(getBundleString("errorCancelCoolKey"), e);
|
|
|
ec4b96 |
@@ -3653,7 +3626,6 @@ function getESCEnrollmentUI()
|
|
|
ec4b96 |
if(netkey)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
esc_enroll_uri = netkey.GetCoolKeyConfigValue("esc.enroll.ui.url");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
} catch(e) {
|
|
|
ec4b96 |
@@ -3692,7 +3664,6 @@ function grantPrivilegesURL(aURL)
|
|
|
ec4b96 |
if(prePath)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
res = netkey.SetCoolKeyConfigValue("capability.principal.codebase.p0.id",prePath);
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -3716,7 +3687,6 @@ function DoCoolKeySetConfigValue(configV
|
|
|
ec4b96 |
if(netkey)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
result = netkey.SetCoolKeyConfigValue(configValue,newValue);
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -3739,7 +3709,6 @@ function DoCoolKeyGetConfigValue(configV
|
|
|
ec4b96 |
if(netkey)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
result = netkey.GetCoolKeyConfigValue(configValue);
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -3791,7 +3760,6 @@ function DoGetCoolKeyIsReallyCoolKey(key
|
|
|
ec4b96 |
return 0;
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
var isCool = netkey.GetCoolKeyIsReallyCoolKey(keyType, keyID);
|
|
|
ec4b96 |
|
|
|
ec4b96 |
return isCool;
|
|
|
ec4b96 |
@@ -3824,7 +3792,6 @@ function DoCoolKeyGetIssuerUrl(keyType,k
|
|
|
ec4b96 |
}
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
var tries = 0;
|
|
|
ec4b96 |
while(tries < 3 )
|
|
|
ec4b96 |
@@ -3908,7 +3875,6 @@ function DoCoolKeyGetATR(keyType,keyID)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
var atr = null;
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
atr = netkey.GetCoolKeyATR(keyType, keyID);
|
|
|
ec4b96 |
} catch (e) {
|
|
|
ec4b96 |
return atr;
|
|
|
ec4b96 |
@@ -3925,7 +3891,6 @@ function DoCoolKeyGetTokenName(keyType,k
|
|
|
ec4b96 |
|
|
|
ec4b96 |
var name = null;
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
name = netkey.GetCoolKeyTokenName(keyType, keyID);
|
|
|
ec4b96 |
} catch (e) {
|
|
|
ec4b96 |
return name;
|
|
|
ec4b96 |
@@ -3940,7 +3905,6 @@ function DoGetCoolKeyGetAppletVer(keyTyp
|
|
|
ec4b96 |
var ver = -1;
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
var ver = netkey.GetCoolKeyGetAppletVer(keyType, keyID,isMajor);
|
|
|
ec4b96 |
} catch (e) {
|
|
|
ec4b96 |
ver = -1;
|
|
|
ec4b96 |
@@ -4633,7 +4597,6 @@ function DoMyAlert(message,title)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
if(!message || !title)
|
|
|
ec4b96 |
return; try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
|
|
|
ec4b96 |
|
|
|
ec4b96 |
prompts.alert(window,title,message);
|
|
|
ec4b96 |
diff -up ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js.fix16 ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js
|
|
|
ec4b96 |
--- ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js.fix16 2012-11-28 14:47:52.965976817 -0800
|
|
|
ec4b96 |
+++ ./esc/src/app/xul/esc/chrome/content/esc/TRAY.js 2012-11-28 14:48:43.665979745 -0800
|
|
|
ec4b96 |
@@ -48,7 +48,7 @@ jsWindNotify.prototype = {
|
|
|
ec4b96 |
//alert("iid: " + iid);
|
|
|
ec4b96 |
if(!iid.equals(Components.interfaces.rhITrayWindNotify) &&
|
|
|
ec4b96 |
!iid.equals(Components.interfaces.nsISupports) &&
|
|
|
ec4b96 |
- !iid.equals(Components.interfaces.nsIClassInfo)
|
|
|
ec4b96 |
+ !iid.equals(Components.interfaces.nsIClassInfo))
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
MyAlert(getBundleString("errorJsNotifyInterface"));
|
|
|
ec4b96 |
throw Components.results.NS_ERROR_NO_INTERFACE;
|
|
|
ec4b96 |
@@ -63,7 +63,6 @@ jsWindNotify.prototype = {
|
|
|
ec4b96 |
|
|
|
ec4b96 |
// GECKO ONLY initialization
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
gTray = Components.classes["@redhat.com/rhTray;1"].getService();
|
|
|
ec4b96 |
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -129,7 +128,6 @@ function GetTrayIsInitialized()
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
rv = gTray.isInitializedAlready();
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -155,7 +153,6 @@ function ShowAllWindows()
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
gTray.showall();
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -175,7 +172,6 @@ function HideAllWindows()
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
gTray.hideall();
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -196,7 +192,6 @@ function ShowWindow()
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
gTray.show(gBaseWindow);
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -216,7 +211,6 @@ function HideWindow()
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
gTray.hide(gBaseWindow);
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -235,7 +229,6 @@ function TrayRemoveWindowNotify()
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
gTray.unsetwindnotifycallback(gWindNotify);
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -254,7 +247,6 @@ function TrayRemoveWindow(doPreserveNoti
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
gTray.remove(gBaseWindow);
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -277,7 +269,6 @@ function TrayAddWindow()
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
|
|
|
ec4b96 |
gTray.add(gBaseWindow);
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -304,7 +295,6 @@ function TraySendNotificationMessage(aTi
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect")
|
|
|
ec4b96 |
|
|
|
ec4b96 |
|
|
|
ec4b96 |
gTray.sendnotification(aTitle,aMessage,aSeverity,aTimeout,aIcon);
|
|
|
ec4b96 |
@@ -329,7 +319,6 @@ function TrayHideNotificationIcon()
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect")
|
|
|
ec4b96 |
|
|
|
ec4b96 |
gTray.hideicon();
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -361,7 +350,6 @@ function TrayShowNotificationIcon()
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
|
|
ec4b96 |
gTray.settooltipmsg(getBundleString("escTitle"));
|
|
|
ec4b96 |
gTray.showicon();
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -383,7 +371,6 @@ function TrayShowTooltip(aMessage)
|
|
|
ec4b96 |
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect")
|
|
|
ec4b96 |
;
|
|
|
ec4b96 |
gTray.settooltipmsg(aMessage);
|
|
|
ec4b96 |
|
|
|
ec4b96 |
@@ -413,7 +400,6 @@ function TrayChangeMenuItemText(aIndex,
|
|
|
ec4b96 |
if(gTray && gBaseWindow)
|
|
|
ec4b96 |
{
|
|
|
ec4b96 |
try {
|
|
|
ec4b96 |
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect")
|
|
|
ec4b96 |
gTray.setmenuitemtext(aIndex,aText);
|
|
|
ec4b96 |
gTray.showicon();
|
|
|
ec4b96 |
} catch(e) {
|