Add compatibility for Gajim 1.1

whiteboard/manifest.ini

@@ -1,7 +1,7 @@
 [info]
 name: Whiteboard
 short_name: whiteboard
-version: 0.8
+version: 0.9
 description: Shows a whiteboard in chat. python-pygoocanvas is required.
 authors = Yann Leboulanger <asterix@lagaule.org>
 homepage = https://dev.gajim.org/gajim/gajim-plugins/wikis/WhiteboardPlugin

whiteboard/plugin.py

@@ -34,7 +34,6 @@ from gajim.plugins import GajimPlugin
 from gajim.plugins.gajimplugin import GajimPluginException
 from gajim.plugins.helpers import log_calls, log
 from nbxmpp import Message
-from gi.repository import Gtk
 from gi.repository import Gio
 from gi.repository import GLib
 from gajim import chat_control
@@ -44,7 +43,12 @@ from gajim.common.jingle_content import JingleContent
 from gajim.common.jingle_transport import JingleTransport, TransportType
 from gajim import dialogs
 from .whiteboard_widget import Whiteboard, HAS_GOOCANVAS
-from gajim.common import caps_cache
+
+# Since Gajim 1.1.0 _() has to be imported
+try:
+    from gajim.common.i18n import _
+except ImportError:
+    pass
 
 NS_JINGLE_XHTML = 'urn:xmpp:tmp:jingle:apps:xhtml'
 NS_JINGLE_SXE = 'urn:xmpp:tmp:jingle:transports:sxe'

whiteboard/whiteboard_widget.py

@@ -18,9 +18,17 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
+from nbxmpp import Node
 from gi.repository import Gtk
 
 from gajim.common import app
+
+# Since Gajim 1.1.0 _() has to be imported
+try:
+    from gajim.common.i18n import _
+except ImportError:
+    pass
+
 try:
     import gi
     gi.require_version('GooCanvas', '2.0')
@@ -28,7 +36,7 @@ try:
     HAS_GOOCANVAS = True
 except:
     HAS_GOOCANVAS = False
-from nbxmpp import Node
+
 
 try:
     from gajim.gtk.filechoosers import NativeFileChooserDialog, Filter