From b40992611171d4db4e0ce1188315637c6eabfff3 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Wed, 23 Mar 2016 20:04:58 +0100
Subject: Properly return an empty list in devtools' listAddons

---
 components/devtools/actors/root.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'components/devtools/actors/root.rs')

diff --git a/components/devtools/actors/root.rs b/components/devtools/actors/root.rs
index 0a589db3466..b9e6fee98c9 100644
--- a/components/devtools/actors/root.rs
+++ b/components/devtools/actors/root.rs
@@ -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
-- 
cgit v1.2.3