diff --git a/src/config.py b/src/config.py index 56c9ff73c..1ddbd9936 100644 --- a/src/config.py +++ b/src/config.py @@ -67,10 +67,10 @@ class Preferences_window: ('notify_on_new_message_radiobutton') self.popup_new_message_radiobutton = self.xml.get_widget \ ('popup_new_message_radiobutton') - self.notify_on_online_checkbutton = self.xml.get_widget \ - ('notify_on_online_checkbutton') - self.notify_on_offline_checkbutton = self.xml.get_widget \ - ('notify_on_offline_checkbutton') + self.notify_on_signin_checkbutton = self.xml.get_widget \ + ('notify_on_signin_checkbutton') + self.notify_on_signout_checkbutton = self.xml.get_widget \ + ('notify_on_signout_checkbutton') self.auto_popup_away_checkbutton = self.xml.get_widget \ ('auto_popup_away_checkbutton') self.auto_away_checkbutton = self.xml.get_widget('auto_away_checkbutton') @@ -219,12 +219,12 @@ class Preferences_window: self.xml.get_widget('only_in_roster_radiobutton').set_active(True) #notify on online statuses - st = gajim.config.get('notify_on_online') - self.notify_on_online_checkbutton.set_active(st) + st = gajim.config.get('notify_on_signin') + self.notify_on_signin_checkbutton.set_active(st) #notify on offline statuses - st = gajim.config.get('notify_on_offline') - self.notify_on_offline_checkbutton.set_active(st) + st = gajim.config.get('notify_on_signout') + self.notify_on_signout_checkbutton.set_active(st) #autopopupaway st = gajim.config.get('autopopupaway') @@ -678,11 +678,11 @@ class Preferences_window: if widget.get_active(): self.auto_popup_away_checkbutton.set_sensitive(False) - def on_notify_on_online_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'notify_on_online') + def on_notify_on_signin_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'notify_on_signin') - def on_notify_on_offline_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'notify_on_offline') + def on_notify_on_signout_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'notify_on_signout') def on_auto_popup_away_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'autopopupaway') diff --git a/src/gajim.py b/src/gajim.py index 14fff2267..f2251ccd7 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -283,7 +283,7 @@ class Interface: 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') and \ + gajim.config.get('notify_on_signin') and \ self.allow_notifications[account]: show_notification = False # check OUR status and if we allow notifications for that status @@ -302,7 +302,7 @@ class Interface: 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'): + gajim.config.get('notify_on_signout'): show_notification = False # check OUR status and if we allow notifications for that status if gajim.config.get('autopopupaway'): # always notify diff --git a/src/gtkgui.glade b/src/gtkgui.glade index 0610d3870..a97ee26c3 100644 --- a/src/gtkgui.glade +++ b/src/gtkgui.glade @@ -826,7 +826,7 @@ True - Resource is sent to the jabber server in order to 'seperate' the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the messages. (see below) + Resource is sent to the Jabber server in order to 'seperate' the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below) True True True @@ -4419,7 +4419,7 @@ True - Notify me about contacts going: + Notify me about contacts that: False False GTK_JUSTIFY_LEFT @@ -4438,18 +4438,18 @@ - + True - Gajim will notify you via a popup window in the bottom right of the screen about contacts that just went online + Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed in True - _Online + Sign _in True GTK_RELIEF_NORMAL True False False True - + 0 @@ -4459,18 +4459,18 @@ - + True - Gajim will notify you via a popup window in the bottom right of the screen about contacts that just went offline + Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out True - Of_fline + Sign _out True GTK_RELIEF_NORMAL True False False True - + 0 @@ -4539,7 +4539,7 @@ True - Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, cause it blocks all messags from every contact you don't have in the roster and might want to sent you a message + Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, cause it blocks all messages from any contact that is not in the roster. True _Ignore events from contacts not in the roster True