Merge branch 'split-chat-control-base' into 'master'

Split ChatControlBase into its own file

See merge request !21

src/config.py

@@ -45,7 +45,7 @@ import gtkgui_helpers
 import dialogs
 import cell_renderer_image
 import message_control
-import chat_control
+from chat_control_base import ChatControlBase
 import dataforms_widget
 import profile_window
 
@@ -690,7 +690,7 @@ class PreferencesWindow:
 
     def apply_speller(self):
         for ctrl in self._get_all_controls():
-            if isinstance(ctrl, chat_control.ChatControlBase):
+            if isinstance(ctrl, ChatControlBase):
                 try:
                     spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview)
                 except (TypeError, RuntimeError, OSError):
@@ -701,7 +701,7 @@ class PreferencesWindow:
 
     def remove_speller(self):
         for ctrl in self._get_all_controls():
-            if isinstance(ctrl, chat_control.ChatControlBase):
+            if isinstance(ctrl, ChatControlBase):
                 try:
                     spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview)
                 except (TypeError, RuntimeError):

src/groupchat_control.py

@@ -54,7 +54,7 @@ from common import ged
 from common import i18n
 
 from chat_control import ChatControl
-from chat_control import ChatControlBase
+from chat_control_base import ChatControlBase
 from common.exceptions import GajimGeneralException
 
 from command_system.implementation.hosts import PrivateChatCommands

src/gui_interface.py

@@ -61,7 +61,7 @@ import dialogs
 import notify
 import message_control
 
-from chat_control import ChatControlBase
+from chat_control_base import ChatControlBase
 from chat_control import ChatControl
 from groupchat_control import GroupchatControl
 from groupchat_control import PrivateChatControl

src/message_window.py

@@ -38,7 +38,7 @@ import common
 import gtkgui_helpers
 import message_control
 import dialogs
-from chat_control import ChatControlBase
+from chat_control_base import ChatControlBase
 
 from common import gajim