Commits July 2006

commits@gajim.org

5 participants
109 discussions

[commit-gajim] r6613 - trunk/src
by asterix＠gajim.org 28 Jul '06

28 Jul '06

Author: asterix Date: 2006-07-28 08:40:37 +0200 (Fri, 28 Jul 2006) New Revision: 6613 Modified: trunk/src/message_window.py Log: when we open a second tab and conversation textview was scrolled down in the forst one, scroll it down after we show tabs. Fixes #2190 Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2006-07-28 05:54:46 UTC (rev 6612) +++ trunk/src/message_window.py 2006-07-28 06:40:37 UTC (rev 6613) @@ -22,6 +22,7 @@ ## import gtk +import gobject import common import gtkgui_helpers @@ -149,8 +150,17 @@ fjid = control.get_full_jid() self._controls[control.account][fjid] = control - if self.get_num_controls() > 1: + if self.get_num_controls() == 2: + # is first conversation_textview scrolled down ? + scrolled = False + first_widget = self.notebook.get_nth_page(0) + ctrl = self._widget_to_control(first_widget) + conv_textview = ctrl.conv_textview + if conv_textview.at_the_end(): + scrolled = True self.notebook.set_show_tabs(True) + if scrolled: + gobject.idle_add(conv_textview.scroll_to_end_iter) self.alignment.set_property('top-padding', 2) # Add notebook page and connect up to the tab's close button

1 0

[commit-gajim] r6612 - trunk/src
by asterix＠gajim.org 28 Jul '06

28 Jul '06

Author: asterix Date: 2006-07-28 07:54:46 +0200 (Fri, 28 Jul 2006) New Revision: 6612 Modified: trunk/src/gajim.py trunk/src/systray.py Log: don't show tray icon when we don't want to. Fixes #2188 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2006-07-27 20:36:21 UTC (rev 6611) +++ trunk/src/gajim.py 2006-07-28 05:54:46 UTC (rev 6612) @@ -1437,8 +1437,8 @@ self.systray.show_icon() def hide_systray(self): + self.systray_enabled = False self.systray.hide_icon() - self.systray_enabled = False def image_is_ok(self, image): if not os.path.exists(image): Modified: trunk/src/systray.py =================================================================== --- trunk/src/systray.py 2006-07-27 20:36:21 UTC (rev 6611) +++ trunk/src/systray.py 2006-07-28 05:54:46 UTC (rev 6612) @@ -345,7 +345,8 @@ def on_tray_destroyed(self, widget): '''re-add trayicon when systray is destroyed''' self.t = None - self.show_icon() + if gajim.interface.systray_enabled: + self.show_icon() def show_icon(self): if not self.t:

1 0

[commit-gajim] r6611 - branches/zeroconf_network/src/common/zeroconf
by sb＠gajim.org 27 Jul '06

27 Jul '06

Author: sb Date: 2006-07-27 22:36:21 +0200 (Thu, 27 Jul 2006) New Revision: 6611 Modified: branches/zeroconf_network/src/common/zeroconf/client_zeroconf.py branches/zeroconf_network/src/common/zeroconf/connection_handlers_zeroconf.py branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py branches/zeroconf_network/src/common/zeroconf/roster_zeroconf.py branches/zeroconf_network/src/common/zeroconf/zeroconf.py Log: display full name on roster if available Modified: branches/zeroconf_network/src/common/zeroconf/client_zeroconf.py =================================================================== --- branches/zeroconf_network/src/common/zeroconf/client_zeroconf.py 2006-07-27 10:54:12 UTC (rev 6610) +++ branches/zeroconf_network/src/common/zeroconf/client_zeroconf.py 2006-07-27 20:36:21 UTC (rev 6611) @@ -1,4 +1,18 @@ +## common/zeroconf/client_zeroconf.py +## +## Copyright (C) 2006 Stefan Bethge <stefan(a)lanpartei.de> +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 2 only. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## + from common.zeroconf import roster_zeroconf class ClientZeroconf: Modified: branches/zeroconf_network/src/common/zeroconf/connection_handlers_zeroconf.py =================================================================== --- branches/zeroconf_network/src/common/zeroconf/connection_handlers_zeroconf.py 2006-07-27 10:54:12 UTC (rev 6610) +++ branches/zeroconf_network/src/common/zeroconf/connection_handlers_zeroconf.py 2006-07-27 20:36:21 UTC (rev 6611) @@ -6,6 +6,7 @@ ## - Nikos Kouremenos <nkour(a)jabber.org> ## - Dimitur Kirov <dkirov(a)gmail.com> ## - Travis Shirk <travis(a)pobox.com> +## - Stefan Bethge <stefan(a)lanpartei.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published Modified: branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py =================================================================== --- branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py 2006-07-27 10:54:12 UTC (rev 6610) +++ branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py 2006-07-27 20:36:21 UTC (rev 6611) @@ -1,19 +1,21 @@ -## common/connection_zeroconf.py +## common/zeroconf/connection_zeroconf.py ## ## Contributors for this file: ## - Yann Le Boulanger <asterix(a)lagaule.org> ## - Nikos Kouremenos <nkour(a)jabber.org> ## - Dimitur Kirov <dkirov(a)gmail.com> ## - Travis Shirk <travis(a)pobox.com> +## - Stefan Bethge <stefan(a)lanpartei.de> ## ## Copyright (C) 2003-2004 Yann Le Boulanger <asterix(a)lagaule.org> ## Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005 Yann Le Boulanger <asterix(a)lagaule.org> +## Copyright (C) 2006 Yann Le Boulanger <asterix(a)lagaule.org> ## Vincent Hanquez <tab(a)snarc.org> ## Nikos Kouremenos <nkour(a)jabber.org> ## Dimitur Kirov <dkirov(a)gmail.com> ## Travis Shirk <travis(a)pobox.com> ## Norman Rasmussen <norman(a)rasmussen.co.za> +## Stefan Bethge <stefan(a)lanpartei.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published @@ -121,14 +123,11 @@ '''always passes account name as first param''' self.put_event((event, data)) - def _reconnect(self): gajim.log.debug('reconnect') signed = self.get_signed_msg(self.status) - - def quit(self, kill_core): if kill_core and self.connected > 1: @@ -172,9 +171,9 @@ # callbacks called from zeroconf def _on_new_service(self,jid): - self.roster.setItem(jid) + self.roster.setItem(jid) display_jid = self.zeroconf.check_jid(jid) - self.dispatch('ROSTER_INFO', (display_jid, display_jid, 'both', 'no', self.roster.getGroups(jid))) + self.dispatch('ROSTER_INFO', (display_jid, self.roster.getName(jid), 'both', 'no', self.roster.getGroups(jid))) self.dispatch('NOTIFY', (display_jid, self.roster.getStatus(jid), self.roster.getMessage(jid), 'local', 0, None, 0)) @@ -198,7 +197,7 @@ #display contacts already detected and resolved for jid in self.roster.keys(): display_jid = self.zeroconf.check_jid(jid) - self.dispatch('ROSTER_INFO', (display_jid, display_jid, 'both', 'no', self.roster.getGroups(jid))) + self.dispatch('ROSTER_INFO', (display_jid, self.roster.getName(jid), 'both', 'no', self.roster.getGroups(jid))) self.dispatch('NOTIFY', (display_jid, self.roster.getStatus(jid), self.roster.getMessage(jid), 'local', 0, None, 0)) self.connected = STATUS_LIST.index(show) Modified: branches/zeroconf_network/src/common/zeroconf/roster_zeroconf.py =================================================================== --- branches/zeroconf_network/src/common/zeroconf/roster_zeroconf.py 2006-07-27 10:54:12 UTC (rev 6610) +++ branches/zeroconf_network/src/common/zeroconf/roster_zeroconf.py 2006-07-27 20:36:21 UTC (rev 6611) @@ -1,3 +1,18 @@ +## common/zeroconf/roster_zeroconf.py +## +## Copyright (C) 2006 Stefan Bethge <stefan(a)lanpartei.de> +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 2 only. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## + + from common.zeroconf import zeroconf class Roster: @@ -36,7 +51,6 @@ = self.zeroconf.get_contact(jid) self._data[jid]={} - self._data[jid]['name']=jid[:jid.find('@')] self._data[jid]['ask'] = 'no' #? self._data[jid]['subscription'] = 'both' self._data[jid]['groups'] = [] @@ -49,6 +63,10 @@ status = txt_dict['status'] else: status = '' + if txt_dict.has_key('1st') and txt_dict.has_key('last'): + self._data[jid]['name']=txt_dict['1st']+' '+txt_dict['last'] + else: + self._data[jid]['name']=jid if status == 'avail': status = 'online' self._data[jid]['txt_dict'] = txt_dict if not self._data[jid]['txt_dict'].has_key('msg'): @@ -91,7 +109,10 @@ def getGroups(self, jid): return self._data[jid]['groups'] - + def getName(self, jid): + if self._data.has_key(jid): + return self._data[jid]['name'] + def getStatus(self, jid): if self._data.has_key(jid): return self._data[jid]['status'] Modified: branches/zeroconf_network/src/common/zeroconf/zeroconf.py =================================================================== --- branches/zeroconf_network/src/common/zeroconf/zeroconf.py 2006-07-27 10:54:12 UTC (rev 6610) +++ branches/zeroconf_network/src/common/zeroconf/zeroconf.py 2006-07-27 20:36:21 UTC (rev 6611) @@ -1,3 +1,17 @@ +## common/zeroconf/zeroconf.py +## +## Copyright (C) 2006 Stefan Bethge <stefan(a)lanpartei.de> +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 2 only. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## + import os import sys import socket @@ -95,6 +109,8 @@ return items def service_resolved_callback(self, interface, protocol, name, stype, domain, host, aprotocol, address, port, txt, flags): + print "Service data for service '%s' in domain '%s' on %i.%i:" % (name, domain, interface, protocol) + print "\tHost %s (%s), port %i, TXT data: %s" % (host, address, port, str(avahi.txt_array_to_string_array(txt))) self.contacts[name] = (name, domain, interface, protocol, host, address, port, txt) self.new_serviceCB(name) @@ -155,7 +171,7 @@ self.txt['port.p2pj'] = self.port self.txt['version'] = 1 - self.txt['textvers'] = 1 + self.txt['txtvers'] = 1 # replace gajim's status messages with proper ones if self.txt.has_key('status'):

1 0

[commit-gajim] r6610 - trunk/src
by asterix＠gajim.org 27 Jul '06

27 Jul '06

Author: asterix Date: 2006-07-27 12:54:12 +0200 (Thu, 27 Jul 2006) New Revision: 6610 Modified: trunk/src/chat_control.py trunk/src/conversation_textview.py trunk/src/groupchat_control.py Log: move the draw og the focus out line to conversation_textview.py reset focus_out_end_iter_offset var when we clear the textview. Fixes #2175 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2006-07-26 19:01:01 UTC (rev 6609) +++ trunk/src/chat_control.py 2006-07-27 10:54:12 UTC (rev 6610) @@ -250,7 +250,7 @@ if event.state & gtk.gdk.CONTROL_MASK: # CTRL + l|L: clear conv_textview if event.keyval == gtk.keysyms.l or event.keyval == gtk.keysyms.L: - self.conv_textview.tv.get_buffer().set_text('') + self.conv_textview.clear() return True # CTRL + v: Paste into msg_textview elif event.keyval == gtk.keysyms.v: Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2006-07-26 19:01:01 UTC (rev 6609) +++ trunk/src/conversation_textview.py 2006-07-27 10:54:12 UTC (rev 6610) @@ -28,6 +28,7 @@ import gobject import time import sys +import os import tooltips import dialogs import locale @@ -132,6 +133,10 @@ buffer.create_tag('focus-out-line', justification = gtk.JUSTIFY_CENTER) + self.allow_focus_out_line = True + # holds the iter's offset which points to the end of --- line + self.focus_out_end_iter_offset = None + self.line_tooltip = tooltips.BaseTooltip() def del_handlers(self): @@ -187,6 +192,68 @@ self.tv.scroll_to_iter(end_iter, 0, False, 1, 1) return False # when called in an idle_add, just do it once + def show_focus_out_line(self): + if not self.allow_focus_out_line: + # if room did not receive focus-in from the last time we added + # --- line then do not readd + return + + print_focus_out_line = False + buffer = self.tv.get_buffer() + + if self.focus_out_end_iter_offset is None: + # this happens only first time we focus out on this room + print_focus_out_line = True + + else: + if self.focus_out_end_iter_offset != buffer.get_end_iter().\ + get_offset(): + # this means after last-focus something was printed + # (else end_iter's offset is the same as before) + # only then print ---- line (eg. we avoid printing many following + # ---- lines) + print_focus_out_line = True + + if print_focus_out_line and buffer.get_char_count() > 0: + buffer.begin_user_action() + + # remove previous focus out line if such focus out line exists + if self.focus_out_end_iter_offset is not None: + end_iter_for_previous_line = buffer.get_iter_at_offset( + self.focus_out_end_iter_offset) + begin_iter_for_previous_line = end_iter_for_previous_line.copy() + # img_char+1 (the '\n') + begin_iter_for_previous_line.backward_chars(2) + + # remove focus out line + buffer.delete(begin_iter_for_previous_line, + end_iter_for_previous_line) + + # add the new focus out line + # FIXME: Why is this loaded from disk everytime + path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'muc_separator.png') + focus_out_line_pixbuf = gtk.gdk.pixbuf_new_from_file(path_to_file) + end_iter = buffer.get_end_iter() + buffer.insert(end_iter, '\n') + buffer.insert_pixbuf(end_iter, focus_out_line_pixbuf) + + end_iter = buffer.get_end_iter() + before_img_iter = end_iter.copy() + before_img_iter.backward_char() # one char back (an image also takes one char) + buffer.apply_tag_by_name('focus-out-line', before_img_iter, end_iter) + #FIXME: remove this workaround when bug is fixed + # c http://bugzilla.gnome.org/show_bug.cgi?id=318569 + + self.allow_focus_out_line = False + + # update the iter we hold to make comparison the next time + self.focus_out_end_iter_offset = buffer.get_end_iter().get_offset() + + buffer.end_user_action() + + # scroll to the end (via idle in case the scrollbar has appeared) + gobject.idle_add(self.scroll_to_end) + def show_line_tooltip(self): pointer = self.tv.get_pointer() x, y = self.tv.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT, pointer[0], @@ -241,6 +308,7 @@ buffer = self.tv.get_buffer() start, end = buffer.get_bounds() buffer.delete(start, end) + self.focus_out_end_iter_offset = None def visit_url_from_menuitem(self, widget, link): '''basically it filters out the widget instance''' Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2006-07-26 19:01:01 UTC (rev 6609) +++ trunk/src/groupchat_control.py 2006-07-27 10:54:12 UTC (rev 6610) @@ -196,10 +196,6 @@ self.tooltip = tooltips.GCTooltip() - self.allow_focus_out_line = True - # holds the iter's offset which points to the end of --- line - self.focus_out_end_iter_offset = None - # connect the menuitems to their respective functions xm = gtkgui_helpers.get_glade('gc_control_popup_menu.glade') @@ -332,7 +328,7 @@ def _on_window_focus_in_event(self, widget, event): '''When window gets focus''' if self.parent_win.get_active_jid() == self.room_jid: - self.allow_focus_out_line = True + self.conv_textview.allow_focus_out_line = True def on_treeview_size_allocate(self, widget, allocation): '''The MUC treeview has resized. Move the hpaned in all tabs to match''' @@ -603,65 +599,8 @@ # we have full focus (we are reading it!) return - if not self.allow_focus_out_line: - # if room did not receive focus-in from the last time we added - # --- line then do not readd - return + self.conv_textview.show_focus_out_line() - print_focus_out_line = False - buffer = self.conv_textview.tv.get_buffer() - - if self.focus_out_end_iter_offset is None: - # this happens only first time we focus out on this room - print_focus_out_line = True - - else: - if self.focus_out_end_iter_offset != buffer.get_end_iter().get_offset(): - # this means after last-focus something was printed - # (else end_iter's offset is the same as before) - # only then print ---- line (eg. we avoid printing many following - # ---- lines) - print_focus_out_line = True - - if print_focus_out_line and buffer.get_char_count() > 0: - buffer.begin_user_action() - - # remove previous focus out line if such focus out line exists - if self.focus_out_end_iter_offset is not None: - end_iter_for_previous_line = buffer.get_iter_at_offset( - self.focus_out_end_iter_offset) - begin_iter_for_previous_line = end_iter_for_previous_line.copy() - begin_iter_for_previous_line.backward_chars(2) # img_char+1 (the '\n') - - # remove focus out line - buffer.delete(begin_iter_for_previous_line, - end_iter_for_previous_line) - - # add the new focus out line - # FIXME: Why is this loaded from disk everytime - path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'muc_separator.png') - focus_out_line_pixbuf = gtk.gdk.pixbuf_new_from_file(path_to_file) - end_iter = buffer.get_end_iter() - buffer.insert(end_iter, '\n') - buffer.insert_pixbuf(end_iter, focus_out_line_pixbuf) - - end_iter = buffer.get_end_iter() - before_img_iter = end_iter.copy() - before_img_iter.backward_char() # one char back (an image also takes one char) - buffer.apply_tag_by_name('focus-out-line', before_img_iter, end_iter) - #FIXME: remove this workaround when bug is fixed - # c http://bugzilla.gnome.org/show_bug.cgi?id=318569 - - self.allow_focus_out_line = False - - # update the iter we hold to make comparison the next time - self.focus_out_end_iter_offset = buffer.get_end_iter().get_offset() - - buffer.end_user_action() - - # scroll to the end (via idle in case the scrollbar has appeared) - gobject.idle_add(self.conv_textview.scroll_to_end) - def needs_visual_notification(self, text): '''checks text to see whether any of the words in (muc_highlight_words and nick) appear.'''

1 0

[commit-gajim] r6609 - trunk/src
by asterix＠gajim.org 26 Jul '06

26 Jul '06

Author: asterix Date: 2006-07-26 21:01:01 +0200 (Wed, 26 Jul 2006) New Revision: 6609 Modified: trunk/src/systray.py Log: re-add trayicon to systray when it is destroyed. Fixes #2121 Modified: trunk/src/systray.py =================================================================== --- trunk/src/systray.py 2006-07-26 12:49:11 UTC (rev 6608) +++ trunk/src/systray.py 2006-07-26 19:01:01 UTC (rev 6609) @@ -45,7 +45,7 @@ '''Class for icon in the notification area This class is both base class (for systraywin32.py) and normal class for trayicon in GNU/Linux''' - + def __init__(self): self.jids = [] # Contain things like [account, jid, type_of_msg] self.single_message_handler_id = None @@ -90,7 +90,7 @@ if global_status is not None and self.status != global_status: self.status = global_status self.set_img() - + def start_chat(self, widget, account, jid): contact = gajim.contacts.get_first_contact_from_jid(account, jid) if gajim.interface.msg_win_mgr.has_window(jid, account): @@ -101,13 +101,13 @@ gajim.interface.roster.new_chat(contact, account) gajim.interface.msg_win_mgr.get_window(jid, account).set_active_tab( jid, account) - + def on_single_message_menuitem_activate(self, widget, account): dialogs.SingleMessageWindow(account, action = 'send') def on_new_chat(self, widget, account): dialogs.NewChatDialog(account) - + def make_menu(self, event = None): '''create chat with and new message (sub) menus/menuitems event is None when we're in Windows @@ -120,7 +120,7 @@ single_message_menuitem = self.xml.get_widget('single_message_menuitem') status_menuitem = self.xml.get_widget('status_menu') join_gc_menuitem = self.xml.get_widget('join_gc_menuitem') - + if self.single_message_handler_id: single_message_menuitem.handler_disconnect( self.single_message_handler_id) @@ -132,7 +132,7 @@ sub_menu = gtk.Menu() self.popup_menus.append(sub_menu) status_menuitem.set_submenu(sub_menu) - + gc_sub_menu = gtk.Menu() # gc is always a submenu join_gc_menuitem.set_submenu(gc_sub_menu) @@ -177,7 +177,7 @@ chat_with_menuitem.set_sensitive(iskey) single_message_menuitem.set_sensitive(iskey) join_gc_menuitem.set_sensitive(iskey) - + if connected_accounts >= 2: # 2 or more connections? make submenus account_menu_for_chat_with = gtk.Menu() chat_with_menuitem.set_submenu(account_menu_for_chat_with) @@ -186,7 +186,7 @@ account_menu_for_single_message = gtk.Menu() single_message_menuitem.set_submenu(account_menu_for_single_message) self.popup_menus.append(account_menu_for_single_message) - + accounts_list = gajim.contacts.get_accounts() accounts_list.sort() for account in accounts_list: @@ -210,7 +210,7 @@ gc_item.add(label) gc_sub_menu.append(gc_item) gajim.interface.roster.add_bookmarks_list(gc_sub_menu, account) - + elif connected_accounts == 1: # one account # one account connected, no need to show 'as jid' for account in gajim.connections: @@ -225,7 +225,7 @@ # join gc gajim.interface.roster.add_bookmarks_list(gc_sub_menu, account) break # No other connected account - + if event is None: # None means windows (we explicitly popup in systraywin32.py) if self.added_hide_menuitem is False: @@ -233,9 +233,10 @@ item = gtk.MenuItem(_('Hide this menu')) self.systray_context_menu.prepend(item) self.added_hide_menuitem = True - + else: # GNU and Unices - self.systray_context_menu.popup(None, None, None, event.button, event.time) + self.systray_context_menu.popup(None, None, None, event.button, + event.time) self.systray_context_menu.show_all() def on_show_all_events_menuitem_activate(self, widget): @@ -261,7 +262,7 @@ # no pending events, so toggle visible/hidden for roster window if win.get_property('visible'): # visible in ANY virtual desktop? win.hide() # we hide it from VD that was visible in - + # but we could be in another VD right now. eg vd2 # and we want not only to hide it in vd1 but also show it in vd2 gtkgui_helpers.possibly_move_window_in_current_desktop(win) @@ -293,7 +294,7 @@ self.on_middle_click() elif event.button == 3: # right click self.make_menu(event) - + def on_show_menuitem_activate(self, widget, show): # we all add some fake (we cannot select those nor have them as show) # but this helps to align with roster's status_combobox index positions @@ -322,7 +323,7 @@ if self.tooltip.id == position: size = widget.window.get_size() self.tooltip.show_tooltip('', size[1], position[1]) - + def on_tray_motion_notify_event(self, widget, event): wireq=widget.size_request() position = widget.window.get_origin() @@ -334,16 +335,22 @@ self.tooltip.id = position self.tooltip.timeout = gobject.timeout_add(500, self.show_tooltip, widget) - + def on_tray_leave_notify_event(self, widget, event): position = widget.window.get_origin() if self.tooltip.timeout > 0 and \ self.tooltip.id == position: self.tooltip.hide_tooltip() - + + def on_tray_destroyed(self, widget): + '''re-add trayicon when systray is destroyed''' + self.t = None + self.show_icon() + def show_icon(self): if not self.t: self.t = trayicon.TrayIcon('Gajim') + self.t.connect('destroy', self.on_tray_destroyed) eb = gtk.EventBox() # avoid draw seperate bg color in some gtk themes eb.set_visible_window(False) @@ -358,7 +365,7 @@ self.t.add(eb) self.set_img() self.t.show_all() - + def hide_icon(self): if self.t: self.t.destroy()

1 0

[commit-gajim] r6608 - trunk/src/common/xmpp
by dkirov＠gajim.org 26 Jul '06

26 Jul '06

Author: dkirov Date: 2006-07-26 14:49:11 +0200 (Wed, 26 Jul 2006) New Revision: 6608 Modified: trunk/src/common/xmpp/client_nb.py trunk/src/common/xmpp/transports_nb.py Log: escape from sslerror due to broken protocol Modified: trunk/src/common/xmpp/client_nb.py =================================================================== --- trunk/src/common/xmpp/client_nb.py 2006-07-26 12:01:14 UTC (rev 6607) +++ trunk/src/common/xmpp/client_nb.py 2006-07-26 12:49:11 UTC (rev 6608) @@ -127,11 +127,10 @@ def _on_connected(self): self.connected = 'tcp' if (self._Ssl is None and self.Connection.getPort() in (5223, 443)) or self._Ssl: - try: - transports_nb.NonBlockingTLS().PlugIn(self, now=1) - self.connected = 'ssl' - except socket.sslerror: + transports_nb.NonBlockingTLS().PlugIn(self, now=1) + if not self.Connection: # ssl error, stream is closed return + self.connected = 'ssl' self.onreceive(self._on_receive_document_attrs) dispatcher_nb.Dispatcher().PlugIn(self) @@ -194,6 +193,8 @@ self.isplugged = True self.onreceive(None) transports_nb.NonBlockingTLS().PlugIn(self) + if not self.Connection: # ssl error, stream is closed + return True if not self.Dispatcher.Stream._document_attrs.has_key('version') or \ not self.Dispatcher.Stream._document_attrs['version']=='1.0': self._is_connected() Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2006-07-26 12:01:14 UTC (rev 6607) +++ trunk/src/common/xmpp/transports_nb.py 2006-07-26 12:49:11 UTC (rev 6608) @@ -371,8 +371,12 @@ PlugIn.PlugIn(self, owner) DBG_LINE='NonBlockingTLS' self.on_tls_start = on_tls_start - if now: - res = self._startSSL() + if now: + try: + res = self._startSSL() + except Exception, e: + self._owner.socket.pollend() + return self.tls_start() return res if self._owner.Dispatcher.Stream.features: @@ -434,7 +438,11 @@ self.DEBUG('Got starttls response: ' + self.starttls,'error') return self.DEBUG('Got starttls proceed response. Switching to TLS/SSL...','ok') - self._startSSL() + try: + self._startSSL() + except Exception, e: + self._owner.socket.pollend() + return self._owner.Dispatcher.PlugOut() dispatcher_nb.Dispatcher().PlugIn(self._owner)

1 0

[commit-gajim] r6607 - in trunk/src: . common
by asterix＠gajim.org 26 Jul '06

26 Jul '06

Author: asterix Date: 2006-07-26 14:01:14 +0200 (Wed, 26 Jul 2006) New Revision: 6607 Modified: trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/config.py trunk/src/roster_window.py Log: if server doesn't support vcard, don't allow user to modify it. Fixes #2182 Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2006-07-26 11:13:07 UTC (rev 6606) +++ trunk/src/common/connection.py 2006-07-26 12:01:14 UTC (rev 6607) @@ -85,6 +85,7 @@ self.retrycount = 0 self.jids_for_auto_auth = [] # list of jid to auto-authorize self.muc_jid = None + self.vcard_supported = True # END __init__ def build_user_nick(self, user_nick): Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2006-07-26 11:13:07 UTC (rev 6606) +++ trunk/src/common/connection_handlers.py 2006-07-26 12:01:14 UTC (rev 6607) @@ -855,7 +855,10 @@ id = self.connection.getAnID() iq.setID(id) - self.awaiting_answers[id] = (VCARD_ARRIVED, jid) + j = jid + if not j: + j = gajim.get_jid_from_account(self.name) + self.awaiting_answers[id] = (VCARD_ARRIVED, j) if is_fake_jid: room_jid, nick = gajim.get_room_and_nick_from_fjid(jid) if not room_jid in self.room_jids: @@ -943,9 +946,12 @@ elif self.awaiting_answers[id][0] == VCARD_ARRIVED: # If vcard is empty, we send to the interface an empty vcard so that # it knows it arrived - if not iq_obj.getTag('vCard'): - jid = self.awaiting_answers[id][1] - our_jid = gajim.get_jid_from_account(self.name) + jid = self.awaiting_answers[id][1] + our_jid = gajim.get_jid_from_account(self.name) + if iq_obj.getType() == 'error' and jid == our_jid: + # our server doesn't support vcard + self.vcard_supported = False + if not iq_obj.getTag('vCard') or iq_obj.getType() == 'error': if jid and jid != our_jid: # Write an empty file self.save_vcard_to_hd(jid, '') Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2006-07-26 11:13:07 UTC (rev 6606) +++ trunk/src/config.py 2006-07-26 12:01:14 UTC (rev 6607) @@ -1415,6 +1415,11 @@ _('Without a connection, you can not edit your personal information.')) return + if not gajim.connections[self.account].vcard_supported: + dialogs.ErrorDialog(_("Your server doesn't support Vcard"), + _("Your server can't save your personal information.")) + return + gajim.interface.edit_own_details(self.account) def on_manage_proxies_button_clicked(self, widget): Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-07-26 11:13:07 UTC (rev 6606) +++ trunk/src/roster_window.py 2006-07-26 12:01:14 UTC (rev 6607) @@ -767,8 +767,7 @@ add_sub_menu = gtk.Menu() disco_sub_menu = gtk.Menu() new_chat_sub_menu = gtk.Menu() - profile_avatar_sub_menu = gtk.Menu() - + for account in gajim.connections: if gajim.connections[account].connected <= 1: # if offline or connecting @@ -792,16 +791,12 @@ add_item = gtk.MenuItem(_('to %s account') % account, False) add_sub_menu.append(add_item) add_item.connect('activate', self.on_add_new_contact, account) - add_new_contact_menuitem.set_submenu(add_sub_menu) - add_sub_menu.show_all() # disco disco_item = gtk.MenuItem(_('using %s account') % account, False) disco_sub_menu.append(disco_item) disco_item.connect('activate', self.on_service_disco_menuitem_activate, account) - service_disco_menuitem.set_submenu(disco_sub_menu) - disco_sub_menu.show_all() # new chat new_chat_item = gtk.MenuItem(_('using account %s') % account, @@ -809,18 +804,14 @@ new_chat_sub_menu.append(new_chat_item) new_chat_item.connect('activate', self.on_new_chat_menuitem_activate, account) - new_chat_menuitem.set_submenu(new_chat_sub_menu) - new_chat_sub_menu.show_all() - - # profile, avatar - profile_avatar_item = gtk.MenuItem(_('of account %s') % account, - False) - profile_avatar_sub_menu.append(profile_avatar_item) - profile_avatar_item.connect('activate', - self.on_profile_avatar_menuitem_activate, account) - profile_avatar_menuitem.set_submenu(profile_avatar_sub_menu) - profile_avatar_sub_menu.show_all() + add_new_contact_menuitem.set_submenu(add_sub_menu) + add_sub_menu.show_all() + service_disco_menuitem.set_submenu(disco_sub_menu) + disco_sub_menu.show_all() + new_chat_menuitem.set_submenu(new_chat_sub_menu) + new_chat_sub_menu.show_all() + elif connected_accounts == 1: # user has only one account for account in gajim.connections: if gajim.connections[account].connected > 1: # THE connected account @@ -847,12 +838,6 @@ gtk.keysyms.n, gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) self.have_new_chat_accel = True - # profile, avatar - if not self.profile_avatar_menuitem_handler_id: - self.profile_avatar_menuitem_handler_id = \ - profile_avatar_menuitem.connect('activate', self.\ - on_profile_avatar_menuitem_activate, account) - break # No other account connected if connected_accounts == 0: @@ -861,17 +846,45 @@ join_gc_menuitem.set_sensitive(False) add_new_contact_menuitem.set_sensitive(False) service_disco_menuitem.set_sensitive(False) - profile_avatar_menuitem.set_sensitive(False) else: # we have one or more connected accounts new_chat_menuitem.set_sensitive(True) join_gc_menuitem.set_sensitive(True) add_new_contact_menuitem.set_sensitive(True) service_disco_menuitem.set_sensitive(True) - profile_avatar_menuitem.set_sensitive(True) # show the 'manage gc bookmarks' item newitem = gtk.SeparatorMenuItem() # separator gc_sub_menu.append(newitem) + connected_accounts_with_vcard = [] + for account in gajim.connections: + if gajim.connections[account].connected > 1 and \ + gajim.connections[account].vcard_supported: + connected_accounts_with_vcard.append(account) + if len(connected_accounts_with_vcard) > 1: + # 2 or more accounts? make submenus + profile_avatar_sub_menu = gtk.Menu() + for account in connected_accounts_with_vcard: + # profile, avatar + profile_avatar_item = gtk.MenuItem(_('of account %s') % account, + False) + profile_avatar_sub_menu.append(profile_avatar_item) + profile_avatar_item.connect('activate', + self.on_profile_avatar_menuitem_activate, account) + profile_avatar_menuitem.set_submenu(profile_avatar_sub_menu) + profile_avatar_sub_menu.show_all() + elif len(connected_accounts_with_vcard) == 1: # user has only one account + account = connected_accounts_with_vcard[0] + # profile, avatar + if not self.profile_avatar_menuitem_handler_id: + self.profile_avatar_menuitem_handler_id = \ + profile_avatar_menuitem.connect('activate', self.\ + on_profile_avatar_menuitem_activate, account) + + if len(connected_accounts_with_vcard) == 0: + profile_avatar_menuitem.set_sensitive(False) + else: + profile_avatar_menuitem.set_sensitive(True) + newitem = gtk.ImageMenuItem(_('Manage Bookmarks...')) img = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES, gtk.ICON_SIZE_MENU)

1 0

[commit-gajim] r6606 - trunk/src/common
by asterix＠gajim.org 26 Jul '06

26 Jul '06

Author: asterix Date: 2006-07-26 13:13:07 +0200 (Wed, 26 Jul 2006) New Revision: 6606 Modified: trunk/src/common/connection_handlers.py Log: we now detect loop when server isn't RFC complient and handle badly subscription acknoledgment. Fixes #1864 Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2006-07-26 09:05:33 UTC (rev 6605) +++ trunk/src/common/connection_handlers.py 2006-07-26 11:13:07 UTC (rev 6606) @@ -1055,6 +1055,9 @@ # keep the jids we auto added (transports contacts) to not send the # SUBSCRIBED event to gui self.automatically_added = [] + # keep the latest subscribed event for each jid to prevent loop when we + # acknoledge presences + self.subscribed_events = {} try: idle.init() except: @@ -1528,7 +1531,20 @@ if jid_stripped in self.automatically_added: self.automatically_added.remove(jid_stripped) else: - self.dispatch('SUBSCRIBED', (jid_stripped, resource)) + # detect a subscription loop + if not self.subscribed_events.has_key(jid_stripped): + self.subscribed_events[jid_stripped] = [] + self.subscribed_events[jid_stripped].append(time.time()) + block = False + if len(self.subscribed_events[jid_stripped]) > 5: + if time.time() - self.subscribed_events[jid_stripped][0] < 5: + block = True + self.subscribed_events[jid_stripped] = self.subscribed_events[jid_stripped][1:] + if block: + gajim.config.set_per('account', self.name, + 'dont_ack_subscription', True) + else: + self.dispatch('SUBSCRIBED', (jid_stripped, resource)) # BE CAREFUL: no con.updateRosterItem() in a callback gajim.log.debug(_('we are now subscribed to %s') % who) elif ptype == 'unsubscribe':

1 0

[commit-gajim] r6605 - trunk/src
by asterix＠gajim.org 26 Jul '06

26 Jul '06

Author: asterix Date: 2006-07-26 11:05:33 +0200 (Wed, 26 Jul 2006) New Revision: 6605 Modified: trunk/src/dialogs.py Log: fix minor TB when there is no image file in a folder and we browse it Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-07-26 08:12:14 UTC (rev 6604) +++ trunk/src/dialogs.py 2006-07-26 09:05:33 UTC (rev 6605) @@ -2097,6 +2097,8 @@ def on_ok(widget, callback): '''check if file exists and call callback''' path_to_file = self.get_filename() + if not path_to_file: + return path_to_file = gtkgui_helpers.decode_filechooser_file_paths( (path_to_file,))[0] if os.path.exists(path_to_file):

1 0

[commit-gajim] r6604 - trunk/src
by asterix＠gajim.org 26 Jul '06

26 Jul '06

Author: asterix Date: 2006-07-26 10:12:14 +0200 (Wed, 26 Jul 2006) New Revision: 6604 Modified: trunk/src/roster_window.py Log: typo Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-07-25 23:47:26 UTC (rev 6603) +++ trunk/src/roster_window.py 2006-07-26 08:12:14 UTC (rev 6604) @@ -2629,7 +2629,7 @@ def on_roster_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: model, list_of_paths = self.tree.get_selection().get_selected_rows() - if not len(list_of_path) and gajim.interface.systray_enabled and \ + if not len(list_of_paths) and gajim.interface.systray_enabled and \ not gajim.config.get('quit_on_roster_x_button'): self.tooltip.hide_tooltip() self.window.hide()

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2006