Commits March 2007

commits@gajim.org

4 participants
62 discussions

[commit-gajim] r8010 - in trunk: data/glade src src/common
by asterix＠gajim.org 11 Mar '07

11 Mar '07

Author: asterix Date: 2007-03-11 21:14:53 +0100 (Sun, 11 Mar 2007) New Revision: 8010 Modified: trunk/data/glade/gc_control_popup_menu.glade trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/dialogs.py trunk/src/groupchat_control.py Log: ability to destroy a room when we are owner, give a reason and alternative room jid. fixes #3031 Modified: trunk/data/glade/gc_control_popup_menu.glade =================================================================== --- trunk/data/glade/gc_control_popup_menu.glade 2007-03-11 08:58:08 UTC (rev 8009) +++ trunk/data/glade/gc_control_popup_menu.glade 2007-03-11 20:14:53 UTC (rev 8010) @@ -12,7 +12,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1359"> + <widget class="GtkImage" id="image1378"> <property name="visible">True</property> <property name="stock">gtk-justify-fill</property> <property name="icon_size">1</property> @@ -31,7 +31,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1360"> + <widget class="GtkImage" id="image1379"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> <property name="icon_size">1</property> @@ -45,12 +45,32 @@ </child> <child> + <widget class="GtkImageMenuItem" id="destroy_room_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Destroy room</property> + <property name="use_underline">True</property> + + <child internal-child="image"> + <widget class="GtkImage" id="image1380"> + <property name="visible">True</property> + <property name="stock">gtk-delete</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> + + <child> <widget class="GtkImageMenuItem" id="change_subject_menuitem"> <property name="label" translatable="yes">Change _Subject</property> <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1361"> + <widget class="GtkImage" id="image1381"> <property name="visible">True</property> <property name="stock">gtk-edit</property> <property name="icon_size">1</property> @@ -69,7 +89,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1362"> + <widget class="GtkImage" id="image1382"> <property name="visible">True</property> <property name="stock">gtk-redo</property> <property name="icon_size">1</property> @@ -88,7 +108,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1363"> + <widget class="GtkImage" id="image1383"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-03-11 08:58:08 UTC (rev 8009) +++ trunk/src/common/connection.py 2007-03-11 20:14:53 UTC (rev 8010) @@ -1160,10 +1160,24 @@ self.connection.send(msg_iq) def request_gc_config(self, room_jid): + if not self.connection: + return iq = common.xmpp.Iq(typ = 'get', queryNS = common.xmpp.NS_MUC_OWNER, to = room_jid) self.connection.send(iq) + def destroy_gc_room(self, room_jid, reason = '', jid = ''): + if not self.connection: + return + iq = common.xmpp.Iq(typ = 'set', queryNS = common.xmpp.NS_MUC_OWNER, + to = room_jid) + destroy = iq.getTag('query').setTag('destroy') + if reason: + destroy.setTagData('reason', reason) + if jid: + destroy.setAttr('jid', jid) + self.connection.send(iq) + def send_gc_status(self, nick, jid, show, status): if not self.connection: return Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-03-11 08:58:08 UTC (rev 8009) +++ trunk/src/common/connection_handlers.py 2007-03-11 20:14:53 UTC (rev 8010) @@ -1547,6 +1547,7 @@ timestamp = None is_gc = False # is it a GC presence ? sigTag = None + ns_muc_user_x = None avatar_sha = None # JEP-0172 User Nickname user_nick = prs.getTagData('nick') @@ -1558,16 +1559,18 @@ namespace = x.getNamespace() if namespace.startswith(common.xmpp.NS_MUC): is_gc = True - if namespace == common.xmpp.NS_SIGNED: + if namespace == common.xmpp.NS_MUC_USER and x.getTag('destroy'): + ns_muc_user_x = x + elif namespace == common.xmpp.NS_SIGNED: sigTag = x - if namespace == common.xmpp.NS_VCARD_UPDATE: + elif namespace == common.xmpp.NS_VCARD_UPDATE: avatar_sha = x.getTagData('photo') - if namespace == common.xmpp.NS_DELAY: + elif namespace == common.xmpp.NS_DELAY: # JEP-0091 tim = prs.getTimestamp() tim = time.strptime(tim, '%Y%m%dT%H:%M:%S') timestamp = time.localtime(timegm(tim)) - if namespace == 'http://delx.cjb.net/protocol/roster-subsync': + elif namespace == 'http://delx.cjb.net/protocol/roster-subsync': # see http://trac.gajim.org/ticket/326 agent = gajim.get_server_from_jid(jid_stripped) if self.connection.getRoster().getItem(agent): # to be sure it's a transport contact @@ -1667,10 +1670,24 @@ else: # save sha in mem NOW self.vcard_shas[who] = avatar_sha + if ns_muc_user_x: + # Room has been destroyed. see + # http://www.xmpp.org/extensions/xep-0045.html#destroyroom + reason = _('Room has been destroyed') + destroy = ns_muc_user_x.getTag('destroy') + r = destroy.getTagData('reason') + if r: + reason += ' (%s)' % r + jid = destroy.getAttr('jid') + if jid: + reason += '\n' + _('You can join this room instead: %s') % jid + statusCode = 'destroyed' + else: + reason = prs.getReason() + statusCode = prs.getStatusCode() self.dispatch('GC_NOTIFY', (jid_stripped, show, status, resource, prs.getRole(), prs.getAffiliation(), prs.getJid(), - prs.getReason(), prs.getActor(), prs.getStatusCode(), - prs.getNewNick())) + reason, prs.getActor(), statusCode, prs.getNewNick())) return if ptype == 'subscribe': Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-03-11 08:58:08 UTC (rev 8009) +++ trunk/src/dialogs.py 2007-03-11 20:14:53 UTC (rev 8010) @@ -1049,6 +1049,62 @@ self.dialog.destroy() return response +class DubbleInputDialog: + '''Class for Dubble Input dialog''' + def __init__(self, title, label_str1, label_str2, input_str1 = None, + input_str2 = None, is_modal = True, ok_handler = None, + cancel_handler = None): + # if modal is True you also need to call get_response() + # and ok_handler won't be used + self.xml = gtkgui_helpers.get_glade('dubbleinput_dialog.glade') + self.dialog = self.xml.get_widget('dubbleinput_dialog') + label1 = self.xml.get_widget('label1') + self.input_entry1 = self.xml.get_widget('input_entry1') + label2 = self.xml.get_widget('label2') + self.input_entry2 = self.xml.get_widget('input_entry2') + self.dialog.set_title(title) + label1.set_markup(label_str1) + label2.set_markup(label_str2) + self.cancel_handler = cancel_handler + if input_str1: + self.input_entry1.set_text(input_str1) + self.input_entry1.select_region(0, -1) # select all + if input_str2: + self.input_entry2.set_text(input_str2) + self.input_entry2.select_region(0, -1) # select all + + self.is_modal = is_modal + if not is_modal and ok_handler is not None: + self.ok_handler = ok_handler + okbutton = self.xml.get_widget('okbutton') + okbutton.connect('clicked', self.on_okbutton_clicked) + cancelbutton = self.xml.get_widget('cancelbutton') + cancelbutton.connect('clicked', self.on_cancelbutton_clicked) + self.xml.signal_autoconnect(self) + self.dialog.show_all() + + def on_dubbleinput_dialog_destroy(self, widget): + if self.cancel_handler: + self.cancel_handler() + + def on_okbutton_clicked(self, widget): + user_input1 = self.input_entry1.get_text().decode('utf-8') + user_input2 = self.input_entry2.get_text().decode('utf-8') + self.dialog.destroy() + if isinstance(self.ok_handler, tuple): + self.ok_handler[0](user_input1, user_input2, *self.ok_handler[1:]) + else: + self.ok_handler(user_input1, user_input2) + + def on_cancelbutton_clicked(self, widget): + self.dialog.destroy() + + def get_response(self): + if self.is_modal: + response = self.dialog.run() + self.dialog.destroy() + return response + class SubscriptionRequestWindow: def __init__(self, jid, text, account, user_nick = None): xml = gtkgui_helpers.get_glade('subscription_request_window.glade') Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-03-11 08:58:08 UTC (rev 8009) +++ trunk/src/groupchat_control.py 2007-03-11 20:14:53 UTC (rev 8010) @@ -222,6 +222,11 @@ self._on_configure_room_menuitem_activate) self.handlers[id] = widget + widget = xm.get_widget('destroy_room_menuitem') + id = widget.connect('activate', + self._on_destroy_room_menuitem_activate) + self.handlers[id] = widget + widget = xm.get_widget('change_subject_menuitem') id = widget.connect('activate', self._on_change_subject_menuitem_activate) @@ -472,18 +477,21 @@ sets sensitivity state for configure_room''' menu = self.gc_popup_menu childs = menu.get_children() - # hide chat buttons - childs[5].set_active(self.hide_chat_buttons_current) + # Check compact view menuitem + childs[6].set_active(self.hide_chat_buttons_current) if gajim.gc_connected[self.account][self.room_jid]: c = gajim.contacts.get_gc_contact(self.account, self.room_jid, self.nick) if c.affiliation not in ('owner', 'admin'): childs[1].set_sensitive(False) + if c.affiliation != 'owner': + childs[2].set_sensitive(False) else: # We are not connected to this groupchat, disable unusable menuitems childs[1].set_sensitive(False) childs[2].set_sensitive(False) childs[3].set_sensitive(False) + childs[4].set_sensitive(False) return menu def on_message(self, nick, msg, tim, has_timestamp = False, xhtml = None): @@ -888,6 +896,8 @@ os.remove(files[old_file]) os.rename(old_file, files[old_file]) self.print_conversation(s, 'info') + elif statusCode == 'destroyed': # Room has been destroyed + self.print_conversation(reason, 'info') if len(gajim.events.get_events(self.account, self.room_jid + '/' + nick)) == 0: @@ -1442,6 +1452,29 @@ gajim.interface.instances[self.account]['gc_config'][self.room_jid]\ = config.GroupchatConfigWindow(self.account, self.room_jid) + def _on_destroy_room_menuitem_activate(self, widget): + # Ask for a reason + instance = dialogs.DubbleInputDialog(_('Destroying %s') % self.room_jid, + _('You are going to definitively destroy this room.\n' + 'You may specify a reason below:'), + _('You may also enter an alternate venue:')) + response = instance.get_response() + if response == gtk.RESPONSE_OK: + reason = instance.input_entry1.get_text().decode('utf-8') + jid = instance.input_entry2.get_text().decode('utf-8') + # Test jid + try: + jid = helpers.parse_jid(jid) + except: + ErrorDialog(_('Invalid group chat Jabber ID'), + _('The group chat Jabber ID has not allowed characters.')) + return + else: + # Abord destroy operation + return + gajim.connections[self.account].destroy_gc_room(self.room_jid, reason, + jid) + def _on_bookmark_room_menuitem_activate(self, widget): bm = { 'name': self.name,

1 0

[commit-gajim] r8009 - in trunk/src: . common
by asterix＠gajim.org 11 Mar '07

11 Mar '07

Author: asterix Date: 2007-03-11 09:58:08 +0100 (Sun, 11 Mar 2007) New Revision: 8009 Modified: trunk/src/common/events.py trunk/src/systray.py Log: give list of removed event to fire_event_removed func so that it transmits it to listeners Modified: trunk/src/common/events.py =================================================================== --- trunk/src/common/events.py 2007-03-10 11:30:23 UTC (rev 8008) +++ trunk/src/common/events.py 2007-03-11 08:58:08 UTC (rev 8009) @@ -74,9 +74,9 @@ for listener in self._event_added_listeners: listener(event) - def fire_event_removed(self): + def fire_event_removed(self, event_list): for listener in self._event_removed_listeners: - listener() + listener(event_list) def change_account_name(self, old_name, new_name): if self._events.has_key(old_name): @@ -122,26 +122,29 @@ del self._events[account][jid] else: self._events[account][jid].remove(event) - self.fire_event_deleted(event) + self.fire_event_removed([event]) return else: return True if types: new_list = [] # list of events to keep + removed_list = [] # list of removed events for ev in self._events[account][jid]: if ev.type_ not in types: new_list.append(ev) + else: + removed_list.append(ev) if len(new_list) == len(self._events[account][jid]): return True if new_list: self._events[account][jid] = new_list else: del self._events[account][jid] - self.fire_event_removed() + self.fire_event_removed(removed_list) return # no event nor type given, remove them all del self._events[account][jid] - self.fire_event_removed() + self.fire_event_removed(self._events[account][jid]) def change_jid(self, account, old_jid, new_jid): if not self._events[account].has_key(old_jid): Modified: trunk/src/systray.py =================================================================== --- trunk/src/systray.py 2007-03-10 11:30:23 UTC (rev 8008) +++ trunk/src/systray.py 2007-03-11 08:58:08 UTC (rev 8009) @@ -74,7 +74,7 @@ if event.show_in_systray: self.set_img() - def on_event_removed(self): + def on_event_removed(self, event_list): '''Called when one or more events are removed from the event list''' self.set_img()

1 0

[commit-gajim] r8008 - in trunk/src: . common
by asterix＠gajim.org 10 Mar '07

10 Mar '07

Author: asterix Date: 2007-03-10 12:30:23 +0100 (Sat, 10 Mar 2007) New Revision: 8008 Modified: trunk/src/common/events.py trunk/src/systray.py Log: [Mikhail Gusarov and me] Use listeners when an event is added / removed to the events class and use them to update systray. Modified: trunk/src/common/events.py =================================================================== --- trunk/src/common/events.py 2007-03-09 19:58:21 UTC (rev 8007) +++ trunk/src/common/events.py 2007-03-10 11:30:23 UTC (rev 8008) @@ -21,7 +21,6 @@ ## import time -import gajim class Event: '''Information concerning each event''' @@ -48,7 +47,37 @@ '''Information concerning all events''' def __init__(self): self._events = {} # list of events {acct: {jid1: [E1, E2]}, } + self._event_added_listeners = [] + self._event_removed_listeners = [] + def event_added_subscribe(self, listener): + '''Add a listener when an event is added to the queue''' + if not listener in self._event_added_listeners: + self._event_added_listeners.append(listener) + + def event_added_unsubscribe(self, listener): + '''Remove a listener when an event is added to the queue''' + if listener in self._event_added_listeners: + self._event_added_listeners.remove(listener) + + def event_removed_subscribe(self, listener): + '''Add a listener when an event is removed from the queue''' + if not listener in self._event_removed_listeners: + self._event_removed_listeners.append(listener) + + def event_removed_unsubscribe(self, listener): + '''Remove a listener when an event is removed from the queue''' + if listener in self._event_removed_listeners: + self._event_removed_listeners.remove(listener) + + def fire_event_added(self, event): + for listener in self._event_added_listeners: + listener(event) + + def fire_event_removed(self): + for listener in self._event_removed_listeners: + listener() + def change_account_name(self, old_name, new_name): if self._events.has_key(old_name): self._events[new_name] = self._events[old_name] @@ -77,8 +106,7 @@ self._events[account][jid] = [event] else: self._events[account][jid].append(event) - if event.show_in_systray and gajim.interface.systray_capabilities: - gajim.interface.systray.set_img() + self.fire_event_added(event) def remove_events(self, account, jid, event = None, types = []): '''if event is not specified, remove all events from this jid, @@ -94,8 +122,7 @@ del self._events[account][jid] else: self._events[account][jid].remove(event) - if event.show_in_systray and gajim.interface.systray_capabilities: - gajim.interface.systray.set_img() + self.fire_event_deleted(event) return else: return True @@ -110,13 +137,11 @@ self._events[account][jid] = new_list else: del self._events[account][jid] - if gajim.interface.systray_capabilities: - gajim.interface.systray.set_img() + self.fire_event_removed() return # no event nor type given, remove them all del self._events[account][jid] - if gajim.interface.systray_capabilities: - gajim.interface.systray.set_img() + self.fire_event_removed() def change_jid(self, account, old_jid, new_jid): if not self._events[account].has_key(old_jid): Modified: trunk/src/systray.py =================================================================== --- trunk/src/systray.py 2007-03-09 19:58:21 UTC (rev 8007) +++ trunk/src/systray.py 2007-03-10 11:30:23 UTC (rev 8008) @@ -59,6 +59,25 @@ self.xml.signal_autoconnect(self) self.popup_menus = [] + def subscribe_events(self): + '''Register listeners to the events class''' + gajim.events.event_added_subscribe(self.on_event_added) + gajim.events.event_removed_subscribe(self.on_event_removed) + + def unsubscribe_events(self): + '''Unregister listeners to the events class''' + gajim.events.event_added_unsubscribe(self.on_event_added) + gajim.events.event_removed_unsubscribe(self.on_event_removed) + + def on_event_added(self, event): + '''Called when an event is added to the event list''' + if event.show_in_systray: + self.set_img() + + def on_event_removed(self): + '''Called when one or more events are removed from the event list''' + self.set_img() + def set_img(self): if not gajim.interface.systray_enabled: return @@ -373,9 +392,11 @@ eb.add(self.img_tray) self.t.add(eb) self.set_img() + self.subscribe_events() self.t.show_all() def hide_icon(self): if self.t: self.t.destroy() self.t = None + self.unsubscribe_events()

1 0

[commit-gajim] r8007 - trunk/src
by asterix＠gajim.org 09 Mar '07

09 Mar '07

Author: asterix Date: 2007-03-09 20:58:21 +0100 (Fri, 09 Mar 2007) New Revision: 8007 Modified: trunk/src/music_track_listener.py trunk/src/roster_window.py Log: [tristil] better banshee music player support. fixes #2940 Modified: trunk/src/music_track_listener.py =================================================================== --- trunk/src/music_track_listener.py 2007-03-09 19:17:19 UTC (rev 8006) +++ trunk/src/music_track_listener.py 2007-03-09 19:58:21 UTC (rev 8007) @@ -24,7 +24,8 @@ import dbus.glib class MusicTrackInfo(object): - __slots__ = ['title', 'album', 'artist', 'duration', 'track_number'] + __slots__ = ['title', 'album', 'artist', 'duration', 'track_number', + 'paused'] class MusicTrackListener(gobject.GObject): @@ -63,15 +64,29 @@ ## Banshee banshee_bus = dbus.SessionBus() - dubus = banshee_bus.get_object('org.freedesktop.DBus', '/org/freedesktop/dbus') + dubus = banshee_bus.get_object('org.freedesktop.DBus', + '/org/freedesktop/dbus') self.dubus_methods = dbus.Interface(dubus, 'org.freedesktop.DBus') + self.current_banshee_title = '' + self.banshee_paused_before = False + self.banshee_is_here = False + gobject.timeout_add(10000, self._check_if_banshee_bus) if self.dubus_methods.NameHasOwner('org.gnome.Banshee'): self._get_banshee_bus() + self.banshee_is_here = True # Otherwise, it opens Banshee! self.banshee_props ={} - self.current_banshee_title = '' gobject.timeout_add(1000, self._banshee_check_track_status) + + def _check_if_banshee_bus(self): + if self.dubus_methods.NameHasOwner('org.gnome.Banshee'): + self._get_banshee_bus() + self.banshee_is_here = True + else: + self.banshee_is_here = False + return True + def _get_banshee_bus(self): bus = dbus.SessionBus() banshee = bus.get_object('org.gnome.Banshee', '/org/gnome/Banshee/Player') @@ -129,15 +144,35 @@ not hasattr(self, 'banshee_methods'): self._get_banshee_bus() - if self.dubus_methods.NameHasOwner('org.gnome.Banshee'): - self.banshee_props['title'] = self.banshee_methods.GetPlayingTitle() - self.banshee_props['album'] = self.banshee_methods.GetPlayingAlbum() - self.banshee_props['artist'] = self.banshee_methods.GetPlayingArtist() - self.banshee_props['duration'] = \ + if self.dubus_methods.NameHasOwner('org.gnome.Banshee') and self.banshee_is_here: + try: + self.banshee_props['title'] = self.banshee_methods.GetPlayingTitle() + self.banshee_props['album'] = self.banshee_methods.GetPlayingAlbum() + self.banshee_props['artist'] = self.banshee_methods.\ + GetPlayingArtist() + self.banshee_props['duration'] = \ self.banshee_methods.GetPlayingDuration() - info = self._banshee_properties_extract(self.banshee_props) + self.banshee_props['paused'] = self.banshee_methods.\ + GetPlayingStatus() + info = self._banshee_properties_extract(self.banshee_props) + except dbus.DBusException, err: + info = None + + for key in self.banshee_props.keys(): + self.banshee_props[key] = '' + self.banshee_is_here = False + if self.current_banshee_title != self.banshee_props['title']: self.emit('music-track-changed', info) + self.banshee_paused_before = False + if self.banshee_props['paused'] == 0 and self.banshee_paused_before ==\ + False: + self.emit('music-track-changed', info) + self.banshee_paused_before = True + else: + if self.banshee_paused_before and self.banshee_props['paused'] == 1: + self.emit('music-track-changed', info) + self.banshee_paused_before = False self.current_banshee_title = self.banshee_props['title'] return 1 @@ -151,6 +186,7 @@ info.album = props['album'] info.artist = props['artist'] info.duration = int(props['duration']) + info.paused = props['paused'] return info def get_playing_track(self): Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-03-09 19:17:19 UTC (rev 8006) +++ trunk/src/roster_window.py 2007-03-09 19:58:21 UTC (rev 8007) @@ -2967,7 +2967,11 @@ if music_track_info is None: status_message = '' else: - status_message = '♪ ' + _('"%(title)s" by %(artist)s') % \ + if hasattr(music_track_info, 'paused') and \ + music_track_info.paused == 0: + status_message = '' + else: + status_message = '♪ ' + _('"%(title)s" by %(artist)s') % \ {'title': music_track_info.title, 'artist': music_track_info.artist } + ' ♪' for account in accounts:

1 0

[commit-gajim] r8006 - in trunk/src: . common
by asterix＠gajim.org 09 Mar '07

09 Mar '07

Author: asterix Date: 2007-03-09 20:17:19 +0100 (Fri, 09 Mar 2007) New Revision: 8006 Modified: trunk/src/common/contacts.py trunk/src/roster_window.py Log: when we compare 2 offline contacts, the one which has a status messages is shown above the one without. fixes #3010 Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2007-03-08 09:13:41 UTC (rev 8005) +++ trunk/src/common/contacts.py 2007-03-09 19:17:19 UTC (rev 8006) @@ -405,6 +405,9 @@ score += contact.priority * 10 score += ['not in roster', 'error', 'offline', 'invisible', 'dnd', 'xa', 'away', 'chat', 'online', 'requested', 'message'].index(contact.show) + if contact.show == 'offline' and contact.status: + # Offline contacts with a status message have highest score + score += 1 return score def get_metacontacts_big_brother(self, family): Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-03-08 09:13:41 UTC (rev 8005) +++ trunk/src/roster_window.py 2007-03-09 19:17:19 UTC (rev 8006) @@ -3956,6 +3956,12 @@ return -1 elif show1 > show2: return 1 + if show1 == 6 and show2 == 6: + # If both are offline, and one has a status message, it is above + if contact1.status and not contact2.status: + return -1 + elif contact2.status and not contact1.status: + return 1 # We compare names if name1.lower() < name2.lower(): return -1

1 0

[commit-gajim] r8005 - trunk/src
by asterix＠gajim.org 08 Mar '07

08 Mar '07

Author: asterix Date: 2007-03-08 10:13:41 +0100 (Thu, 08 Mar 2007) New Revision: 8005 Modified: trunk/src/filetransfers_window.py Log: don't re-open file transfert dialog when a transfert is finished. fixes #3002 Modified: trunk/src/filetransfers_window.py =================================================================== --- trunk/src/filetransfers_window.py 2007-03-08 08:57:20 UTC (rev 8004) +++ trunk/src/filetransfers_window.py 2007-03-08 09:13:41 UTC (rev 8005) @@ -144,8 +144,6 @@ def show_completed(self, jid, file_props): ''' show a dialog saying that file (file_props) has been transferred''' - self.window.present() - self.window.window.focus() def on_open(widget, file_props): dialog.destroy() if not file_props.has_key('file-name'): @@ -199,23 +197,17 @@ def show_request_error(self, file_props): ''' show error dialog to the recipient saying that transfer has been canceled''' - self.window.present() - self.window.window.focus() dialogs.InformationDialog(_('File transfer cancelled'), _('Connection with peer cannot be established.')) self.tree.get_selection().unselect_all() def show_send_error(self, file_props): ''' show error dialog to the sender saying that transfer has been canceled''' - self.window.present() - self.window.window.focus() dialogs.InformationDialog(_('File transfer cancelled'), _('Connection with peer cannot be established.')) self.tree.get_selection().unselect_all() def show_stopped(self, jid, file_props, error_msg = ''): - self.window.present() - self.window.window.focus() if file_props['type'] == 'r': file_name = os.path.basename(file_props['file-name']) else:

1 0

[commit-gajim] r8004 - trunk/src/common
by asterix＠gajim.org 08 Mar '07

08 Mar '07

Author: asterix Date: 2007-03-08 09:57:20 +0100 (Thu, 08 Mar 2007) New Revision: 8004 Modified: trunk/src/common/connection_handlers.py Log: [misc] fix entity caps behaviour. fixes #3001 Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-03-08 08:43:16 UTC (rev 8003) +++ trunk/src/common/connection_handlers.py 2007-03-08 08:57:20 UTC (rev 8004) @@ -647,22 +647,12 @@ common.xmpp.NS_DISCO, frm = to) iq.setAttr('id', id) query = iq.setTag('query') - # bytestream transfers - feature = common.xmpp.Node('feature') - feature.setAttr('var', common.xmpp.NS_BYTESTREAM) - query.addChild(node=feature) - # si methods - feature = common.xmpp.Node('feature') - feature.setAttr('var', common.xmpp.NS_SI) - query.addChild(node=feature) - # filetransfers transfers - feature = common.xmpp.Node('feature') - feature.setAttr('var', common.xmpp.NS_FILE) - query.addChild(node=feature) - # exposing adhoc commands - feature = common.xmpp.Node('feature') - feature.setAttr('var', common.xmpp.NS_COMMANDS) - query.addChild(node=feature) + query.setAttr('node','http://gajim.org/caps#' + gajim.version) + for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI, \ + common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS): + feature = common.xmpp.Node('feature') + feature.setAttr('var', f) + query.addChild(node=feature) self.connection.send(iq) raise common.xmpp.NodeProcessed @@ -725,6 +715,8 @@ else: iq = iq_obj.buildReply('result') q = iq.getTag('query') + if node: + q.setAttr('node', node) q.addChild('identity', attrs = {'type': 'pc', 'category': 'client', 'name': 'Gajim'}) extension = None @@ -732,18 +724,20 @@ extension = node[node.index('#') + 1:] client_version = 'http://gajim.org/caps#' + gajim.version - if node in (None, client_version) or extension == 'ftrans': + if node in (None, client_version): q.addChild('feature', attrs = {'var': common.xmpp.NS_BYTESTREAM}) q.addChild('feature', attrs = {'var': common.xmpp.NS_SI}) q.addChild('feature', attrs = {'var': common.xmpp.NS_FILE}) - if node in (None, client_version) or extension == 'xhtml': - q.addChild('feature', attrs = {'var': common.xmpp.NS_XHTML_IM}) - if node in (None, client_version): q.addChild('feature', attrs = {'var': common.xmpp.NS_MUC}) - q.addChild('feature', attrs = {'var': common.xmpp.NS_CHATSTATES}) q.addChild('feature', attrs = {'var': common.xmpp.NS_COMMANDS}) q.addChild('feature', attrs = {'var': common.xmpp.NS_DISCO_INFO}) + if (node is None or extension == 'cstates') and gajim.config.get('outgoing_chat_state_notifactions') != 'disabled': + q.addChild('feature', attrs = {'var': common.xmpp.NS_CHATSTATES}) + + if (node is None or extension == 'xhtml') and not gajim.config.get('ignore_incoming_xhtml'): + q.addChild('feature', attrs = {'var': common.xmpp.NS_XHTML_IM}) + if q.getChildren(): self.connection.send(iq) raise common.xmpp.NodeProcessed @@ -824,7 +818,14 @@ ''' advertise our capabilities in presence stanza (jep-0115)''' c = p.setTag('c', namespace = common.xmpp.NS_CAPS) c.setAttr('node', 'http://gajim.org/caps') - c.setAttr('ext', 'ftrans xhtml') + ext = [] + if not gajim.config.get('ignore_incoming_xhtml'): + ext.append('xhtml') + if gajim.config.get('outgoing_chat_state_notifactions') != 'disabled': + ext.append('cstates') + + if len(ext): + c.setAttr('ext', ' '.join(ext)) c.setAttr('ver', gajim.version) return p

1 0

[commit-gajim] r8003 - trunk/data/other
by asterix＠gajim.org 08 Mar '07

08 Mar '07

Author: asterix Date: 2007-03-08 09:43:16 +0100 (Thu, 08 Mar 2007) New Revision: 8003 Modified: trunk/data/other/servers.xml Log: add jabber.nuxo.net to the list of servers. Modified: trunk/data/other/servers.xml =================================================================== --- trunk/data/other/servers.xml 2007-03-07 16:52:08 UTC (rev 8002) +++ trunk/data/other/servers.xml 2007-03-08 08:43:16 UTC (rev 8003) @@ -181,6 +181,9 @@ <item jid="jabber.noxa.de" name="Server in Germany"> <active port="5222"/> </item> + <item jid="jabber.nuxo.net" name="Server in France"> + <active port="5222"/> + </item> <item jid="jabber.obsidian.co.za" name="Server in South Africa"> <active port="5222"/> </item>

1 0

[commit-gajim] r8002 - trunk/src
by asterix＠gajim.org 07 Mar '07

07 Mar '07

Author: asterix Date: 2007-03-07 17:52:08 +0100 (Wed, 07 Mar 2007) New Revision: 8002 Modified: trunk/src/gajim.py Log: [andreas] don't change status message when we go auto away and no autoaway status message is defined. Same thing for autoXA. fixes #2994 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-03-04 08:45:48 UTC (rev 8001) +++ trunk/src/gajim.py 2007-03-07 16:52:08 UTC (rev 8002) @@ -1675,16 +1675,20 @@ gajim.status_before_autoaway[account] = \ gajim.connections[account].status # we go away (no auto status) [we pass True to auto param] - self.roster.send_status(account, 'away', - gajim.config.get('autoaway_message'), auto=True) + auto_message = gajim.config.get('autoaway_message') + if not auto_message: + auto_message = gajim.connections[account].status + self.roster.send_status(account, 'away', auto_message, auto=True) gajim.sleeper_state[account] = 'autoaway' elif state == common.sleepy.STATE_XA and (\ gajim.sleeper_state[account] == 'autoaway' or \ gajim.sleeper_state[account] == 'online') and \ gajim.config.get('autoxa'): # we go extended away [we pass True to auto param] - self.roster.send_status(account, 'xa', - gajim.config.get('autoxa_message'), auto=True) + auto_message = gajim.config.get('autoxa_message') + if not auto_message: + auto_message = gajim.connections[account].status + self.roster.send_status(account, 'xa', auto_message, auto=True) gajim.sleeper_state[account] = 'autoxa' return True # renew timeout (loop for ever)

1 0

[commit-gajim] r8001 - www-website
by asterix＠gajim.org 04 Mar '07

04 Mar '07

Author: asterix Date: 2007-03-04 09:45:48 +0100 (Sun, 04 Mar 2007) New Revision: 8001 Modified: www-website/dev.php Log: updated authors list in website Modified: www-website/dev.php =================================================================== --- www-website/dev.php 2007-03-03 20:13:43 UTC (rev 8000) +++ www-website/dev.php 2007-03-04 08:45:48 UTC (rev 8001) @@ -60,6 +60,9 @@ print (" <li>Yann Le Boulanger (Asterix)</li>"); print (" <li>Nikos Kouremenos (Nkour)</li>"); print (" <li>Jean-Marie Traissard (Jim)</li>"); +print (" <li>Junglecow</li>"); +print (" <li>Tomasz Melcer (Liorithiel)</li>"); +print (" <li>Stefan Bethge (foe)</li>"); print (" </ul>"); print (" <br/>"); print _(" We also want to thank")." <a href=\"http://trac.gajim.org/browser/trunk/THANKS\">"._("these people")."</a>.\n";

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2007