Commits September 2009

commits@gajim.org

5 participants
120 discussions

gajim: better focus behavior when adding/removing a new proxy pr...
by Yann Leboulanger 13 Sep '09

13 Sep '09

changeset 36514844f35a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=36514844f35a description: better focus behavior when adding/removing a new proxy profile. Fixes #4017 diffstat: src/config.py | 41 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 36 insertions(+), 5 deletions(-) diffs (145 lines): diff -r f24c9d5a1e1e -r 36514844f35a src/config.py --- a/src/config.py Fri Sep 11 00:12:36 2009 +0200 +++ b/src/config.py Sun Sep 13 11:21:23 2009 +0200 @@ -1077,6 +1077,7 @@ self.proxytype_combobox = self.xml.get_widget('proxytype_combobox') self.init_list() + self.block_signal = False self.xml.signal_autoconnect(self) self.window.show_all() # hide the BOSH fields by default @@ -1134,6 +1135,7 @@ iter_ = model.append() model.set(iter_, 0, 'proxy' + unicode(i)) gajim.config.add_per('proxies', 'proxy' + unicode(i)) + self.proxies_treeview.set_cursor(model.get_path(iter_)) def on_remove_proxy_button_clicked(self, widget): (model, iter_) = self.proxies_treeview.get_selection().get_selected() @@ -1143,11 +1145,16 @@ model.remove(iter_) gajim.config.del_per('proxies', proxy) self.xml.get_widget('remove_proxy_button').set_sensitive(False) + self.block_signal = True + self.on_proxies_treeview_cursor_changed(self.proxies_treeview) + self.block_signal = False def on_close_button_clicked(self, widget): self.window.destroy() def on_useauth_checkbutton_toggled(self, widget): + if self.block_signal: + return act = widget.get_active() proxy = self.proxyname_entry.get_text().decode('utf-8') gajim.config.set_per('proxies', proxy, 'useauth', act) @@ -1155,6 +1162,8 @@ self.xml.get_widget('proxypass_entry').set_sensitive(act) def on_boshuseproxy_checkbutton_toggled(self, widget): + if self.block_signal: + return act = widget.get_active() proxy = self.proxyname_entry.get_text().decode('utf-8') gajim.config.set_per('proxies', proxy, 'bosh_useproxy', act) @@ -1164,11 +1173,6 @@ def on_proxies_treeview_cursor_changed(self, widget): #FIXME: check if off proxy settings are correct (see # http://trac.gajim.org/changeset/1921#file2 line 1221 - (model, iter_) = widget.get_selection().get_selected() - if not iter_: - return - proxy = model[iter_][0] - self.xml.get_widget('proxyname_entry').set_text(proxy) proxyhost_entry = self.xml.get_widget('proxyhost_entry') proxyport_entry = self.xml.get_widget('proxyport_entry') proxyuser_entry = self.xml.get_widget('proxyuser_entry') @@ -1176,6 +1180,7 @@ boshuri_entry = self.xml.get_widget('boshuri_entry') useauth_checkbutton = self.xml.get_widget('useauth_checkbutton') boshuseproxy_checkbutton = self.xml.get_widget('boshuseproxy_checkbutton') + self.block_signal = True proxyhost_entry.set_text('') proxyport_entry.set_text('') proxyuser_entry.set_text('') @@ -1188,6 +1193,17 @@ #useauth_checkbutton.set_active(False) #self.on_useauth_checkbutton_toggled(useauth_checkbutton) + (model, iter_) = widget.get_selection().get_selected() + if not iter_: + self.xml.get_widget('proxyname_entry').set_text('') + self.xml.get_widget('proxytype_combobox').set_sensitive(False) + self.xml.get_widget('proxy_table').set_sensitive(False) + self.block_signal = False + return + + proxy = model[iter_][0] + self.xml.get_widget('proxyname_entry').set_text(proxy) + if proxy == _('None'): # special proxy None self.show_bosh_fields(False) self.proxyname_entry.set_editable(False) @@ -1219,12 +1235,15 @@ gajim.config.get_per('proxies', proxy, 'bosh_useproxy')) useauth_checkbutton.set_active( gajim.config.get_per('proxies', proxy, 'useauth')) + self.block_signal = False def on_proxies_treeview_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Delete: self.on_remove_proxy_button_clicked(widget) def on_proxyname_entry_changed(self, widget): + if self.block_signal: + return (model, iter_) = self.proxies_treeview.get_selection().get_selected() if not iter_: return @@ -1243,6 +1262,8 @@ model.set_value(iter_, 0, new_name) def on_proxytype_combobox_changed(self, widget): + if self.block_signal: + return types = ['http', 'socks5', 'bosh'] type_ = self.proxytype_combobox.get_active() self.show_bosh_fields(types[type_]=='bosh') @@ -1250,26 +1271,36 @@ gajim.config.set_per('proxies', proxy, 'type', types[type_]) def on_proxyhost_entry_changed(self, widget): + if self.block_signal: + return value = widget.get_text().decode('utf-8') proxy = self.proxyname_entry.get_text().decode('utf-8') gajim.config.set_per('proxies', proxy, 'host', value) def on_proxyport_entry_changed(self, widget): + if self.block_signal: + return value = widget.get_text().decode('utf-8') proxy = self.proxyname_entry.get_text().decode('utf-8') gajim.config.set_per('proxies', proxy, 'port', value) def on_proxyuser_entry_changed(self, widget): + if self.block_signal: + return value = widget.get_text().decode('utf-8') proxy = self.proxyname_entry.get_text().decode('utf-8') gajim.config.set_per('proxies', proxy, 'user', value) def on_boshuri_entry_changed(self, widget): + if self.block_signal: + return value = widget.get_text().decode('utf-8') proxy = self.proxyname_entry.get_text().decode('utf-8') gajim.config.set_per('proxies', proxy, 'bosh_uri', value) def on_proxypass_entry_changed(self, widget): + if self.block_signal: + return value = widget.get_text().decode('utf-8') proxy = self.proxyname_entry.get_text().decode('utf-8') gajim.config.set_per('proxies', proxy, 'pass', value)

1 0

gajim: jingle: move from the old farsight to farsight2,
by Thibaut GIRKA 13 Sep '09

13 Sep '09

changeset 41e8b3dd8d92 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=41e8b3dd8d92 description: jingle: move from the old farsight to farsight2, better compliance to the last version of XEP 0166, 0167 and 0176 diffstat: src/chat_control.py | 9 +- src/common/gajim.py | 4 +- src/common/jingle.py | 686 ++++++++++++++++++++++++++++++------------------ src/common/xmpp/protocol.py | 10 +- src/gajim.py | 1 + 5 files changed, 451 insertions(+), 259 deletions(-) diffs (truncated from 1002 to 300 lines): diff -r 8a8f0be4a382 -r 41e8b3dd8d92 src/chat_control.py --- a/src/chat_control.py Tue Sep 08 21:45:18 2009 +0200 +++ b/src/chat_control.py Sun Sep 13 11:02:49 2009 +0200 @@ -50,6 +50,7 @@ from common.pep import MOODS, ACTIVITIES from common.xmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC from common.xmpp.protocol import NS_RECEIPTS, NS_ESESSION +from common.xmpp.protocol import NS_JINGLE_RTP_AUDIO try: import gtkspell @@ -1634,7 +1635,7 @@ banner_name_tooltip.set_tip(banner_name_label, label_tooltip) def _on_start_voip_menuitem_activate(self, *things): - gajim.connections[self.account].startVoiP(self.contact.jid+'/'+self.contact.resource) + gajim.connections[self.account].startVoIP(self.contact.jid+'/'+self.contact.resource) def _toggle_gpg(self): if not self.gpg_is_active and not self.contact.keyID: @@ -2168,6 +2169,12 @@ else: send_file_menuitem.set_sensitive(False) + # check if it's possible to start jingle sessions + if gajim.capscache.is_supported(contact, NS_JINGLE_RTP_AUDIO): + start_voip_menuitem.set_sensitive(True) + else: + start_voip_menuitem.set_sensitive(False) + # check if it's possible to convert to groupchat if gajim.capscache.is_supported(contact, NS_MUC): convert_to_gc_menuitem.set_sensitive(True) diff -r 8a8f0be4a382 -r 41e8b3dd8d92 src/common/gajim.py --- a/src/common/gajim.py Tue Sep 08 21:45:18 2009 +0200 +++ b/src/common/gajim.py Sun Sep 13 11:02:49 2009 +0200 @@ -196,7 +196,9 @@ 'jabber:iq:gateway', xmpp.NS_LAST, xmpp.NS_PRIVACY, xmpp.NS_PRIVATE, xmpp.NS_REGISTER, xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED, 'msglog', 'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED, xmpp.NS_SSN, - xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK, xmpp.NS_ROSTERX] + xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK, xmpp.NS_ROSTERX, + xmpp.NS_JINGLE, xmpp.NS_JINGLE_RTP, xmpp.NS_JINGLE_RTP_AUDIO, + xmpp.NS_JINGLE_ICE_UDP] # Optional features gajim supports per account gajim_optional_features = {} diff -r 8a8f0be4a382 -r 41e8b3dd8d92 src/common/jingle.py --- a/src/common/jingle.py Tue Sep 08 21:45:18 2009 +0200 +++ b/src/common/jingle.py Sun Sep 13 11:02:49 2009 +0200 @@ -12,42 +12,69 @@ ## ''' Handles the jingle signalling protocol. ''' -# note: if there will be more types of sessions (possibly file transfer, -# video...), split this file +#TODO: +# * things in XEP 0166, includign: +# - 'senders' attribute of 'content' element +# - security preconditions +# * actions: +# - content-accept, content-reject, content-add, content-modify +# - description-info, session-info +# - security-info +# - transport-accept, transport-reject +# * sid/content related: +# - tiebreaking +# - if there already is a session, use it +# * UI: +# - hang up button! +# - make state and codec informations available to the user +# * config: +# - codecs +# - STUN +# * figure out why it doesn't work with pidgin, and why it doesn't work well with psi +# * destroy sessions when user is unavailable, see handle_event_notify? +# * timeout +# * video +# * security (see XEP 0166) + +# * split this file in several modules +# For example, a file dedicated for XEP0166, one for XEP0176, +# and one for each media of XEP0167 + +# * handle different kinds of sink and src elements import gajim import gobject import xmpp -# ugly hack, fixed in farsight 0.1.24 -import sys, dl, gst -sys.setdlopenflags(dl.RTLD_NOW | dl.RTLD_GLOBAL) -import farsight -sys.setdlopenflags(dl.RTLD_NOW | dl.RTLD_LOCAL) +import farsight, gst -def all(iterable): # backport of py2.5 function - for element in iterable: - if not element: - return False - return True +def get_first_gst_element(elements): + ''' Returns, if it exists, the first available element of the list. ''' + for name in elements: + factory = gst.element_factory_find(name) + if factory: + return factory.create() -def timeout_add_and_call(timeout, callable, *args, **kwargs): - ''' Call a callback once. If it returns True, add a timeout handler to call it more times. - Helper function. ''' - if callable(*args, **kwargs): - return gobject.timeout_add(timeout, callable, *args, **kwargs) - return -1 # gobject.source_remove will not object - +#FIXME: Move it to JingleSession.States? class JingleStates(object): ''' States in which jingle session may exist. ''' ended=0 pending=1 active=2 +#FIXME: Move it to JingleTransport.Type? +class TransportType(object): + ''' Possible types of a JingleTransport ''' + datagram = 1 + streaming = 2 + class Error(Exception): pass class WrongState(Error): pass class NoSuchSession(Error): pass +class OutOfOrder(Exception): + ''' Exception that should be raised when an action is received when in the wrong state. ''' + class JingleSession(object): ''' This represents one jingle session. ''' def __init__(self, con, weinitiate, jid, sid=None): @@ -72,28 +99,31 @@ self.sid=sid # sessionid self.accepted=True # is this session accepted by user + self.candidates_ready = False # True when local candidates are prepared # callbacks to call on proper contents # use .prepend() to add new callbacks, especially when you're going # to send error instead of ack self.callbacks={ - 'content-accept': [self.__contentAcceptCB, self.__broadcastCB, self.__defaultCB], - 'content-add': [self.__defaultCB], - 'content-modify': [self.__defaultCB], - 'content-remove': [self.__defaultCB], - 'session-accept': [self.__contentAcceptCB, self.__broadcastCB, self.__defaultCB], - 'session-info': [self.__defaultCB], + 'content-accept': [self.__contentAcceptCB, self.__defaultCB], + 'content-add': [self.__defaultCB], #TODO + 'content-modify': [self.__defaultCB], #TODO + 'content-reject': [self.__defaultCB], #TODO + 'content-remove': [self.__defaultCB, self.__contentRemoveCB], + 'description-info': [self.__defaultCB], #TODO + 'security-info': [self.__defaultCB], #TODO + 'session-accept': [self.__sessionAcceptCB, self.__contentAcceptCB, self.__broadcastCB, self.__defaultCB], + 'session-info': [self.__sessionInfoCB, self.__broadcastCB], 'session-initiate': [self.__sessionInitiateCB, self.__broadcastCB, self.__defaultCB], - 'session-terminate': [self.__broadcastAllCB, self.__defaultCB], + 'session-terminate': [self.__sessionTerminateCB, self.__broadcastAllCB, self.__defaultCB], 'transport-info': [self.__broadcastCB, self.__defaultCB], + 'transport-replace': [self.__broadcastCB, self.__transportReplaceCB], #TODO + 'transport-accept': [self.__defaultCB], #TODO + 'transport-reject': [self.__defaultCB], #TODO 'iq-result': [], 'iq-error': [], } - # for making streams using farsight - self.p2psession = farsight.farsight_session_factory_make('rtp') - self.p2psession.connect('error', self.on_p2psession_error) - ''' Interaction with user ''' def approveSession(self): ''' Called when user accepts session in UI (when we aren't the initiator).''' @@ -101,9 +131,10 @@ self.acceptSession() def declineSession(self): - ''' Called when user declines session in UI (when we aren't the initiator, - or when the user wants to stop session completly. ''' - self.__sessionTerminate() + ''' Called when user declines session in UI (when we aren't the initiator)''' + reason = xmpp.Node('reason') + reason.addChild('decline') + self.__sessionTerminate(reason) ''' Middle-level functions to manage contents. Handle local content cache and send change notifications. ''' @@ -138,17 +169,29 @@ def acceptSession(self): ''' Check if all contents and user agreed to start session. ''' - if not self.weinitiate and \ - self.accepted and \ - all(c.negotiated for c in self.contents.itervalues()): + if not self.weinitiate and self.accepted and self.candidates_ready: self.__sessionAccept() + ''' Middle-level function to do stanza exchange. ''' def startSession(self): ''' Start session. ''' - self.__sessionInitiate() + if self.weinitiate and self.candidates_ready: + self.__sessionInitiate() def sendSessionInfo(self): pass + def sendContentAccept(self, content): + assert self.state!=JingleStates.ended + stanza, jingle = self.__makeJingle('content-accept') + jingle.addChild(node=content) + self.connection.connection.send(stanza) + + def sendTransportInfo(self, content): + assert self.state!=JingleStates.ended + stanza, jingle = self.__makeJingle('transport-info') + jingle.addChild(node=content) + self.connection.connection.send(stanza) + ''' Session callbacks. ''' def stanzaCB(self, stanza): ''' A callback for ConnectionJingle. It gets stanza, then @@ -162,6 +205,17 @@ elif jingle: # it's a jingle action action = jingle.getAttr('action') + if action not in self.callbacks: + err = xmpp.Error(stanza, xmpp.NS_STANZAS + ' bad_request') + self.connection.connection.send(err) + return + #FIXME: If we aren't initiated and it's not a session-initiate... + if action != 'session-initiate' and self.state == JingleStates.ended: + err = xmpp.Error(stanza, xmpp.NS_STANZAS + ' item-not-found') + err.setTag('unknown-session', namespace=xmpp.NS_JINGLE_ERRORS) + self.connection.connection.send(err) + self.connection.deleteJingle(self) + return else: # it's an iq-result (ack) stanza action = 'iq-result' @@ -173,6 +227,10 @@ callable(stanza=stanza, jingle=jingle, error=error, action=action) except xmpp.NodeProcessed: pass + except OutOfOrder: + err = xmpp.Error(stanza, xmpp.NS_STANZAS + ' unexpected-request') + err.setTag('out-of-order', namespace=xmpp.NS_JINGLE_ERRORS) + self.connection.connection.send(err) def __defaultCB(self, stanza, jingle, error, action): ''' Default callback for action stanzas -- simple ack @@ -180,18 +238,72 @@ response = stanza.buildReply('result') self.connection.connection.send(response) + def __transportReplaceCB(self, stanza, jingle, error, action): + for content in jingle.iterTags('content'): + creator = content['creator'] + name = content['name'] + if (creator, name) in self.contents: + transport_ns = content.getTag('transport').getNamespace() + if transport_ns == xmpp.JINGLE_ICE_UDP: + #FIXME: We don't manage anything else than ICE-UDP now... + #What was the previous transport?!? + #Anyway, content's transport is not modifiable yet + pass + else: + stanza, jingle = self.__makeJingle('transport-reject') + c = jingle.setTag('content', attrs={'creator': creator, + 'name': name}) + c.setTag('transport', namespace=transport_ns) + self.connection.connection.send(stanza) + raise xmpp.NodeProcessed + else: + #FIXME: This ressource is unknown to us, what should we do? + #For now, reject the transport + stanza, jingle = self.__makeJingle('transport-reject') + c = jingle.setTag('content', attrs={'creator': creator, + 'name': name}) + c.setTag('transport', namespace=transport_ns) + self.connection.connection.send(stanza) + raise xmpp.NodeProcessed + + def __sessionInfoCB(self, stanza, jingle, error, action): + payload = jingle.getPayload() + if len(payload) > 0: + err = xmpp.Error(stanza, xmpp.NS_STANZAS + ' feature-not-implemented') + err.setTag('unsupported-info', namespace=xmpp.NS_JINGLE_ERRORS) + self.connection.connection.send(err) + raise xmpp.NodeProcessed + + def __contentRemoveCB(self, stanza, jingle, error, action):

1 0

gajim: add a reconnect menuitem in groupchat context menu when i...
by Yann Leboulanger 10 Sep '09

10 Sep '09

changeset f24c9d5a1e1e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f24c9d5a1e1e description: add a reconnect menuitem in groupchat context menu when it's doconnected. Fixes #4004 diffstat: src/roster_window.py | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diffs (31 lines): diff -r 579491c3b3f8 -r f24c9d5a1e1e src/roster_window.py --- a/src/roster_window.py Fri Sep 11 00:01:56 2009 +0200 +++ b/src/roster_window.py Fri Sep 11 00:12:36 2009 +0200 @@ -2844,6 +2844,13 @@ ctrl.got_disconnected() self.remove_groupchat(jid, account) + def on_reconnect(self, widget, jid, account): + '''When disconnect menuitem is activated: disconect from room''' + if jid in gajim.interface.minimized_controls[account]: + ctrl = gajim.interface.minimized_controls[account][jid] + gajim.interface.join_gc_room(account, jid, ctrl.nick, + gajim.gc_passwords.get(jid, '')) + def on_send_single_message_menuitem_activate(self, widget, account, contact=None): if contact is None: @@ -5888,6 +5895,13 @@ jid, account) menu.append(maximize_menuitem) + if not gajim.gc_connected[account].get(jid, False): + connect_menuitem = gtk.ImageMenuItem(_('_Reconnect')) + connect_icon = gtk.image_new_from_stock(gtk.STOCK_CONNECT, \ + gtk.ICON_SIZE_MENU) + connect_menuitem.set_image(connect_icon) + connect_menuitem.connect('activate', self.on_reconnect, jid, account) + menu.append(connect_menuitem) disconnect_menuitem = gtk.ImageMenuItem(_('_Disconnect')) disconnect_icon = gtk.image_new_from_stock(gtk.STOCK_DISCONNECT, \ gtk.ICON_SIZE_MENU)

1 0

gajim: Show a confirmation dialog first time we block a contact....
by Yann Leboulanger 10 Sep '09

10 Sep '09

changeset 579491c3b3f8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=579491c3b3f8 description: Show a confirmation dialog first time we block a contact. Fixes #3646 diffstat: src/common/config.py | 2 ++ src/roster_window.py | 23 ++++++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diffs (59 lines): diff -r 6a14b13c195e -r 579491c3b3f8 src/common/config.py --- a/src/common/config.py Thu Sep 10 22:12:52 2009 +0200 +++ b/src/common/config.py Fri Sep 11 00:01:56 2009 +0200 @@ -249,6 +249,8 @@ 'gc_nicknames_colors': [ opt_str, '#a34526:#c000ff:#0012ff:#388a99:#045723:#7c7c7c:#ff8a00:#94452d:#244b5a:#32645a', _('List of colors, separated by ":", that will be used to color nicknames in group chats.'), True ], 'ctrl_tab_go_to_next_composing': [opt_bool, True, _('Ctrl-Tab go to next composing tab when none is unread.')], 'confirm_metacontacts': [ opt_str, '', _('Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog.')], + 'confirm_block': [ opt_str, '', _('Should we show the confirm block contact dialog or not? Empty string means we never show the dialog.')], + 'confirm_custom_status': [ opt_str, '', _('Should we show the confirm custom status dialog or not? Empty string means we never show the dialog.')], 'enable_negative_priority': [ opt_bool, False, _('If True, you will be able to set a negative priority to your account in account modification window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server.')], 'use_gnomekeyring': [opt_bool, True, _('If True, Gajim will use Gnome Keyring (if available) to store account passwords.')], 'use_kwalletcli': [opt_bool, True, _('If True, Gajim will use KDE Wallet (if kwalletcli is available) to store account passwords.')], diff -r 6a14b13c195e -r 579491c3b3f8 src/roster_window.py --- a/src/roster_window.py Thu Sep 10 22:12:52 2009 +0200 +++ b/src/roster_window.py Fri Sep 11 00:01:56 2009 +0200 @@ -2575,7 +2575,24 @@ connection.set_default_list('block') connection.get_privacy_list('block') - self.get_status_message('offline', on_continue, show_pep=False) + def _block_it(is_checked=None): + if is_checked is not None: # dialog has been shown + if is_checked: # user does not want to be asked again + gajim.config.set('confirm_block', 'no') + else: + gajim.config.set('confirm_block', 'yes') + self.get_status_message('offline', on_continue, show_pep=False) + + confirm_block = gajim.config.get('confirm_block') + if confirm_block == 'no': + _block_it() + return + pritext = _('You are about to block a contact. Are you sure you want' + ' to continue?') + sectext = _('This contact will see you offline and you will not receive ' + 'messages he will send you.') + dlg = dialogs.ConfirmationDialogCheck(pritext, sectext, + _('Do _not ask me again'), on_response_ok=_block_it) def on_unblock(self, widget, list_, group=None): ''' When clicked on the 'unblock' button in context menu. ''' @@ -2828,7 +2845,7 @@ self.remove_groupchat(jid, account) def on_send_single_message_menuitem_activate(self, widget, account, - contact = None): + contact=None): if contact is None: dialogs.SingleMessageWindow(account, action='send') elif isinstance(contact, list): @@ -2878,7 +2895,7 @@ break def on_invite_to_room(self, widget, list_, room_jid, room_account, - resource = None): + resource=None): ''' resource parameter MUST NOT be used if more than one contact in list ''' for e in list_:

1 0

gajim: show confirmation dialog first time we send custom status...
by Yann Leboulanger 10 Sep '09

10 Sep '09

changeset 6a14b13c195e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6a14b13c195e description: show confirmation dialog first time we send custom status. see #3646 diffstat: src/roster_window.py | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diffs (32 lines): diff -r d2d90181df52 -r 6a14b13c195e src/roster_window.py --- a/src/roster_window.py Thu Sep 10 18:30:26 2009 +0200 +++ b/src/roster_window.py Thu Sep 10 22:12:52 2009 +0200 @@ -3184,8 +3184,26 @@ jid += '/' + contact.resource self.send_status(account, show, message, to=jid) - self.get_status_message(show, on_response, show_pep=False, - always_ask=True) + def send_it(is_checked=None): + if is_checked is not None: # dialog has been shown + if is_checked: # user does not want to be asked again + gajim.config.set('confirm_custom_status', 'no') + else: + gajim.config.set('confirm_custom_status', 'yes') + self.get_status_message(show, on_response, show_pep=False, + always_ask=True) + + confirm_custom_status = gajim.config.get('confirm_custom_status') + if confirm_custom_status == 'no': + send_it() + return + pritext = _('You are about to send a custom status. Are you sure you want' + ' to continue?') + sectext = _('This contact will temporarily see you as %(status)s, ' + 'but only until you change your status. Then he will see your global ' + 'status.') % {'status': show} + dlg = dialogs.ConfirmationDialogCheck(pritext, sectext, + _('Do _not ask me again'), on_response_ok=send_it) def on_status_combobox_changed(self, widget): '''When we change our status via the combobox'''

1 0

gajim: show notification for bad GPG pass instead of an error di...
by Yann Leboulanger 10 Sep '09

10 Sep '09

changeset d2d90181df52 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d2d90181df52 description: show notification for bad GPG pass instead of an error dialog diffstat: src/common/connection_handlers.py | 4 +--- src/gajim.py | 9 +++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diffs (35 lines): diff -r fbb0e6a63a64 -r d2d90181df52 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Sep 10 13:54:44 2009 +0200 +++ b/src/common/connection_handlers.py Thu Sep 10 18:30:26 2009 +0200 @@ -2615,9 +2615,7 @@ if sign_msg and not signed: signed = self.get_signed_presence(msg) if signed is None: - self.dispatch('ERROR', (_('OpenPGP passphrase was not given'), - #%s is the account name here - _('You will be connected to %s without OpenPGP.') % self.name)) + self.dispatch('BAD_PASSPHRASE', ()) self.USE_GPG = False signed = '' self.connected = gajim.SHOW_LIST.index(show) diff -r fbb0e6a63a64 -r d2d90181df52 src/gajim.py --- a/src/gajim.py Thu Sep 10 13:54:44 2009 +0200 +++ b/src/gajim.py Thu Sep 10 18:30:26 2009 +0200 @@ -1509,10 +1509,15 @@ if use_gpg_agent: sectext = _('You configured Gajim to use GPG agent, but there is no ' 'GPG agent running or it returned a wrong passphrase.\n') - sectext += _('You are currently connected without your OpenPGP key.') + sectext += _('You are currently connected without your OpenPGP key.') + dialogs.WarningDialog(_('Your passphrase is incorrect'), sectext) + else: + path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'warning.png') + notify.popup('warning', account, account, 'warning', path, + _('OpenGPG Passphrase Incorrect'), + _('You are currently connected without your OpenPGP key.')) keyID = gajim.config.get_per('accounts', account, 'keyid') self.forget_gpg_passphrase(keyID) - dialogs.WarningDialog(_('Your passphrase is incorrect'), sectext) def handle_event_gpg_password_required(self, account, array): #('GPG_PASSWORD_REQUIRED', account, (callback,))

1 0

gajim: always expand lines in disco window, increase default dis...
by Yann Leboulanger 10 Sep '09

10 Sep '09

changeset fbb0e6a63a64 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fbb0e6a63a64 description: always expand lines in disco window, increase default disco window width. Fixes #3877 diffstat: data/glade/service_discovery_window.glade | 45 ++++++++++++---------- src/disco.py | 6 +- 2 files changed, 27 insertions(+), 24 deletions(-) diffs (160 lines): diff -r 00738d503d15 -r fbb0e6a63a64 data/glade/service_discovery_window.glade --- a/data/glade/service_discovery_window.glade Wed Sep 09 13:51:33 2009 +0200 +++ b/data/glade/service_discovery_window.glade Thu Sep 10 13:54:44 2009 +0200 @@ -1,11 +1,11 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> - +<?xml version="1.0"?> <glade-interface> +  +  <widget class="GtkWindow" id="service_discovery_window"> <property name="border_width">6</property> <property name="role">Service Discovery</property> - <property name="default_width">450</property> + <property name="default_width">550</property> <property name="default_height">420</property> <signal name="destroy" handler="on_service_discovery_window_destroy"/> <child> @@ -28,6 +28,9 @@ Agent JID - node</property> <property name="use_markup">True</property> </widget> + <packing> + <property name="position">0</property> + </packing> </child> <child> <widget class="GtkImage" id="banner_agent_icon"> @@ -47,6 +50,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> @@ -56,21 +60,11 @@ <property name="n_columns">3</property> <property name="column_spacing">6</property> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> <widget class="GtkComboBoxEntry" id="address_comboboxentry"> <property name="visible">True</property> <property name="items" translatable="yes"></property> <signal name="changed" handler="on_address_comboboxentry_changed"/> <signal name="key_press_event" handler="on_address_comboboxentry_key_press_event"/> - <child internal-child="entry"> - <widget class="GtkEntry" id="comboboxentry-entry1"> - </widget> - </child> </widget> <packing> <property name="left_attach">1</property> @@ -86,7 +80,7 @@ <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> - <property name="response_id">0</property> + <property name="receives_default">False</property> <signal name="clicked" handler="on_go_button_clicked"/> <child> <widget class="GtkAlignment" id="alignment93"> @@ -105,6 +99,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> @@ -145,6 +140,12 @@ <property name="y_options"></property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </widget> <packing> <property name="expand">False</property> @@ -155,9 +156,9 @@ <widget class="GtkScrolledWindow" id="services_scrollwin"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">etched-in</property> <child> <widget class="GtkTreeView" id="services_treeview"> <property name="visible">True</property> @@ -184,6 +185,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> @@ -200,19 +202,20 @@ <property name="spacing">6</property> <child> <widget class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_focus">True</property> <property name="can_default">True</property> - <property name="label">gtk-close</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_close_button_clicked"/> </widget> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="pack_type">GTK_PACK_END</property> + <property name="pack_type">end</property> + <property name="position">0</property> </packing> </child> </widget> diff -r 00738d503d15 -r fbb0e6a63a64 src/disco.py --- a/src/disco.py Wed Sep 09 13:51:33 2009 +0200 +++ b/src/disco.py Thu Sep 10 13:54:44 2009 +0200 @@ -1137,11 +1137,11 @@ # Icon Renderer renderer = gtk.CellRendererPixbuf() renderer.set_property('xpad', 6) - col.pack_start(renderer, expand = False) + col.pack_start(renderer, expand=False) col.set_cell_data_func(renderer, self._pixbuf_renderer_data_func) # Text Renderer renderer = gtk.CellRendererText() - col.pack_start(renderer, expand = True) + col.pack_start(renderer, expand=True) col.set_cell_data_func(renderer, self._text_renderer_data_func) renderer.set_property('foreground', 'dark gray') # Save this so we can go along with theme changes @@ -1487,7 +1487,7 @@ if not cat: cat = self._create_category(*cat_args) self.model.append(cat, (jid, node, pix, descr, 1)) - self._expand_all() + gobject.idle_add(self._expand_all) # Grab info on the service self.cache.get_info(jid, node, self._agent_info, force=force) self._update_progressbar()

1 0

gajim-website: add MOPSLinux to our download page
by Yann Leboulanger 10 Sep '09

10 Sep '09

changeset 7ddb46e81f04 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=7ddb46e81f04 description: add MOPSLinux to our download page diffstat: Design.php | 3 ++- downloads.php | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diffs (31 lines): diff -r 877e069d0e4f -r 7ddb46e81f04 Design.php --- a/Design.php Fri Aug 28 22:18:55 2009 +0200 +++ b/Design.php Thu Sep 10 09:18:05 2009 +0200 @@ -101,7 +101,8 @@ _("PLD") => "downloads.php?lang=$language#pld", _("Sourcemage") => "downloads.php?lang=$language#sourcemage", _("Mandriva") => "downloads.php?lang=$language#mandriva", - _("Zenwalk") => "downloads.php?lang=$language#wenwalk", + _("Zenwalk") => "downloads.php?lang=$language#zenwalk", + _("MOPSLinux") => "downloads.php?lang=$language#mopslinux", _("FreeBSD") => "downloads.php?lang=$language#freebsd", _("Autopackage") => "downloads.php?lang=$language#autopackage", _("Windows installer") => "downloads.php?lang=$language#windows", diff -r 877e069d0e4f -r 7ddb46e81f04 downloads.php --- a/downloads.php Fri Aug 28 22:18:55 2009 +0200 +++ b/downloads.php Thu Sep 10 09:18:05 2009 +0200 @@ -103,6 +103,14 @@ print _(" Just")." <i>netpkg gajim</i>\n"; print (" <br/>\n"); +print ("<a name=\"mopslinux\">\n"); +print (" <h2>\n"); +print (" MOPSLinux\n"); +print (" </h2>\n"); +print ("</a>\n"); +print _(" Just")." <i>mpkg-install gajim</i>\n"; +print (" <br/>\n"); + print ("<a name=\"freebsd\">\n"); print (" <h2>\n"); print _(" FreeBSD\n");

1 0

gajim: move change_awn_icon_status from roster_window.py to gaji...
by Yann Leboulanger 09 Sep '09

09 Sep '09

changeset 00738d503d15 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=00738d503d15 description: move change_awn_icon_status from roster_window.py to gajim.py. see #3643 diffstat: src/gajim.py | 26 ++++++++++++++++++++++++++ src/roster_window.py | 28 +--------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diffs (81 lines): diff -r 875625bb2767 -r 00738d503d15 src/gajim.py --- a/src/gajim.py Wed Sep 09 13:26:53 2009 +0200 +++ b/src/gajim.py Wed Sep 09 13:51:33 2009 +0200 @@ -2963,6 +2963,32 @@ ### Other Methods ################################################################################ + def _change_awn_icon_status(self, status): + if not dbus_support.supported: + # do nothing if user doesn't have D-Bus bindings + return + try: + bus = dbus.SessionBus() + if not 'com.google.code.Awn' in bus.list_names(): + # Awn is not installed + return + except Exception: + return + iconset = gajim.config.get('iconset') + prefix = os.path.join(helpers.get_iconset_path(iconset), '32x32') + if status in ('chat', 'away', 'xa', 'dnd', 'invisible', 'offline'): + status = status + '.png' + elif status == 'online': + prefix = os.path.join(gajim.DATA_DIR, 'pixmaps') + status = 'gajim.png' + path = os.path.join(prefix, status) + try: + obj = bus.get_object('com.google.code.Awn', '/com/google/code/Awn') + awn = dbus.Interface(obj, 'com.google.code.Awn') + awn.SetTaskIconByName('Gajim', os.path.abspath(path)) + except Exception: + pass + def enable_music_listener(self): if not self.music_track_changed_signal: listener = MusicTrackListener.get() diff -r 875625bb2767 -r 00738d503d15 src/roster_window.py --- a/src/roster_window.py Wed Sep 09 13:26:53 2009 +0200 +++ b/src/roster_window.py Wed Sep 09 13:51:33 2009 +0200 @@ -1735,32 +1735,6 @@ if chat_control: chat_control.contact = contact1 - def _change_awn_icon_status(self, status): - if not dbus_support.supported: - # do nothing if user doesn't have D-Bus bindings - return - try: - bus = dbus.SessionBus() - if not 'com.google.code.Awn' in bus.list_names(): - # Awn is not installed - return - except Exception: - return - iconset = gajim.config.get('iconset') - prefix = os.path.join(helpers.get_iconset_path(iconset), '32x32') - if status in ('chat', 'away', 'xa', 'dnd', 'invisible', 'offline'): - status = status + '.png' - elif status == 'online': - prefix = os.path.join(gajim.DATA_DIR, 'pixmaps') - status = 'gajim.png' - path = os.path.join(prefix, status) - try: - obj = bus.get_object('com.google.code.Awn', '/com/google/code/Awn') - awn = dbus.Interface(obj, 'com.google.code.Awn') - awn.SetTaskIconByName('Gajim', os.path.abspath(path)) - except Exception: - pass - def connected_rooms(self, account): if account in gajim.gc_connected[account].values(): return True @@ -2156,7 +2130,7 @@ liststore.prepend([status_combobox_text, gajim.interface.jabber_state_images['16'][show], show, False]) self.status_combobox.set_active(0) - self._change_awn_icon_status(show) + gajim.interface._change_awn_icon_status(show) self.combobox_callback_active = True if gajim.interface.systray_enabled: gajim.interface.systray.change_status(show)

1 0

gajim: move music track listener things from roster_window.py to...
by Yann Leboulanger 09 Sep '09

09 Sep '09

changeset 875625bb2767 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=875625bb2767 description: move music track listener things from roster_window.py to gajim.py. see #3643 diffstat: src/common/connection.py | 2 +- src/common/connection_handlers.py | 4 +- src/gajim.py | 50 +++++++++++++++++++++++++ src/roster_window.py | 55 +-------------------------- 4 files changed, 55 insertions(+), 56 deletions(-) diffs (206 lines): diff -r 8143e72aa6f1 -r 875625bb2767 src/common/connection.py --- a/src/common/connection.py Wed Sep 09 10:38:26 2009 +0200 +++ b/src/common/connection.py Wed Sep 09 13:26:53 2009 +0200 @@ -219,7 +219,7 @@ # We are doing disconnect at so many places, better use one function in all def disconnect(self, on_purpose=False): - gajim.interface.roster.music_track_changed(None, None, self.name) + gajim.interface.music_track_changed(None, None, self.name) self.on_purpose = on_purpose self.connected = 0 self.time_to_reconnect = None diff -r 8143e72aa6f1 -r 875625bb2767 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Sep 09 10:38:26 2009 +0200 +++ b/src/common/connection_handlers.py Wed Sep 09 13:26:53 2009 +0200 @@ -899,8 +899,8 @@ track = listener.get_playing_track() if gajim.config.get_per('accounts', self.name, 'publish_tune'): - gajim.interface.roster.music_track_changed(listener, - track, self.name) + gajim.interface.music_track_changed(listener, track, + self.name) break if features.__contains__(common.xmpp.NS_VCARD): self.vcard_supported = True diff -r 8143e72aa6f1 -r 875625bb2767 src/gajim.py --- a/src/gajim.py Wed Sep 09 10:38:26 2009 +0200 +++ b/src/gajim.py Wed Sep 09 13:26:53 2009 +0200 @@ -156,6 +156,7 @@ else: from common import dbus_support if dbus_support.supported: + from music_track_listener import MusicTrackListener import dbus if os.name == 'posix': # dl module is Unix Only @@ -243,6 +244,7 @@ from common import optparser from common import dataforms from common import passwords +from common import pep gajimpaths = common.configpaths.gajimpaths @@ -2961,6 +2963,48 @@ ### Other Methods ################################################################################ + def enable_music_listener(self): + if not self.music_track_changed_signal: + listener = MusicTrackListener.get() + self.music_track_changed_signal = listener.connect( + 'music-track-changed', self.music_track_changed) + track = listener.get_playing_track() + self.music_track_changed(listener, track) + + def disable_music_listener(self): + listener = MusicTrackListener.get() + listener.disconnect(self.music_track_changed_signal) + self.music_track_changed_signal = None + + def music_track_changed(self, unused_listener, music_track_info, account=''): + if account == '': + accounts = gajim.connections.keys() + else: + accounts = [account] + if music_track_info is None: + artist = '' + title = '' + source = '' + elif hasattr(music_track_info, 'paused') and music_track_info.paused == 0: + artist = '' + title = '' + source = '' + else: + artist = music_track_info.artist + title = music_track_info.title + source = music_track_info.album + for acct in accounts: + if acct not in gajim.connections: + continue + if not gajim.account_is_connected(acct): + continue + if not gajim.connections[acct].pep_supported: + continue + if gajim.connections[acct].music_track_info == music_track_info: + continue + pep.user_send_tune(acct, artist, title, source) + gajim.connections[acct].music_track_info = music_track_info + def read_sleepy(self): '''Check idle status and change that status if needed''' if not self.sleeper.poll(): @@ -3516,6 +3560,12 @@ except Exception: pass gobject.timeout_add_seconds(5, remote_init) + self.music_track_changed_signal = None + for account in gajim.connections: + if gajim.config.get_per('accounts', account, 'publish_tune') and \ + dbus_support.supported: + self.enable_music_listener() + break if __name__ == '__main__': def sigint_cb(num, stack): diff -r 8143e72aa6f1 -r 875625bb2767 src/roster_window.py --- a/src/roster_window.py Wed Sep 09 10:38:26 2009 +0200 +++ b/src/roster_window.py Wed Sep 09 13:26:53 2009 +0200 @@ -62,7 +62,6 @@ from common import dbus_support if dbus_support.supported: - from music_track_listener import MusicTrackListener import dbus from common.xmpp.protocol import NS_COMMANDS, NS_FILE, NS_MUC @@ -1762,38 +1761,6 @@ except Exception: pass - def music_track_changed(self, unused_listener, music_track_info, - account=''): - if account == '': - accounts = gajim.connections.keys() - if music_track_info is None: - artist = '' - title = '' - source = '' - elif hasattr(music_track_info, 'paused') and music_track_info.paused == 0: - artist = '' - title = '' - source = '' - else: - artist = music_track_info.artist - title = music_track_info.title - source = music_track_info.album - if account == '': - for account in accounts: - if not gajim.account_is_connected(account): - continue - if not gajim.connections[account].pep_supported: - continue - if gajim.connections[account].music_track_info == music_track_info: - continue - pep.user_send_tune(account, artist, title, source) - gajim.connections[account].music_track_info = music_track_info - elif account in gajim.connections and \ - gajim.connections[account].pep_supported: - if gajim.connections[account].music_track_info != music_track_info: - pep.user_send_tune(account, artist, title, source) - gajim.connections[account].music_track_info = music_track_info - def connected_rooms(self, account): if account in gajim.gc_connected[account].values(): return True @@ -3354,21 +3321,14 @@ act = widget.get_active() gajim.config.set_per('accounts', account, 'publish_tune', act) if act: - listener = MusicTrackListener.get() - if not self.music_track_changed_signal: - self.music_track_changed_signal = listener.connect( - 'music-track-changed', self.music_track_changed) - track = listener.get_playing_track() - self.music_track_changed(listener, track) + gajim.interface.enable_music_listener() else: # disable it only if no other account use it for acct in gajim.connections: if gajim.config.get_per('accounts', acct, 'publish_tune'): break else: - listener = MusicTrackListener.get() - listener.disconnect(self.music_track_changed_signal) - self.music_track_changed_signal = None + gajim.interface.disable_music_listener() if gajim.connections[account].pep_supported: # As many implementations don't support retracting items, we send a @@ -6190,7 +6150,6 @@ self.xml = gtkgui_helpers.get_glade('roster_window.glade') self.window = self.xml.get_widget('roster_window') self.hpaned = self.xml.get_widget('roster_hpaned') - self.music_track_changed_signal = None gajim.interface.msg_win_mgr = MessageWindowMgr(self.window, self.hpaned) gajim.interface.msg_win_mgr.connect('window-delete', self.on_message_window_delete) @@ -6411,16 +6370,6 @@ self._toggeling_row = False self.setup_and_draw_roster() - for account in gajim.connections: - if gajim.config.get_per('accounts', account, 'publish_tune') and \ - dbus_support.supported: - listener = MusicTrackListener.get() - self.music_track_changed_signal = listener.connect( - 'music-track-changed', self.music_track_changed) - track = listener.get_playing_track() - self.music_track_changed(listener, track) - break - if gajim.config.get('show_roster_on_startup'): self.window.show_all() else:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2009