[orca/gnome-3-20] Fix multiple-inheritance issue

[Joanmarie Diggs <joanied src gnome org>]

commit 204b855e587fa698bd333331a71192fc2d3c8aa7
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Apr 6 15:13:16 2016 -0400

    Fix multiple-inheritance issue

 .../scripts/apps/evolution/braille_generator.py    |    3 ++-
 .../scripts/apps/evolution/script_utilities.py     |    2 +-
 .../scripts/apps/evolution/speech_generator.py     |    3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/src/orca/scripts/apps/evolution/braille_generator.py 
b/src/orca/scripts/apps/evolution/braille_generator.py
index fccf795..fb329a8 100644
--- a/src/orca/scripts/apps/evolution/braille_generator.py
+++ b/src/orca/scripts/apps/evolution/braille_generator.py
@@ -26,9 +26,10 @@ __copyright__ = "Copyright (c) 2015 Igalia, S.L."
 __license__   = "LGPL"
 
 import orca.braille as braille
+import orca.braille_generator as braille_generator
 import orca.scripts.toolkits.WebKitGtk as WebKitGtk
 
-class BrailleGenerator(WebKitGtk.BrailleGenerator):
+class BrailleGenerator(WebKitGtk.BrailleGenerator, braille_generator.BrailleGenerator):
 
     def __init__(self, script):
         super().__init__(script)
diff --git a/src/orca/scripts/apps/evolution/script_utilities.py 
b/src/orca/scripts/apps/evolution/script_utilities.py
index 066d651..31a2f1c 100644
--- a/src/orca/scripts/apps/evolution/script_utilities.py
+++ b/src/orca/scripts/apps/evolution/script_utilities.py
@@ -30,7 +30,7 @@ import pyatspi
 import orca.scripts.toolkits.gtk as gtk
 import orca.scripts.toolkits.WebKitGtk as WebKitGtk
 
-class Utilities(WebKitGtk.Utilities):
+class Utilities(WebKitGtk.Utilities, gtk.Utilities):
 
     def __init__(self, script):
         super().__init__(script)
diff --git a/src/orca/scripts/apps/evolution/speech_generator.py 
b/src/orca/scripts/apps/evolution/speech_generator.py
index 87703b7..ce71c0c 100644
--- a/src/orca/scripts/apps/evolution/speech_generator.py
+++ b/src/orca/scripts/apps/evolution/speech_generator.py
@@ -28,8 +28,9 @@ __license__   = "LGPL"
 import pyatspi
 
 import orca.scripts.toolkits.WebKitGtk as WebKitGtk
+import orca.speech_generator as speech_generator
 
-class SpeechGenerator(WebKitGtk.SpeechGenerator):
+class SpeechGenerator(WebKitGtk.SpeechGenerator, speech_generator.SpeechGenerator):
 
     def __init__(self, script):
         super().__init__(script)