summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2012-03-05 21:58:59 +0100
committerChristophe Fergeau <cfergeau@redhat.com>2012-03-05 22:09:46 +0100
commit0b18f80ec1a26026b7380cc3d891777895f64f97 (patch)
treef843619689bcc4f9154a53c32784a2aabe6195db
parent6fb8f5bd4e53cc9af728bfc678fdb9ae7897bac2 (diff)
Fix SendCtrlAltDelete xpi property spelling
It was spelt SendCtrlAltdelete (lower case "d" in delete) throughout the code base while spice-x and the rhev/ovirt portals use SendCtrlAltDelete. This commit changes all occurences of Altdelete to AltDelete. After this change, the "Pass Ctrl+Alt+Del" check box in the rhev/ovirt portal works as expected.
-rw-r--r--SpiceXPI/src/plugin/nsISpicec.idl2
-rw-r--r--SpiceXPI/src/plugin/nsScriptablePeer.cpp6
-rw-r--r--SpiceXPI/src/plugin/plugin.cpp8
-rw-r--r--SpiceXPI/src/plugin/plugin.h6
-rw-r--r--data/test.html4
5 files changed, 13 insertions, 13 deletions
diff --git a/SpiceXPI/src/plugin/nsISpicec.idl b/SpiceXPI/src/plugin/nsISpicec.idl
index 5e6fd55..5fc4a29 100644
--- a/SpiceXPI/src/plugin/nsISpicec.idl
+++ b/SpiceXPI/src/plugin/nsISpicec.idl
@@ -57,7 +57,7 @@ interface nsISpicec : nsISupports {
attribute string GuestHostName;
attribute string HotKey;
attribute boolean NoTaskMgrExecution;
- attribute boolean SendCtrlAltdelete;
+ attribute boolean SendCtrlAltDelete;
attribute unsigned short UsbListenPort;
attribute boolean UsbAutoShare;
attribute boolean Smartcard;
diff --git a/SpiceXPI/src/plugin/nsScriptablePeer.cpp b/SpiceXPI/src/plugin/nsScriptablePeer.cpp
index 8ec50e8..394ced8 100644
--- a/SpiceXPI/src/plugin/nsScriptablePeer.cpp
+++ b/SpiceXPI/src/plugin/nsScriptablePeer.cpp
@@ -126,7 +126,7 @@ void ScriptablePluginObject::Init()
m_id_guest_hostname = NPN_GetStringIdentifier("GuestHostName");
m_id_hotkey = NPN_GetStringIdentifier("HotKey");
m_id_no_taskmgr_execution = NPN_GetStringIdentifier("NoTaskMgrExecution");
- m_id_send_ctrlaltdel = NPN_GetStringIdentifier("SendCtrlAltdelete");
+ m_id_send_ctrlaltdel = NPN_GetStringIdentifier("SendCtrlAltDelete");
m_id_usb_listen_port = NPN_GetStringIdentifier("UsbListenPort");
m_id_usb_auto_share = NPN_GetStringIdentifier("UsbAutoShare");
m_id_connect = NPN_GetStringIdentifier("connect");
@@ -215,7 +215,7 @@ bool ScriptablePluginObject::GetProperty(NPIdentifier name, NPVariant *result)
else if (name == m_id_no_taskmgr_execution)
BOOLEAN_TO_NPVARIANT(m_plugin->GetNoTaskMgrExecution(), *result);
else if (name == m_id_send_ctrlaltdel)
- BOOLEAN_TO_NPVARIANT(m_plugin->GetSendCtrlAltdelete(), *result);
+ BOOLEAN_TO_NPVARIANT(m_plugin->GetSendCtrlAltDelete(), *result);
else if (name == m_id_usb_listen_port)
INT32_TO_NPVARIANT(m_plugin->GetUsbListenPort(), *result);
else if (name == m_id_usb_auto_share)
@@ -291,7 +291,7 @@ bool ScriptablePluginObject::SetProperty(NPIdentifier name, const NPVariant *val
else if (name == m_id_no_taskmgr_execution)
m_plugin->SetNoTaskMgrExecution(boolean);
else if (name == m_id_send_ctrlaltdel)
- m_plugin->SetSendCtrlAltdelete(boolean);
+ m_plugin->SetSendCtrlAltDelete(boolean);
else if (name == m_id_usb_listen_port)
m_plugin->SetUsbListenPort(val);
else if (name == m_id_usb_auto_share)
diff --git a/SpiceXPI/src/plugin/plugin.cpp b/SpiceXPI/src/plugin/plugin.cpp
index 8fe7f73..f291888 100644
--- a/SpiceXPI/src/plugin/plugin.cpp
+++ b/SpiceXPI/src/plugin/plugin.cpp
@@ -445,15 +445,15 @@ void nsPluginInstance::SetNoTaskMgrExecution(PRBool aNoTaskMgrExecution)
m_no_taskmgr_execution = aNoTaskMgrExecution;
}
-/* attribute boolean SendCtrlAltdelete; */
-PRBool nsPluginInstance::GetSendCtrlAltdelete() const
+/* attribute boolean SendCtrlAltDelete; */
+PRBool nsPluginInstance::GetSendCtrlAltDelete() const
{
return m_send_ctrlaltdel;
}
-void nsPluginInstance::SetSendCtrlAltdelete(PRBool aSendCtrlAltdelete)
+void nsPluginInstance::SetSendCtrlAltDelete(PRBool aSendCtrlAltDelete)
{
- m_send_ctrlaltdel = aSendCtrlAltdelete;
+ m_send_ctrlaltdel = aSendCtrlAltDelete;
}
/* attribute unsigned short UsbListenPort; */
diff --git a/SpiceXPI/src/plugin/plugin.h b/SpiceXPI/src/plugin/plugin.h
index 3b17a98..c6f77ef 100644
--- a/SpiceXPI/src/plugin/plugin.h
+++ b/SpiceXPI/src/plugin/plugin.h
@@ -148,9 +148,9 @@ public:
PRBool GetNoTaskMgrExecution() const;
void SetNoTaskMgrExecution(PRBool aNoTaskMgrExecution);
- /* attribute ing SendCtrlAltdelete; */
- PRBool GetSendCtrlAltdelete() const;
- void SetSendCtrlAltdelete(PRBool aSendCtrlAltdelete);
+ /* attribute ing SendCtrlAltDelete; */
+ PRBool GetSendCtrlAltDelete() const;
+ void SetSendCtrlAltDelete(PRBool aSendCtrlAltDelete);
/* attribute unsigned short UsbListenPort; */
unsigned short GetUsbListenPort() const;
diff --git a/data/test.html b/data/test.html
index 83fcc14..929d096 100644
--- a/data/test.html
+++ b/data/test.html
@@ -39,7 +39,7 @@ function Execute()
embed.fullScreen = false;
embed.AdminConsole = (document.all["AdminConsole"].value == "1");
embed.HotKeys = document.all["HotKeys"].value;
- embed.SendCtrlAltdelete = (document.all["SendCtrlAltdelete"].value == "1")
+ embed.SendCtrlAltDelete = (document.all["SendCtrlAltDelete"].value == "1")
embed.fAudio = true;
embed.connect();
}
@@ -66,7 +66,7 @@ SecurePort: <input id="SecurePort" type="text" size="13"> </input> <BR>
Password: <input id="Password" type="text" size="13"> </input>
HotKeys: <input id="HotKeys" type="text" size="13" value="release-cursor=ctrl+alt"> </input>
AdminConsole: <input id="AdminConsole" type="text" size="5" value="1"> </input>
-SendCtrlAltdelete: <input id="SendCtrlAltdelete" type="text" size="5" value="1"> </input>
+SendCtrlAltDelete: <input id="SendCtrlAltDelete" type="text" size="5" value="1"> </input>
<BR>
HostSubject: <input id="HostSubject" type="text" size="60"> </input></br>
TrustStore: <textarea id="TrustStore" type="text" cols="65" rows="15"> </textarea> <BR>