From 637f35b279cbfcaa727d0c387b67c342290147da Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Mon, 18 Apr 2005 08:54:47 +0000
Subject: [PATCH] we now launch gajim.py instead of gtkgui.py
---
src/{gtkgui.py => gajim.py} | 52 +++++++++++++++++--------------------
1 file changed, 24 insertions(+), 28 deletions(-)
rename src/{gtkgui.py => gajim.py} (95%)
diff --git a/src/gtkgui.py b/src/gajim.py
similarity index 95%
rename from src/gtkgui.py
rename to src/gajim.py
index 315a0f5cb0..b60b7fa9eb 100644
--- a/src/gtkgui.py
+++ b/src/gajim.py
@@ -1,4 +1,8 @@
-## gtkgui.py
+#!/bin/sh
+''':'
+exec python -OOtt "$0" ${1+"$@"}
+' '''
+## gajim.py
##
## Gajim Team:
## - Yann Le Boulanger <asterix@lagaule.org>
@@ -313,31 +317,25 @@ class interface:
elif self.roster.contacts[account].has_key(ji):
#It isn't an agent
self.roster.chg_user_status(user1, array[1], array[2], account)
- #inform the user about new contact online
- if old_show < 2 and new_show > 1:
- if gajim.config.get_per('soundevents', 'contact_connected', \
- 'enabled'):
- self.play_sound('contact_connected')
+ #play sound
+ if old_show < 2 and new_show > 1 and gajim.config.get_per( \
+ 'soundevents', 'contact_connected', 'enabled'):
+ self.play_sound('contact_connected')
if not self.windows[account]['chats'].has_key(jid) and \
not self.queues[account].has_key(jid) and \
gajim.config.get('notify_on_online'):
- #FIXME: check what is OUR STATUS and do the rest
- if gajim.config.get('autopopupaway'):
- instance = dialogs.Popup_window(self, 'Contact Online', jid, \
- account)
- self.roster.popup_windows.append(instance)
- elif old_show > 1 and new_show < 2:
- if gajim.config.get_per('soundevents', 'contact_disconnected', \
- 'enabled'):
- self.play_sound('contact_disconnected')
- if not self.windows[account]['chats'].has_key(jid) and \
- not self.queues[account].has_key(jid) and \
- gajim.config.get('notify_on_offline'):
- #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)
+ instance = dialogs.Popup_window(self, 'Contact Online', jid, \
+ account)
+ self.roster.popup_windows.append(instance)
+ elif old_show > 1 and new_show < 2 and gajim.config.get_per( \
+ 'soundevents', 'contact_disconnected', 'enabled'):
+ self.play_sound('contact_disconnected')
+ if not self.windows[account]['chats'].has_key(jid) and \
+ not self.queues[account].has_key(jid) and \
+ gajim.config.get('notify_on_offline'):
+ instance = dialogs.Popup_window(self, 'Contact Offline', jid, \
+ account)
+ self.roster.popup_windows.append(instance)
elif self.windows[account]['gc'].has_key(ji):
#it is a groupchat presence
@@ -359,10 +357,8 @@ class interface:
not self.queues[account].has_key(jid):
first = True
if gajim.config.get('notify_on_new_message'):
- #FIXME: check what is OUR STATUS (if we're online) and do the rest
- if gajim.config.get('autopopupaway'):
- instance = dialogs.Popup_window(self, 'New Message', jid, account)
- 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)
if gajim.config.get_per('soundevents', 'first_message_received', \
'enabled') and first:
@@ -748,7 +744,7 @@ class interface:
# get instances for windows/dialogs that will show_all()/hide()
self.windows['preferences'] = config.Preferences_window(self)
- self.windows['add_remove_emoticons'] = \
+ self.windows['add_remove_emoticons_window'] = \
config.Add_remove_emoticons_window(self)
self.windows['roster'] = self.roster
--
GitLab