Yann Leboulanger pushed to branch master at gajim / gajim

Commits:

1 changed file:

Changes:

  • gajim/htmltextview.py
    ... ... @@ -50,7 +50,7 @@ import urllib
    50 50
     if __name__ == '__main__':
    
    51 51
         from gajim.common import i18n
    
    52 52
         import gajim.common.configpaths
    
    53
    -    app.common.configpaths.gajimpaths.init(None)
    
    53
    +    gajim.common.configpaths.gajimpaths.init(None)
    
    54 54
     from gajim.common import app
    
    55 55
     from gajim import gtkgui_helpers
    
    56 56
     from gajim.gtkgui_helpers import get_icon_pixmap
    
    ... ... @@ -1084,16 +1084,21 @@ class HtmlTextView(Gtk.TextView):
    1084 1084
     change_cursor = None
    
    1085 1085
     
    
    1086 1086
     if __name__ == '__main__':
    
    1087
    -    from conversation_textview import ConversationTextview
    
    1088
    -    import gajim as gaj
    
    1087
    +    from gajim.conversation_textview import ConversationTextview
    
    1088
    +    from gajim.gui_interface import Interface
    
    1089
    +    from gajim.common import app, logger, caps_cache
    
    1090
    +    app.logger = logger.Logger()
    
    1091
    +    caps_cache.initialize(app.logger)
    
    1089 1092
     
    
    1090
    -    log = logging.getLogger()
    
    1091
    -    gaj.Interface()
    
    1093
    +    Interface()
    
    1092 1094
     
    
    1093 1095
         # create fake app.plugin_manager.gui_extension_point method for tests
    
    1096
    +    def extension_point(*args):
    
    1097
    +        pass
    
    1094 1098
         def gui_extension_point(*args):
    
    1095 1099
             pass
    
    1096
    -    app.plugin_manager = gaj.Interface()
    
    1100
    +    app.plugin_manager = Interface()
    
    1101
    +    app.plugin_manager.extension_point = extension_point
    
    1097 1102
         app.plugin_manager.gui_extension_point = gui_extension_point
    
    1098 1103
     
    
    1099 1104
         htmlview = ConversationTextview(None)
    
    ... ... @@ -1108,7 +1113,7 @@ if __name__ == '__main__':
    1108 1113
             pointer = w.get_device_position(device)
    
    1109 1114
             x = pointer[1]
    
    1110 1115
             y = pointer[2]
    
    1111
    -        tags = htmlview.tv.get_iter_at_location(x, y).get_tags()
    
    1116
    +        tags = htmlview.tv.get_iter_at_location(x, y)[1].get_tags()
    
    1112 1117
             if change_cursor:
    
    1113 1118
                 w.set_cursor(gtkgui_helpers.get_cursor('XTERM'))
    
    1114 1119
                 change_cursor = None