gajim: fix saving _last_SHOW activity / mood when we unset them.
changeset 0c82fb7e2840 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=0c82fb7e2840
description: fix saving _last_SHOW activity / mood when we unset them.
diffstat:
src/dialogs.py | 18 +-
1 files changed, 9 insertions(+), 9 deletions(-)
diffs (48 lines):
diff -r 19808e1ac164 -r 0c82fb7e2840 src/dialogs.py
--- a/src/dialogs.pyWed Jul 22 00:13:28 2009 +0200
+++ b/src/dialogs.pyWed Jul 22 08:55:25 2009 +0200
@@ -670,18 +670,18 @@
msg = helpers.to_one_line(message)
if self.show:
gajim.config.set_per('statusmsg', '_last_' +
self.show, 'message',
-msg)
+ msg)
if self.show_pep:
gajim.config.set_per('statusmsg',
'_last_' + self.show,
-
'activity', self.pep_dict['activity'])
+ 'activity',
self.pep_dict['activity'])
gajim.config.set_per('statusmsg',
'_last_' + self.show,
-
'subactivity', self.pep_dict['subactivity'])
+ 'subactivity',
self.pep_dict['subactivity'])
gajim.config.set_per('statusmsg',
'_last_' + self.show,
-
'activity_text', self.pep_dict['activity_text'])
+ 'activity_text',
self.pep_dict['activity_text'])
gajim.config.set_per('statusmsg',
'_last_' + self.show, 'mood',
-
self.pep_dict['mood'])
+ self.pep_dict['mood'])
gajim.config.set_per('statusmsg',
'_last_' + self.show,
-
'mood_text', self.pep_dict['mood_text'])
+ 'mood_text',
self.pep_dict['mood_text'])
else:
message = None # user pressed Cancel button or X wm
button
self.window.destroy()
@@ -763,8 +763,8 @@
def on_activity_button_clicked(self, widget):
self.countdown_enabled = False
def on_response(activity, subactivity, text):
- self.pep_dict['activity'] = activity
- self.pep_dict['subactivity'] = subactivity
+ self.pep_dict['activity'] = activity or ''
+ self.pep_dict['subactivity'] = subactivity or ''
self.pep_dict['activity_text'] = text
self.draw_activity()
ChangeActivityDialog(on_response, self.pep_dict['activity'],
@@ -773,7 +773,7 @@
def on_mood_button_clicked(self, widget):
self.countdown_enabled = False
def on_response(mood, text):
- self.pep_dict['mood'] = mood
+ self.pep_dict['mood'] = mood or ''
self.pep_dict['mood_text'] = text
self.draw_mood()
ChangeMoodDialog(on_response, self.pep_dict['mood'],
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: correct log for zeroconf_avahi.py
changeset b5316b6bf52b in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=b5316b6bf52b
description: correct log for zeroconf_avahi.py
diffstat:
src/common/zeroconf/zeroconf_avahi.py | 49
1 files changed, 25 insertions(+), 24 deletions(-)
diffs (183 lines):
diff -r 4a3f896130ad -r b5316b6bf52b src/common/zeroconf/zeroconf_avahi.py
--- a/src/common/zeroconf/zeroconf_avahi.py Wed Jul 22 09:30:24 2009 +0200
+++ b/src/common/zeroconf/zeroconf_avahi.py Wed Jul 22 09:49:56 2009 +0200
@@ -17,7 +17,8 @@
## along with Gajim. If not, see http://www.gnu.org/licenses/.
##
-from common import gajim
+import logging
+log = logging.getLogger('gajim.c.z.zeroconf_avahi')
try:
import dbus.glib
@@ -62,10 +63,10 @@
pass
def error_callback1(self, err):
- gajim.log.debug('Error while resolving: ' + str(err))
+ log.debug('Error while resolving: ' + str(err))
def error_callback(self, err):
- gajim.log.debug(str(err))
+ log.debug(str(err))
# timeouts are non-critical
if str(err) != 'Timeout reached':
self.disconnect()
@@ -73,7 +74,7 @@
def new_service_callback(self, interface, protocol, name, stype, domain,
flags):
- gajim.log.debug('Found service %s in domain %s on %i.%i.' %
(name, domain,
+ log.debug('Found service %s in domain %s on %i.%i.' % (name,
domain,
interface, protocol))
if not self.connected:
return
@@ -86,7 +87,7 @@
def remove_service_callback(self, interface, protocol, name, stype,
domain,
flags):
- gajim.log.debug('Service %s in domain %s on %i.%i disappeared.'
% (name,
+ log.debug('Service %s in domain %s on %i.%i disappeared.' %
(name,
domain, interface, protocol))
if not self.connected:
return
@@ -142,9 +143,9 @@
def service_resolved_callback(self, interface, protocol, name, stype,
domain,
host, aprotocol, address, port, txt, flags):
- gajim.log.debug('Service data for service %s in domain %s on
%i.%i:'
+ log.debug('Service data for service %s in domain %s on %i.%i:'
% (name, domain, interface, protocol))
- gajim.log.debug('Host %s (%s), port %i, TXT data: %s' % (host,
address,
+ log.debug('Host %s (%s), port %i, TXT data: %s' % (host,
address,
port, self.txt_array_to_dict(txt)))
if not self.connected:
return
@@ -178,16 +179,16 @@
port, bare_name, txt)
def service_added_callback(self):
- gajim.log.debug('Service successfully added')
+ log.debug('Service successfully added')
def service_committed_callback(self):
- gajim.log.debug('Service successfully committed')
+ log.debug('Service successfully committed')
def service_updated_callback(self):
- gajim.log.debug('Service successfully updated')
+ log.debug('Service successfully updated')
def service_add_fail_callback(self, err):
- gajim.log.debug('Error while adding service. %s' % str(err))
+ log.debug('Error while adding service. %s' % str(err))
if 'Local name collision' in str(err):
alternative_name =
self.server.GetAlternativeServiceName(self.username)
self.name_conflictCB(alternative_name)
@@ -196,7 +197,7 @@
self.disconnect()
def server_state_changed_callback(self, state, error):
- gajim.log.debug('server state changed to %s' % state)
+ log.debug('server state changed to %s' % state)
if state == self.avahi.SERVER_RUNNING:
self.create_service()
elif state in (self.avahi.SERVER_COLLISION,
@@ -205,17 +206,17 @@
self.entrygroup.Reset()
elif state == self.avahi.CLIENT_FAILURE:
# does it ever go here?
- gajim.log.debug('CLIENT FAILURE')
+ log.debug('CLIENT FAILURE')
def entrygroup_state_changed_callback(self, state, error):
# the name is already present, so recreate
if state == self.avahi.ENTRY_GROUP_COLLISION:
- gajim.log.debug('zeroconf.py: local name collision')
+ log.debug('zeroconf.py: local name collision')
self.service_add_fail_callback('Local name collision')
elif state == self.avahi.ENTRY_GROUP_FAILURE:
self.disconnect()
gajim: prevent traceback when we get an empty roster item exchan...
changeset 171fa64bf28e in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=171fa64bf28e
description: prevent traceback when we get an empty roster item exchange message
diffstat:
src/common/connection_handlers.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diffs (12 lines):
diff -r b5316b6bf52b -r 171fa64bf28e src/common/connection_handlers.py
--- a/src/common/connection_handlers.py Wed Jul 22 09:49:56 2009 +0200
+++ b/src/common/connection_handlers.py Wed Jul 22 10:48:28 2009 +0200
@@ -1820,6 +1820,8 @@
exchange_items_list = {}
jid_from = helpers.get_full_jid_from_iq(msg)
items_list = msg.getTag('x').getChildren()
+ if not items_list:
+ return
action = items_list[0].getAttr('action')
if action == None:
action = 'add'
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: fix roster item exchange remove suggestion
changeset 7a3317130f53 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=7a3317130f53
description: fix roster item exchange remove suggestion
diffstat:
src/dialogs.py | 7 +++
1 files changed, 3 insertions(+), 4 deletions(-)
diffs (26 lines):
diff -r 171fa64bf28e -r 7a3317130f53 src/dialogs.py
--- a/src/dialogs.pyWed Jul 22 10:48:28 2009 +0200
+++ b/src/dialogs.pyWed Jul 22 10:48:41 2009 +0200
@@ -2891,7 +2891,7 @@
groups = groups + group
else:
groups = groups + group + ', '
- if not is_right and is_in_roster:
+ if is_in_roster:
iter = model.append()
model.set(iter, 0, True, 1, jid, 2,
name, 3, groups)
@@ -2962,11 +2962,10 @@
# it is selected
jid = model[iter][1].decode('utf-8')
gajim.connections[self.account].unsubscribe(jid)
- for c in
gajim.contacts.get_contact(self.account, jid):
- self.remove_contact(c,
self.account)
+
gajim.interface.roster.remove_contact(jid, self.account)
gajim.contacts.remove_jid(self.account,
jid)
iter = model.iter_next(iter)
- InformationDialog('Added %s contacts' % str(a))
+ InformationDialog('Removed %s contacts' % str(a))
self.window.destroy()
def on_cancel_button_clicked(self, widget):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: some coding standards
changeset 87cc2dcddca9 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=87cc2dcddca9
description: some coding standards
diffstat:
src/dialogs.py | 90
1 files changed, 49 insertions(+), 41 deletions(-)
diffs (221 lines):
diff -r 7a3317130f53 -r 87cc2dcddca9 src/dialogs.py
--- a/src/dialogs.pyWed Jul 22 10:48:41 2009 +0200
+++ b/src/dialogs.pyWed Jul 22 10:58:49 2009 +0200
@@ -2737,7 +2737,7 @@
if gajim.connections[self.account].connected = 1:
#if offline or connecting
ErrorDialog(_('Connection not available'),
- _('Please make sure you are
connected with %s.') % self.account)
+ _('Please make sure you are connected with
%s.') % self.account)
return
begin_iter, end_iter = self.input_tv_buffer.get_bounds()
stanza = self.input_tv_buffer.get_text(begin_iter,
end_iter).decode(
@@ -2748,18 +2748,16 @@
def on_presence_button_clicked(self, widget):
self.input_tv_buffer.set_text(
-
'presenceshow/showstatus/statuspriority/priority/presence'
- )
+
'presenceshow/showstatus/statuspriority/priority'
+ '/presence')
def on_iq_button_clicked(self, widget):
self.input_tv_buffer.set_text(
- 'iq to= type=query xmlns=/query/iq'
- )
+ 'iq to= type=query xmlns=/query/iq')
def on_message_button_clicked(self, widget):
self.input_tv_buffer.set_text(
- 'message to= type=body/body/message'
- )
+ 'message to= type=body/body/message')
def on_expander_activate(self, widget):
if not widget.get_expanded(): # it's the opposite!
@@ -2768,7 +2766,8 @@
class RosterItemExchangeWindow:
''' Windows used when someone send you a exchange contact suggestion '''
- def __init__(self, account, action, exchange_list, jid_from,
message_body=None):
+ def __init__(self, account, action, exchange_list, jid_from,
+ message_body=None):
self.account = account
self.action = action
self.exchange_list = exchange_list
@@ -2781,14 +2780,14 @@
# Add Widgets.
for widget_to_add in ['cancel_button', 'accept_button',
'type_label',
-
'body_scrolledwindow', 'body_textview', 'items_list_treeview']:
+ 'body_scrolledwindow', 'body_textview', 'items_list_treeview']:
self.__dict__[widget_to_add] =
self.xml.get_widget(widget_to_add)
# Set labels
- #self.action can be 'add', 'modify' or 'remove'
+ # self.action can be 'add', 'modify' or 'remove'
self.type_label.set_label(\
- _('b%s/b would like you to b%s/b some contacts
in your roster.') \
- % (jid_from, _(self.action)))
+ _('b%s/b would like you to b%s/b some contacts
in your '
+ 'roster.') % (jid_from, _(self.action)))
if message_body:
buffer = self.body_textview.get_buffer()
buffer.set_text(self.message_body)
@@ -2801,17 +2800,23 @@
renderer1 = gtk.CellRendererToggle()
renderer1.set_property('activatable', True)
renderer1.connect('toggled', self.toggled_callback)
- self.items_list_treeview.insert_column_with_attributes(-1,
-
_(self.action), renderer1, active =
0)
+ if self.action == 'add':
+ title = _('Add')
+ elif self.action == 'modify':
+ title = _('Modify')
+ elif self.action == 'delete':
+ title = _('Delete')
+ self.items_list_treeview.insert_column_with_attributes(-1,
title,
+ renderer1, active=0)
renderer2 = gtk.CellRendererText()
- self.items_list_treeview.insert_column_with_attributes(-1,
-
_('Jabber ID'), renderer2, text = 1)
+ self.items_list_treeview.insert_column_with_attributes(-1,
_('Jabber ID'),
+ renderer2, text=1)
renderer3 = gtk.CellRendererText()
- self.items_list_treeview.insert_column_with_attributes(-1,
-
