Yann Leboulanger pushed to branch master at gajim / gajim
Commits:
-
6f025a1d
by André Apitzsch at 2018-01-12T00:21:11+01:00
-
b84cd5b6
by Yann Leboulanger at 2018-01-15T09:55:25+01:00
11 changed files:
- gajim/app_actions.py
- gajim/chat_control.py
- gajim/chat_control_base.py
- gajim/conversation_textview.py
- gajim/dataforms_widget.py
- gajim/groupchat_control.py
- gajim/gtkgui_helpers.py
- gajim/gui_interface.py
- gajim/profile_window.py
- gajim/roster_window.py
- gajim/vcard.py
Changes:
| ... | ... | @@ -18,9 +18,6 @@ |
| 18 | 18 |
## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
|
| 19 | 19 |
##
|
| 20 | 20 |
|
| 21 |
-import sys
|
|
| 22 |
-import os
|
|
| 23 |
- |
|
| 24 | 21 |
from gi.repository import Gtk
|
| 25 | 22 |
|
| 26 | 23 |
from gajim.common import app
|
| ... | ... | @@ -39,22 +39,18 @@ from gajim import gui_menu_builder |
| 39 | 39 |
from gajim import message_control
|
| 40 | 40 |
from gajim import dialogs
|
| 41 | 41 |
|
| 42 |
-from gajim.common import logger
|
|
| 43 | 42 |
from gajim.common import app
|
| 44 | 43 |
from gajim.common import helpers
|
| 45 |
-from gajim.common import exceptions
|
|
| 46 | 44 |
from gajim.common import ged
|
| 47 | 45 |
from gajim.common import i18n
|
| 48 | 46 |
from gajim.common.stanza_session import EncryptedStanzaSession, ArchivingStanzaSession
|
| 49 | 47 |
from gajim.common.contacts import GC_Contact
|
| 50 | 48 |
from gajim.common.logger import KindConstant
|
| 51 | 49 |
from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC
|
| 52 |
-from nbxmpp.protocol import NS_ESESSION
|
|
| 53 | 50 |
from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO
|
| 54 | 51 |
from nbxmpp.protocol import NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER_5
|
| 55 | 52 |
from nbxmpp.protocol import NS_CHATSTATES
|
| 56 | 53 |
from gajim.common.connection_handlers_events import MessageOutgoingEvent
|
| 57 |
-from gajim.common.exceptions import GajimGeneralException
|
|
| 58 | 54 |
from gajim.common.const import AvatarSize
|
| 59 | 55 |
|
| 60 | 56 |
from gajim.command_system.implementation.hosts import ChatCommands
|
| ... | ... | @@ -27,7 +27,6 @@ |
| 27 | 27 |
## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
|
| 28 | 28 |
##
|
| 29 | 29 |
|
| 30 |
-import os
|
|
| 31 | 30 |
import time
|
| 32 | 31 |
from gi.repository import Gtk
|
| 33 | 32 |
from gi.repository import Gdk
|
| ... | ... | @@ -31,13 +31,11 @@ from threading import Timer # for smooth scrolling |
| 31 | 31 |
|
| 32 | 32 |
from gi.repository import Gtk
|
| 33 | 33 |
from gi.repository import Gdk
|
| 34 |
-from gi.repository import GdkPixbuf
|
|
| 35 | 34 |
from gi.repository import Pango
|
| 36 | 35 |
from gi.repository import GObject
|
| 37 | 36 |
from gi.repository import GLib
|
| 38 | 37 |
import time
|
| 39 | 38 |
import os
|
| 40 |
-from gajim import tooltips
|
|
| 41 | 39 |
from gajim import dialogs
|
| 42 | 40 |
import queue
|
| 43 | 41 |
import urllib
|
| ... | ... | @@ -51,7 +49,6 @@ from gajim.common.fuzzyclock import FuzzyClock |
| 51 | 49 |
from gajim import emoticons
|
| 52 | 50 |
|
| 53 | 51 |
from gajim.htmltextview import HtmlTextView
|
| 54 |
-from gajim.common.exceptions import GajimGeneralException
|
|
| 55 | 52 |
|
| 56 | 53 |
NOT_SHOWN = 0
|
| 57 | 54 |
ALREADY_RECEIVED = 1
|
| ... | ... | @@ -33,7 +33,6 @@ from gi.repository import GLib |
| 33 | 33 |
import base64
|
| 34 | 34 |
|
| 35 | 35 |
from gajim import gtkgui_helpers
|
| 36 |
-from gajim import dialogs
|
|
| 37 | 36 |
|
| 38 | 37 |
from gajim.common import dataforms
|
| 39 | 38 |
from gajim.common import helpers
|
| ... | ... | @@ -27,7 +27,6 @@ |
| 27 | 27 |
## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
|
| 28 | 28 |
##
|
| 29 | 29 |
|
| 30 |
-import os
|
|
| 31 | 30 |
import time
|
| 32 | 31 |
import locale
|
| 33 | 32 |
|
| ... | ... | @@ -84,7 +84,7 @@ def get_icon_path(icon_name, size=16): |
| 84 | 84 |
except GLib.GError as e:
|
| 85 | 85 |
log.error("Unable to find icon %s: %s" % (icon_name, str(e)))
|
| 86 | 86 |
|
| 87 |
-from gajim import vcard
|
|
| 87 |
+ |
|
| 88 | 88 |
from gajim import dialogs
|
| 89 | 89 |
|
| 90 | 90 |
|
| ... | ... | @@ -38,7 +38,6 @@ import os |
| 38 | 38 |
import sys
|
| 39 | 39 |
import re
|
| 40 | 40 |
import time
|
| 41 |
-import math
|
|
| 42 | 41 |
import hashlib
|
| 43 | 42 |
|
| 44 | 43 |
from gi.repository import Gtk
|
| ... | ... | @@ -27,14 +27,11 @@ from gi.repository import Gdk |
| 27 | 27 |
from gi.repository import GLib
|
| 28 | 28 |
from gi.repository import GdkPixbuf
|
| 29 | 29 |
import base64
|
| 30 |
-import os
|
|
| 31 | 30 |
import time
|
| 32 | 31 |
import logging
|
| 33 |
-import hashlib
|
|
| 34 | 32 |
|
| 35 | 33 |
from gajim import gtkgui_helpers
|
| 36 | 34 |
from gajim import dialogs
|
| 37 |
-from gajim import vcard
|
|
| 38 | 35 |
from gajim.common.const import AvatarSize
|
| 39 | 36 |
|
| 40 | 37 |
from gajim.common import app
|
| ... | ... | @@ -43,7 +43,6 @@ import os |
| 43 | 43 |
import sys
|
| 44 | 44 |
import time
|
| 45 | 45 |
import locale
|
| 46 |
-import hashlib
|
|
| 47 | 46 |
|
| 48 | 47 |
from enum import IntEnum, unique
|
| 49 | 48 |
|
| ... | ... | @@ -37,10 +37,7 @@ from gi.repository import Gdk |
| 37 | 37 |
from gi.repository import GdkPixbuf
|
| 38 | 38 |
import base64
|
| 39 | 39 |
import binascii
|
| 40 |
-import time
|
|
| 41 |
-import locale
|
|
| 42 | 40 |
import os
|
| 43 |
-# import logging
|
|
| 44 | 41 |
|
| 45 | 42 |
from gajim import gtkgui_helpers
|
| 46 | 43 |
|