Remove lot of useless imports
Fix gajim-remote contact_info Fix profile_win right click on avatar Fix a call and a comment Thanks pyflakes (a program, not a person) for the whole.
This commit is contained in:
parent
54fc7cb2b9
commit
9347fe10e1
10 changed files with 4 additions and 17 deletions
|
@ -223,7 +223,7 @@ class Events:
|
||||||
return self._get_first_event_with_attribute(events)
|
return self._get_first_event_with_attribute(events)
|
||||||
|
|
||||||
def get_nb_roster_events(self, account = None, jid = None, types = []):
|
def get_nb_roster_events(self, account = None, jid = None, types = []):
|
||||||
'''returns the number of events displayedin roster'''
|
'''returns the number of events displayed in roster'''
|
||||||
return self._get_nb_events(attribute = 'roster', account = account,
|
return self._get_nb_events(attribute = 'roster', account = account,
|
||||||
jid = jid, types = types)
|
jid = jid, types = types)
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,6 @@ import common.sleepy
|
||||||
|
|
||||||
import gtkgui_helpers
|
import gtkgui_helpers
|
||||||
import dialogs
|
import dialogs
|
||||||
import vcard
|
|
||||||
import cell_renderer_image
|
import cell_renderer_image
|
||||||
import message_control
|
import message_control
|
||||||
import chat_control
|
import chat_control
|
||||||
|
|
|
@ -18,7 +18,6 @@ import gtk
|
||||||
import pango
|
import pango
|
||||||
import gobject
|
import gobject
|
||||||
import time
|
import time
|
||||||
import sys
|
|
||||||
import os
|
import os
|
||||||
import tooltips
|
import tooltips
|
||||||
import dialogs
|
import dialogs
|
||||||
|
|
|
@ -101,7 +101,7 @@ def get_advanced_notification(event, account, contact):
|
||||||
if tab_opened == 'both':
|
if tab_opened == 'both':
|
||||||
tab_opened_ok = True
|
tab_opened_ok = True
|
||||||
else:
|
else:
|
||||||
chat_control = helper.get_chat_control(account, contact)
|
chat_control = helpers.get_chat_control(account, contact)
|
||||||
if (chat_control and tab_opened == 'yes') or (not chat_control and \
|
if (chat_control and tab_opened == 'yes') or (not chat_control and \
|
||||||
tab_opened == 'no'):
|
tab_opened == 'no'):
|
||||||
tab_opened_ok = True
|
tab_opened_ok = True
|
||||||
|
|
|
@ -20,13 +20,10 @@ import gobject
|
||||||
import base64
|
import base64
|
||||||
import mimetypes
|
import mimetypes
|
||||||
import os
|
import os
|
||||||
import time
|
|
||||||
import locale
|
|
||||||
|
|
||||||
import gtkgui_helpers
|
import gtkgui_helpers
|
||||||
import dialogs
|
import dialogs
|
||||||
|
|
||||||
from common import helpers
|
|
||||||
from common import gajim
|
from common import gajim
|
||||||
from common.i18n import Q_
|
from common.i18n import Q_
|
||||||
|
|
||||||
|
@ -172,10 +169,7 @@ class ProfileWindow:
|
||||||
menu = gtk.Menu()
|
menu = gtk.Menu()
|
||||||
|
|
||||||
# Try to get pixbuf
|
# Try to get pixbuf
|
||||||
is_fake = False
|
pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(self.jid)
|
||||||
if account and gajim.contacts.is_pm_from_jid(account, jid):
|
|
||||||
is_fake = True
|
|
||||||
pixbuf = get_avatar_pixbuf_from_cache(jid, is_fake)
|
|
||||||
|
|
||||||
if pixbuf:
|
if pixbuf:
|
||||||
nick = gajim.config.get_per('accounts', self.account, 'name')
|
nick = gajim.config.get_per('accounts', self.account, 'name')
|
||||||
|
|
|
@ -307,7 +307,7 @@ class SignalObject(dbus.service.Object):
|
||||||
if not jid:
|
if not jid:
|
||||||
raise MissingArgument
|
raise MissingArgument
|
||||||
return None
|
return None
|
||||||
jid = self._get_real_jid(jid, account)
|
jid = self._get_real_jid(jid)
|
||||||
|
|
||||||
cached_vcard = gajim.connections.values()[0].get_cached_vcard(jid)
|
cached_vcard = gajim.connections.values()[0].get_cached_vcard(jid)
|
||||||
if cached_vcard:
|
if cached_vcard:
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
import gtk
|
import gtk
|
||||||
import gobject
|
import gobject
|
||||||
import os
|
import os
|
||||||
import sys
|
|
||||||
import time
|
import time
|
||||||
import urllib
|
import urllib
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
##
|
##
|
||||||
|
|
||||||
import gtk
|
import gtk
|
||||||
import gobject
|
|
||||||
import systray
|
import systray
|
||||||
|
|
||||||
from common import gajim
|
from common import gajim
|
||||||
|
|
|
@ -21,7 +21,6 @@ import time
|
||||||
import locale
|
import locale
|
||||||
|
|
||||||
import gtkgui_helpers
|
import gtkgui_helpers
|
||||||
import message_control
|
|
||||||
|
|
||||||
from common import gajim
|
from common import gajim
|
||||||
from common import helpers
|
from common import helpers
|
||||||
|
|
|
@ -19,8 +19,6 @@
|
||||||
import gtk
|
import gtk
|
||||||
import gobject
|
import gobject
|
||||||
import base64
|
import base64
|
||||||
import mimetypes
|
|
||||||
import os
|
|
||||||
import time
|
import time
|
||||||
import locale
|
import locale
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue