Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow Firefox to be able to connect to devtools again #10158

Merged
merged 3 commits into from Mar 24, 2016
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Next

Properly return an empty list in devtools' listAddons

  • Loading branch information
nox committed Mar 23, 2016
commit b40992611171d4db4e0ce1188315637c6eabfff3
@@ -21,12 +21,14 @@ struct ActorTraits {
}

#[derive(RustcEncodable)]
struct ErrorReply {
struct ListAddonsReply {
from: String,
error: String,
message: String,
addons: Vec<AddonMsg>,
}

#[derive(RustcEncodable)]
enum AddonMsg {}

#[derive(RustcEncodable)]
struct ListTabsReply {
from: String,
@@ -57,10 +59,9 @@ impl Actor for RootActor {
stream: &mut TcpStream) -> Result<ActorMessageStatus, ()> {
Ok(match msg_type {
"listAddons" => {
let actor = ErrorReply {
let actor = ListAddonsReply {
from: "root".to_owned(),
error: "noAddons".to_owned(),
message: "This root actor has no browser addons.".to_owned(),
addons: vec![],
};
stream.write_json_packet(&actor);
ActorMessageStatus::Processed
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.