copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

we now launch gajim.py instead of gtkgui.py

Browse source
This commit is contained in:
Yann Leboulanger 2005-04-18 08:54:47 +00:00
parent 85217c33a9
commit 637f35b279
1 changed files with 24 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/gtkgui.py → src/gajim.py
View file

@ -1,4 +1,8 @@
## gtkgui.py #!/bin/sh
''':'
exec python -OOtt "$0" ${1+"$@"}
' '''
## gajim.py
## ##
## Gajim Team: ## Gajim Team:
## - Yann Le Boulanger <asterix@lagaule.org> ## - Yann Le Boulanger <asterix@lagaule.org>
@ -313,31 +317,25 @@ class interface:
elif self.roster.contacts[account].has_key(ji): elif self.roster.contacts[account].has_key(ji):
#It isn't an agent #It isn't an agent
self.roster.chg_user_status(user1, array[1], array[2], account) self.roster.chg_user_status(user1, array[1], array[2], account)
#inform the user about new contact online #play sound
if old_show < 2 and new_show > 1: if old_show < 2 and new_show > 1 and gajim.config.get_per( \
if gajim.config.get_per('soundevents', 'contact_connected', \ 'soundevents', 'contact_connected', 'enabled'):
'enabled'): self.play_sound('contact_connected')
self.play_sound('contact_connected')
if not self.windows[account]['chats'].has_key(jid) and \ if not self.windows[account]['chats'].has_key(jid) and \
not self.queues[account].has_key(jid) and \ not self.queues[account].has_key(jid) and \
gajim.config.get('notify_on_online'): gajim.config.get('notify_on_online'):
#FIXME: check what is OUR STATUS and do the rest instance = dialogs.Popup_window(self, 'Contact Online', jid, \
if gajim.config.get('autopopupaway'): account)
instance = dialogs.Popup_window(self, 'Contact Online', jid, \ self.roster.popup_windows.append(instance)
account) elif old_show > 1 and new_show < 2 and gajim.config.get_per( \
self.roster.popup_windows.append(instance) 'soundevents', 'contact_disconnected', 'enabled'):
elif old_show > 1 and new_show < 2: self.play_sound('contact_disconnected')
if gajim.config.get_per('soundevents', 'contact_disconnected', \ if not self.windows[account]['chats'].has_key(jid) and \
'enabled'): not self.queues[account].has_key(jid) and \
self.play_sound('contact_disconnected') gajim.config.get('notify_on_offline'):
if not self.windows[account]['chats'].has_key(jid) and \ instance = dialogs.Popup_window(self, 'Contact Offline', jid, \
not self.queues[account].has_key(jid) and \ account)
gajim.config.get('notify_on_offline'): self.roster.popup_windows.append(instance)
#FIXME: check what is OUR STATUS and do the rest
if gajim.config.get('autopopupaway'):
instance = dialogs.Popup_window(self, 'Contact Offline', jid, \
account)
self.roster.popup_windows.append(instance)
elif self.windows[account]['gc'].has_key(ji): elif self.windows[account]['gc'].has_key(ji):
#it is a groupchat presence #it is a groupchat presence
@ -359,10 +357,8 @@ class interface:
not self.queues[account].has_key(jid): not self.queues[account].has_key(jid):
first = True first = True
if gajim.config.get('notify_on_new_message'): if gajim.config.get('notify_on_new_message'):
#FIXME: check what is OUR STATUS (if we're online) and do the rest instance = dialogs.Popup_window(self, 'New Message', jid, account)
if gajim.config.get('autopopupaway'): self.roster.popup_windows.append(instance)
instance = dialogs.Popup_window(self, 'New Message', jid, account)
self.roster.popup_windows.append(instance)
self.roster.on_message(jid, array[1], array[2], account) self.roster.on_message(jid, array[1], array[2], account)
if gajim.config.get_per('soundevents', 'first_message_received', \ if gajim.config.get_per('soundevents', 'first_message_received', \
'enabled') and first: 'enabled') and first:
@ -748,7 +744,7 @@ class interface:
# get instances for windows/dialogs that will show_all()/hide() # get instances for windows/dialogs that will show_all()/hide()
self.windows['preferences'] = config.Preferences_window(self) self.windows['preferences'] = config.Preferences_window(self)
self.windows['add_remove_emoticons'] = \ self.windows['add_remove_emoticons_window'] = \
config.Add_remove_emoticons_window(self) config.Add_remove_emoticons_window(self)
self.windows['roster'] = self.roster self.windows['roster'] = self.roster