Commits April 2012

commits@gajim.org

3 participants
95 discussions

gajim: show invitation to groupchats in chat window info bar. Fi...
by Yann Leboulanger 09 Apr '12

09 Apr '12

changeset 22920951d869 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=22920951d869 description: show invitation to groupchats in chat window info bar. Fixes #1804 diffstat: src/chat_control.py | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 3 deletions(-) diffs (82 lines): diff -r c3966b469985 -r 22920951d869 src/chat_control.py --- a/src/chat_control.py Mon Apr 09 19:45:56 2012 +0200 +++ b/src/chat_control.py Mon Apr 09 21:26:35 2012 +0200 @@ -56,6 +56,7 @@ from common.xmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_ICE_UDP from common.xmpp.protocol import NS_CHATSTATES from common.connection_handlers_events import MessageOutgoingEvent +from common.exceptions import GajimGeneralException from command_system.implementation.middleware import ChatCommandProcessor from command_system.implementation.middleware import CommandTools @@ -3246,6 +3247,36 @@ b.connect('clicked', self._on_ok, file_props, type_) self._add_info_bar_message(markup, [b], file_props, gtk.MESSAGE_ERROR) + def _on_accept_gc_invitation(self, widget, event): + room_jid = event.parameters[0] + password = event.parameters[2] + is_continued = event.parameters[3] + try: + if is_continued: + gajim.interface.join_gc_room(self.account, room_jid, + gajim.nicks[self.account], password, is_continued=True) + else: + dialogs.JoinGroupchatWindow(self.account, room_jid) + except GajimGeneralException: + pass + gajim.events.remove_events(self.account, self.contact.jid, event=event) + + def _on_cancel_gc_invitation(self, widget, event): + gajim.events.remove_events(self.account, self.contact.jid, event=event) + + def _get_gc_invitation(self, event): + room_jid = event.parameters[0] + comment = event.parameters[1] + markup = '<b>%s:</b> %s' % (_('Groupchat Invitation'), room_jid) + if comment: + markup += ' (%s)' % comment + b1 = gtk.Button(_('_Join')) + b1.connect('clicked', self._on_accept_gc_invitation, event) + b2 = gtk.Button(stock=gtk.STOCK_CANCEL) + b2.connect('clicked', self._on_cancel_gc_invitation, event) + self._add_info_bar_message(markup, [b1, b2], event.parameters, + gtk.MESSAGE_QUESTION) + def on_event_added(self, event): if event.account != self.account: return @@ -3267,6 +3298,8 @@ self._got_file_error(event.parameters, event.type_, _('File transfer cancelled'), _('Connection with peer cannot be established.')) + elif event.type_ == 'gc-invitation': + self._get_gc_invitation(event) def on_event_removed(self, event_list): """ @@ -3278,12 +3311,21 @@ if ev.jid != self.contact.jid: continue if ev.type_ not in ('file-request', 'file-completed', 'file-error', - 'file-stopped', 'file-request-error', 'file-send-error'): + 'file-stopped', 'file-request-error', 'file-send-error', + 'gc-invitation'): continue i = 0 + removed = False for ib_msg in self.info_bar_queue: - if ib_msg[2] == ev.parameters: - self.info_bar_queue.remove(ib_msg) + if ev.type_ == 'gc-invitation': + if ev.parameters[0] == ib_msg[2][0]: + self.info_bar_queue.remove(ib_msg) + removed = True + else: # file-* + if ib_msg[2] == ev.parameters: + self.info_bar_queue.remove(ib_msg) + removed = True + if removed: if i == 0: # We are removing the one currently displayed self.info_bar.set_no_show_all(True)

1 0

gajim: ability to reset options to default value. Fixes #4465
by Yann Leboulanger 09 Apr '12

09 Apr '12

changeset c3966b469985 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c3966b469985 description: ability to reset options to default value. Fixes #4465 diffstat: data/gui/advanced_configuration_window.ui | 58 +++++++++++++++-- plugins/dbus_plugin/plugin.py | 2 +- src/advanced_configuration_window.py | 55 ++++++++++++++++- src/common/config.py | 98 ++++++++++++++++++++---------- src/common/optparser.py | 1 - src/remote_control.py | 2 +- 6 files changed, 166 insertions(+), 50 deletions(-) diffs (truncated from 518 to 300 lines): diff -r 6d50c40b83de -r c3966b469985 data/gui/advanced_configuration_window.ui --- a/data/gui/advanced_configuration_window.ui Mon Apr 09 13:38:28 2012 +0200 +++ b/data/gui/advanced_configuration_window.ui Mon Apr 09 19:45:56 2012 +0200 @@ -1,24 +1,25 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> <requires lib="gtk+" version="2.16"/> -  <object class="GtkWindow" id="advanced_configuration_window"> + <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Advanced Configuration Editor</property> <property name="role">ace</property> <property name="default_width">650</property> <property name="default_height">540</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_advanced_configuration_window_destroy"/> + <signal name="destroy" handler="on_advanced_configuration_window_destroy" swapped="no"/> <child> <object class="GtkVBox" id="vbox70"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkTable" id="table26"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> @@ -26,6 +27,7 @@ <child> <object class="GtkLabel" id="label248"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Filter:</property> </object> @@ -38,7 +40,7 @@ <object class="GtkEntry" id="advanced_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <signal name="changed" handler="on_advanced_entry_changed"/> + <signal name="changed" handler="on_advanced_entry_changed" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -51,14 +53,16 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="advanced_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="rules_hint">True</property> - <signal name="row_activated" handler="on_advanced_treeview_row_activated"/> + <signal name="row-activated" handler="on_advanced_treeview_row_activated" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> </object> </child> </object> @@ -71,23 +75,28 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkFrame" id="frame36"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">3</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment90"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">6</property> <property name="left_padding">12</property> <child> <object class="GtkLabel" id="advanced_desc_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="wrap">True</property> </object> @@ -97,6 +106,7 @@ <child type="label"> <object class="GtkLabel" id="label357"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes"><b>Description</b></property> <property name="use_markup">True</property> </object> @@ -104,11 +114,13 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="restart_label"> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>NOTE:</b> You should restart Gajim for some settings to take effect</property> <property name="use_markup">True</property> @@ -123,27 +135,50 @@ <child> <object class="GtkHButtonBox" id="hbuttonbox18"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <property name="layout_style">end</property> <child> + <object class="GtkButton" id="reset_button"> + <property name="label" translatable="yes">_Reset to default</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + <property name="image">image1</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_reset_button_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="GtkButton" id="advanced_close_button"> <property name="label">gtk-close</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_advanced_close_button_clicked"/> + <signal name="clicked" handler="on_advanced_close_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">3</property> </packing> @@ -151,4 +186,9 @@ </object> </child> </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-undo</property> + </object> </interface> diff -r 6d50c40b83de -r c3966b469985 plugins/dbus_plugin/plugin.py --- a/plugins/dbus_plugin/plugin.py Mon Apr 09 13:38:28 2012 +0200 +++ b/plugins/dbus_plugin/plugin.py Mon Apr 09 19:45:56 2012 +0200 @@ -501,7 +501,7 @@ for node in path: key += node + '#' key += name - prefs_dict[DBUS_STRING(key)] = DBUS_STRING(value[1]) + prefs_dict[DBUS_STRING(key)] = DBUS_STRING(value) gajim.config.foreach(get_prefs) return prefs_dict diff -r 6d50c40b83de -r c3966b469985 src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Mon Apr 09 13:38:28 2012 +0200 +++ b/src/advanced_configuration_window.py Mon Apr 09 19:45:56 2012 +0200 @@ -81,6 +81,7 @@ self.entry = self.xml.get_object('advanced_entry') self.desc_label = self.xml.get_object('advanced_desc_label') self.restart_label = self.xml.get_object('restart_label') + self.reset_button = self.xml.get_object('reset_button') # Format: # key = option name (root/subopt/opt separated by \n then) @@ -174,6 +175,13 @@ else: #we talk about option description in advanced configuration editor self.desc_label.set_text(_('(None)')) + if len(opt_path) == 3 or (len(opt_path) == 1 and not \ + model.iter_has_child(iter_)): + self.reset_button.set_sensitive(True) + else: + self.reset_button.set_sensitive(False) + else: + self.reset_button.set_sensitive(False) def remember_option(self, option, oldval, newval): if option in self.changed_opts: @@ -195,7 +203,6 @@ optname = optnamerow[0].decode('utf-8') keyrow = self.model[modelpath[:2]] key = keyrow[0].decode('utf-8') - gajim.config.get_desc_per(optname, key, option) self.remember_option(option + '\n' + key + '\n' + optname, modelrow[1], newval) gajim.config.set_per(optname, key, option, newval) @@ -244,6 +251,42 @@ def on_advanced_configuration_window_destroy(self, widget): del gajim.interface.instances['advanced_config'] + def on_reset_button_clicked(self, widget): + model, iter_ = self.treeview.get_selection().get_selected() + # Check for GtkTreeIter + if iter_: + path = model.get_path(iter_) + opt_path = self.get_option_path(model, iter_) + if len(opt_path) == 1: + default = gajim.config.get_default(opt_path[0]) + elif len(opt_path) == 3: + default = gajim.config.get_default_per(opt_path[2], opt_path[0]) + + if model[iter_][C_TYPE] == self.types['boolean']: + if self.right_true_dict[default] == model[iter_][C_VALUE]: + return + modelpath = self.modelfilter.convert_path_to_child_path(path) + modelrow = self.model[modelpath] + option = modelrow[0].decode('utf-8') + if len(modelpath) > 1: + optnamerow = self.model[modelpath[0]] + optname = optnamerow[0].decode('utf-8') + keyrow = self.model[modelpath[:2]] + key = keyrow[0].decode('utf-8') + self.remember_option(option + '\n' + key + '\n' + optname, + modelrow[C_VALUE], default) + gajim.config.set_per(optname, key, option, default) + else: + self.remember_option(option, modelrow[C_VALUE], default) + gajim.config.set(option, default) + gajim.interface.save_config() + modelrow[C_VALUE] = self.right_true_dict[default] + self.check_for_restart() + else: + if str(default) == model[iter_][C_VALUE]: + return + self.on_config_edited(None, path, str(default)) + def on_advanced_close_button_clicked(self, widget): self.window.destroy() @@ -254,14 +297,18 @@ newparent = self.model.append(parent, [name, '', '']) self.fill_model(item, newparent) else: # Leaf - type_ = self.types[option[OPT_TYPE][0]] + if len(item) == 1: + type_ = self.types[gajim.config.get_type(name)] + elif len(item) == 3: + type_ = self.types[gajim.config.get_type_per(item[0], + item[2])] if name == 'password': value = _('Hidden') else: if type_ == self.types['boolean']: - value = self.right_true_dict[option[OPT_VAL]] + value = self.right_true_dict[option] else: - value = option[OPT_VAL] + value = option self.model.append(parent, [name, value, type_]) def visible_func(self, model, treeiter): diff -r 6d50c40b83de -r c3966b469985 src/common/config.py --- a/src/common/config.py Mon Apr 09 13:38:28 2012 +0200 +++ b/src/common/config.py Mon Apr 09 19:45:56 2012 +0200 @@ -65,7 +65,7 @@ DEFAULT_MAILAPP = 'mozilla-thunderbird -compose' DEFAULT_FILE_MANAGER = 'xffm'

1 0

gajim: add XEP-0224 support (/attention command, persistant popu...
by Yann Leboulanger 09 Apr '12

09 Apr '12

changeset 6d50c40b83de in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6d50c40b83de description: add XEP-0224 support (/attention command, persistant popup and special sound). F ixes #3465 diffstat: data/sounds/attention.wav | Bin src/chat_control.py | 9 ++++--- src/command_system/implementation/standard.py | 5 ++++ src/common/config.py | 2 + src/common/connection.py | 31 +++++++++++++++---------- src/common/connection_handlers_events.py | 22 +++++++++++++++++- src/common/xmpp/protocol.py | 1 + src/common/zeroconf/connection_zeroconf.py | 9 ++++--- src/config.py | 1 + src/dialogs.py | 14 +++++----- src/groupchat_control.py | 5 ++- src/notify.py | 31 ++++++++++++++----------- 12 files changed, 86 insertions(+), 44 deletions(-) diffs (truncated from 508 to 300 lines): diff -r 47db41e2cbdc -r 6d50c40b83de data/sounds/attention.wav Binary file data/sounds/attention.wav has changed diff -r 47db41e2cbdc -r 6d50c40b83de src/chat_control.py --- a/src/chat_control.py Sun Apr 08 17:53:53 2012 +0200 +++ b/src/chat_control.py Mon Apr 09 13:38:28 2012 +0200 @@ -863,7 +863,7 @@ def send_message(self, message, keyID='', type_='chat', chatstate=None, msg_id=None, resource=None, xhtml=None, callback=None, callback_args=[], - process_commands=True): + process_commands=True, attention=False): """ Send the given message to the active tab. Doesn't return None if error """ @@ -880,7 +880,7 @@ keyID=keyID, type_=type_, chatstate=chatstate, msg_id=msg_id, resource=resource, user_nick=self.user_nick, xhtml=xhtml, label=label, callback=callback, callback_args=callback_args, - control=self)) + control=self, attention=attention)) # Record the history of sent messages self.save_message(message, 'sent') @@ -2235,7 +2235,7 @@ dialogs.ESessionInfoWindow(self.session) def send_message(self, message, keyID='', chatstate=None, xhtml=None, - process_commands=True): + process_commands=True, attention=False): """ Send a message to contact """ @@ -2286,7 +2286,8 @@ ChatControlBase.send_message(self, message, keyID, type_='chat', chatstate=chatstate_to_send, xhtml=xhtml, callback=_on_sent, callback_args=[contact, message, encrypted, xhtml, - self.get_seclabel()], process_commands=process_commands) + self.get_seclabel()], process_commands=process_commands, + attention=attention) def check_for_possible_paused_chatstate(self, arg): """ diff -r 47db41e2cbdc -r 6d50c40b83de src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Sun Apr 08 17:53:53 2012 +0200 +++ b/src/command_system/implementation/standard.py Mon Apr 09 13:38:28 2012 +0200 @@ -230,6 +230,11 @@ state = self._video_button.get_active() self._video_button.set_active(not state) + @command(raw=True) + @doc(_("Send a message to the contact that will attract his (her) attention")) + def attention(self, message): + self.send_message(message, process_commands=False, attention=True) + class StandardChatCommands(CommandContainer): """ This command container contains standard commands which are unique diff -r 47db41e2cbdc -r 6d50c40b83de src/common/config.py --- a/src/common/config.py Sun Apr 08 17:53:53 2012 +0200 +++ b/src/common/config.py Mon Apr 09 13:38:28 2012 +0200 @@ -300,6 +300,7 @@ 'stun_server': [opt_str, '', _('STUN server to use when using jingle')], 'show_affiliation_in_groupchat': [opt_bool, True, _('If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon')], 'global_proxy': [opt_str, '', _('Proxy used for all outgoing connections if the account does not have a specific proxy configured')], + 'ignore_incoming_attention': [opt_bool, False, _('If True, Gajim will ignore incoming attention requestd ("wizz").')], } __options_per_key = { @@ -497,6 +498,7 @@ } soundevents_default = { + 'attention_received': [True, 'attention.wav'], 'first_message_received': [ True, 'message1.wav' ], 'next_message_received_focused': [ True, 'message2.wav' ], 'next_message_received_unfocused': [ True, 'message2.wav' ], diff -r 47db41e2cbdc -r 6d50c40b83de src/common/connection.py --- a/src/common/connection.py Sun Apr 08 17:53:53 2012 +0200 +++ b/src/common/connection.py Mon Apr 09 13:38:28 2012 +0200 @@ -253,7 +253,7 @@ def _prepare_message(self, jid, msg, keyID, type_='chat', subject='', chatstate=None, msg_id=None, resource=None, user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None, label=None, - original_message=None, delayed=None, callback=None): + original_message=None, delayed=None, attention=False, callback=None): if not self.connection or self.connected < 2: return 1 try: @@ -304,7 +304,8 @@ msgtxt, original_message, fjid, resource, jid, xhtml, subject, chatstate, msg_id, label, forward_from, delayed, session, - form_node, user_nick, keyID, callback) + form_node, user_nick, keyID, attention, + callback) gajim.nec.push_incoming_event(GPGTrustKeyEvent(None, conn=self, callback=_on_always_trust)) else: @@ -312,7 +313,7 @@ original_message, fjid, resource, jid, xhtml, subject, chatstate, msg_id, label, forward_from, delayed, session, form_node, user_nick, keyID, - callback) + attention, callback) gajim.thread_interface(encrypt_thread, [msg, keyID, False], _on_encrypted, []) return @@ -320,18 +321,18 @@ self._message_encrypted_cb(('', error), type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, subject, chatstate, msg_id, label, forward_from, delayed, session, - form_node, user_nick, keyID, callback) + form_node, user_nick, keyID, attention, callback) return self._on_continue_message(type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, subject, msgenc, keyID, chatstate, msg_id, label, forward_from, delayed, session, form_node, user_nick, - callback) + attention, callback) def _message_encrypted_cb(self, output, type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, subject, chatstate, msg_id, label, forward_from, delayed, session, form_node, user_nick, keyID, - callback): + attention, callback): msgenc, error = output if msgenc and not error: @@ -344,7 +345,7 @@ self._on_continue_message(type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, subject, msgenc, keyID, chatstate, msg_id, label, forward_from, delayed, session, - form_node, user_nick, callback) + form_node, user_nick, attention, callback) return # Encryption failed, do not send message tim = localtime() @@ -353,7 +354,8 @@ def _on_continue_message(self, type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, subject, msgenc, keyID, chatstate, msg_id, - label, forward_from, delayed, session, form_node, user_nick, callback): + label, forward_from, delayed, session, form_node, user_nick, attention, + callback): if type_ == 'chat': msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ=type_, xhtml=xhtml) @@ -424,6 +426,10 @@ if session.enable_encryption: msg_iq = session.encrypt_stanza(msg_iq) + # XEP-0224 + if attention: + msg_iq.setTag('attention', namespace=common.xmpp.NS_ATTENTION) + if callback: callback(jid, msg, keyID, forward_from, session, original_message, subject, type_, msg_iq, xhtml) @@ -1794,8 +1800,8 @@ def send_message(self, jid, msg, keyID=None, type_='chat', subject='', chatstate=None, msg_id=None, resource=None, user_nick=None, xhtml=None, label=None, session=None, forward_from=None, form_node=None, - original_message=None, delayed=None, callback=None, callback_args=[], - now=False): + original_message=None, delayed=None, attention=False, callback=None, + callback_args=[], now=False): def cb(jid, msg, keyID, forward_from, session, original_message, subject, type_, msg_iq, xhtml): @@ -1813,7 +1819,8 @@ chatstate=chatstate, msg_id=msg_id, resource=resource, user_nick=user_nick, xhtml=xhtml, label=label, session=session, forward_from=forward_from, form_node=form_node, - original_message=original_message, delayed=delayed, callback=cb) + original_message=original_message, delayed=delayed, + attention=attention, callback=cb) def _nec_message_outgoing(self, obj): if obj.account != self.name: @@ -1838,7 +1845,7 @@ resource=obj.resource, user_nick=obj.user_nick, xhtml=obj.xhtml, label=obj.label, session=obj.session, forward_from=obj.forward_from, form_node=obj.form_node, original_message=obj.original_message, - delayed=obj.delayed, callback=cb) + delayed=obj.delayed, attention=obj.attention, callback=cb) def send_contacts(self, contacts, jid): """ diff -r 47db41e2cbdc -r 6d50c40b83de src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Apr 08 17:53:53 2012 +0200 +++ b/src/common/connection_handlers_events.py Mon Apr 09 13:38:28 2012 +0200 @@ -1192,6 +1192,7 @@ self.sent = self.msg_obj.sent self.popup = False self.msg_id = None # id in log database + self.attention = False # XEP-0224 self.receipt_request_tag = self.stanza.getTag('request', namespace=xmpp.NS_RECEIPTS) @@ -1206,6 +1207,9 @@ if self.seclabel: self.displaymarking = self.seclabel.getTag('displaymarking') + if self.stanza.getTag('attention', namespace=xmpp.NS_ATTENTION): + self.attention = True + self.form_node = self.stanza.getTag('x', namespace=xmpp.NS_DATA) if gajim.config.get('ignore_incoming_xhtml'): @@ -2062,7 +2066,19 @@ # we're online or chat self.do_popup = True - if self.first_unread and helpers.allow_sound_notification( + if msg_obj.attention and not gajim.config.get( + 'ignore_incoming_attention'): + self.popup_timeout = 0 + self.do_popup = True + else: + self.popup_timeout = gajim.config.get('notification_timeout') + + if msg_obj.attention and not gajim.config.get( + 'ignore_incoming_attention') and gajim.config.get_per('soundevents', + 'attention_received', 'enabled'): + self.sound_event = 'attention_received' + self.do_sound = True + elif self.first_unread and helpers.allow_sound_notification( self.conn.name, 'first_message_received'): self.do_sound = True elif not self.first_unread and self.control_focused and \ @@ -2175,6 +2191,8 @@ self.popup_image = gtkgui_helpers.get_path_to_generic_or_avatar( img_path, jid=self.jid, suffix=suffix) + self.popup_timeout = gajim.config.get('notification_timeout') + if event == 'status_change': self.popup_title = _('%(nick)s Changed Status') % \ {'nick': gajim.get_name_from_jid(account, self.jid)} @@ -2219,6 +2237,7 @@ self.popup_event_type = '' self.popup_msg_type = '' self.popup_image = '' + self.popup_timeout = -1 self.do_command = False self.command = '' @@ -2261,6 +2280,7 @@ self.now = False self.is_loggable = True self.control = None + self.attention = False def generate(self): return True diff -r 47db41e2cbdc -r 6d50c40b83de src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Sun Apr 08 17:53:53 2012 +0200 +++ b/src/common/xmpp/protocol.py Mon Apr 09 13:38:28 2012 +0200 @@ -40,6 +40,7 @@ NS_ARCHIVE_MANUAL = NS_ARCHIVE + ':manual' # XEP-0136 NS_ARCHIVE_PREF = NS_ARCHIVE + ':pref' NS_ATOM = 'http://www.w3.org/2005/Atom' +NS_ATTENTION = 'urn:xmpp:attention:0' # XEP-0224 NS_AUTH = 'jabber:iq:auth' NS_AVATAR = 'http://www.xmpp.org/extensions/xep-0084.html#ns-metadata' NS_BIND = 'urn:ietf:params:xml:ns:xmpp-bind' diff -r 47db41e2cbdc -r 6d50c40b83de src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Sun Apr 08 17:53:53 2012 +0200 +++ b/src/common/zeroconf/connection_zeroconf.py Mon Apr 09 13:38:28 2012 +0200 @@ -336,8 +336,8 @@ def send_message(self, jid, msg, keyID, type_='chat', subject='', chatstate=None, msg_id=None, resource=None, user_nick=None, xhtml=None, label=None, session=None, forward_from=None, form_node=None, - original_message=None, delayed=None, callback=None, callback_args=[], - now=True): + original_message=None, delayed=None, attention=False, callback=None, + callback_args=[], now=True): def on_send_ok(msg_id): gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, @@ -370,7 +370,8 @@ chatstate=chatstate, msg_id=msg_id, resource=resource, user_nick=user_nick, xhtml=xhtml, session=session, forward_from=forward_from, form_node=form_node, - original_message=original_message, delayed=delayed, callback=cb) + original_message=original_message, delayed=delayed, + attention=attention, callback=cb) def _nec_message_outgoing(self, obj): if obj.account != self.name: @@ -411,7 +412,7 @@ resource=obj.resource, user_nick=obj.user_nick, xhtml=obj.xhtml, label=obj.label, session=obj.session, forward_from=obj.forward_from, form_node=obj.form_node, original_message=obj.original_message, - delayed=obj.delayed, callback=cb) + delayed=obj.delayed, attention=obj.attention, callback=cb) def send_stanza(self, stanza): # send a stanza untouched

1 0

gajim: ability for a plugin to raise NodeProcessed
by Yann Leboulanger 08 Apr '12

08 Apr '12

changeset 47db41e2cbdc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=47db41e2cbdc description: ability for a plugin to raise NodeProcessed diffstat: src/common/ged.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (28 lines): diff -r 0c957cef7537 -r 47db41e2cbdc src/common/ged.py --- a/src/common/ged.py Sun Apr 08 17:32:45 2012 +0200 +++ b/src/common/ged.py Sun Apr 08 17:53:53 2012 +0200 @@ -27,6 +27,7 @@ import traceback +from common.xmpp import NodeProcessed import logging log = logging.getLogger('gajim.c.ged') @@ -86,11 +87,16 @@ def raise_event(self, event_name, *args, **kwargs): log.debug('%s\nArgs: %s'%(event_name, str(args))) if event_name in self.handlers: + node_processed = False for priority, handler in self.handlers[event_name]: try: if handler(*args, **kwargs): return True + except NodeProcessed: + node_processed = True except Exception, e: log.error('Error while running an even handler: %s' % \ handler) traceback.print_exc() + if node_processed: + raise NodeProcessed

1 0

gajim: don't enable roster filter when we press a unicode key wi...
by Yann Leboulanger 08 Apr '12

08 Apr '12

changeset 0c957cef7537 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0c957cef7537 description: don't enable roster filter when we press a unicode key with alt, control or shift (like Ctrl+i) diffstat: src/roster_window.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 2aaa268a776f -r 0c957cef7537 src/roster_window.py --- a/src/roster_window.py Sun Apr 08 12:29:57 2012 +0200 +++ b/src/roster_window.py Sun Apr 08 17:32:45 2012 +0200 @@ -3412,7 +3412,9 @@ elif type_ == 'agent': self.on_remove_agent(widget, list_) - elif gtk.gdk.keyval_to_unicode(event.keyval): # if we got unicode symbol + elif not (event.state & (gtk.gdk.SHIFT_MASK | gtk.gdk.CONTROL_MASK | \ + gtk.gdk.MOD1_MASK)) and gtk.gdk.keyval_to_unicode(event.keyval): + # if we got unicode symbol without ctrl / shift / alt num = gtk.gdk.keyval_to_unicode(event.keyval) self.enable_rfilter(unichr(num))

1 0

gajim: [aranea] install plugins in datadir, even when using --en...
by Yann Leboulanger 08 Apr '12

08 Apr '12

changeset 2aaa268a776f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2aaa268a776f description: [aranea] install plugins in datadir, even when using --enable-site-packages si Gajim can find them. diffstat: configure.ac | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (17 lines): diff -r 771cbf02190a -r 2aaa268a776f configure.ac --- a/configure.ac Sun Apr 08 01:35:22 2012 +0200 +++ b/configure.ac Sun Apr 08 12:29:57 2012 +0200 @@ -47,11 +47,11 @@ instead of DATADIR/gajim/src.])] , AC_SUBST([gajim_srcdir], [\${pkgpythondir}]) -AC_SUBST([gajim_pluginsdir], [\${pkgpythondir}]) , AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src]) +) + AC_SUBST([gajim_pluginsdir], [\${datadir}/\${PACKAGE}/plugins]) -) AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}") AS_AC_EXPAND(PKGDATADIR, "${datadir}/${PACKAGE}")

1 0

gajim: dont compare hashes on SI transfer
by Jefry Lagrange 08 Apr '12

08 Apr '12

changeset 17e362df3348 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=17e362df3348 description: dont compare hashes on SI transfer diffstat: src/filetransfers_window.py | 4 +++- src/gui_interface.py | 13 +++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diffs (44 lines): diff -r 06bd222f8cc3 -r 17e362df3348 src/filetransfers_window.py --- a/src/filetransfers_window.py Sat Apr 07 00:56:44 2012 -0400 +++ b/src/filetransfers_window.py Sat Apr 07 23:12:15 2012 -0400 @@ -639,7 +639,9 @@ status = 'stop' self.model.set(iter_, 0, self.get_icon(status)) if transfered_size == full_size: - if file_props['type'] == 'r': + # If we are receiver and this is a jingle session + if file_props['type'] == 'r' and 'session-sid' in file_props: + # Show that we are computing the hash self.set_status(typ, sid, 'computing') else: self.set_status(typ, sid, 'ok') diff -r 06bd222f8cc3 -r 17e362df3348 src/gui_interface.py --- a/src/gui_interface.py Sat Apr 07 00:56:44 2012 -0400 +++ b/src/gui_interface.py Sat Apr 07 23:12:15 2012 -0400 @@ -34,7 +34,6 @@ ## You should have received a copy of the GNU General Public License ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## - import os import sys import re @@ -954,11 +953,13 @@ return if file_props['type'] == 'r': # we receive a file - jid = unicode(file_props['sender']) - # Compare hashes in a new thread - self.hashThread = Thread(target=self.__compare_hashes, - args=(account, file_props)) - self.hashThread.start() + # If we have a jingle session id, it is a jingle transfer + # we compare hashes + if 'session-sid' in file_props: + # Compare hashes in a new thread + self.hashThread = Thread(target=self.__compare_hashes, + args=(account, file_props)) + self.hashThread.start() gajim.socks5queue.remove_receiver(file_props['sid'], True, True) else: # we send a file jid = unicode(file_props['receiver'])

1 0

gajim: remove snarl test plugin. It is now in plugins repos
by Yann Leboulanger 07 Apr '12

07 Apr '12

changeset 771cbf02190a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=771cbf02190a description: remove snarl test plugin. It is now in plugins repos diffstat: plugins/snarl_notifications/PySnarl.py | 772 ------------------------------- plugins/snarl_notifications/__init__.py | 1 - plugins/snarl_notifications/manifest.ini | 11 - plugins/snarl_notifications/plugin.py | 71 -- 4 files changed, 0 insertions(+), 855 deletions(-) diffs (truncated from 871 to 300 lines): diff -r 8513eb020fa8 -r 771cbf02190a plugins/snarl_notifications/PySnarl.py --- a/plugins/snarl_notifications/PySnarl.py Tue Apr 03 19:38:15 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,772 +0,0 @@ -""" -A python version of the main functions to use Snarl -(http://www.fullphat.net/snarl) - -Version 1.0 - -This module can be used in two ways. One is the normal way -the other snarl interfaces work. This means you can call snShowMessage -and get an ID back for manipulations. - -The other way is there is a class this module exposes called SnarlMessage. -This allows you to keep track of the message as a python object. If you -use the send without specifying False as the argument it will set the ID -to what the return of the last SendMessage was. This is of course only -useful for the SHOW message. - -Requires one of: - pywin32 extensions from http://pywin32.sourceforge.net - ctypes (included in Python 2.5, downloadable for earlier versions) - -Creator: Sam Listopad II (samlii(a)users.sourceforge.net) - -Copyright 2006-2008 Samuel Listopad II - -Licensed under the Apache License, Version 2.0 (the "License"); you may not -use this file except in compliance with the License. You may obtain a copy -of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required -by applicable law or agreed to in writing, software distributed under the -License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS -OF ANY KIND, either express or implied. See the License for the specific -language governing permissions and limitations under the License. -""" - -import array, struct - -def LOWORD(dword): - """Return the low WORD of the passed in integer""" - return dword & 0x0000ffff -#get the hi word -def HIWORD(dword): - """Return the high WORD of the passed in integer""" - return dword >> 16 - -class Win32FuncException(Exception): - def __init__(self, value): - self.value = value - - def __str__(self): - return repr(self.value) - -class Win32Funcs: - """Just a little class to hide the details of finding and using the -correct win32 functions. The functions may throw a UnicodeEncodeError if -there is not a unicode version and it is sent a unicode string that cannot -be converted to ASCII.""" - WM_USER = 0x400 - WM_COPYDATA = 0x4a - #Type of String the functions are expecting. - #Used like function(myWin32Funcs.strType(param)). - __strType = str - #FindWindow function to use - __FindWindow = None - #FindWindow function to use - __FindWindowEx = None - #SendMessage function to use - __SendMessage = None - #SendMessageTimeout function to use - __SendMessageTimeout = None - #IsWindow function to use - __IsWindow = None - #RegisterWindowMessage to use - __RegisterWindowMessage = None - #GetWindowText to use - __GetWindowText = None - - def FindWindow(self, lpClassName, lpWindowName): - """Wraps the windows API call of FindWindow""" - if lpClassName is not None: - lpClassName = self.__strType(lpClassName) - if lpWindowName is not None: - lpWindowName = self.__strType(lpWindowName) - return self.__FindWindow(lpClassName, lpWindowName) - - def FindWindowEx(self, hwndParent, hwndChildAfter, lpClassName, lpWindowName): - """Wraps the windows API call of FindWindow""" - if lpClassName is not None: - lpClassName = self.__strType(lpClassName) - if lpWindowName is not None: - lpWindowName = self.__strType(lpWindowName) - return self.__FindWindowEx(hwndParent, hwndChildAfter, lpClassName, lpWindowName) - - def SendMessage(self, hWnd, Msg, wParam, lParam): - """Wraps the windows API call of SendMessage""" - return self.__SendMessage(hWnd, Msg, wParam, lParam) - - def SendMessageTimeout(self, hWnd, Msg, - wParam, lParam, fuFlags, - uTimeout, lpdwResult = None): - """Wraps the windows API call of SendMessageTimeout""" - idToRet = None - try: - idFromMsg = array.array('I', [0]) - result = idFromMsg.buffer_info()[0] - response = self.__SendMessageTimeout(hWnd, Msg, wParam, - lParam, fuFlags, - uTimeout, result) - if response == 0: - raise Win32FuncException, "SendMessageTimeout TimedOut" - - idToRet = idFromMsg[0] - except TypeError: - idToRet = self.__SendMessageTimeout(hWnd, Msg, wParam, - lParam, fuFlags, - uTimeout) - - if lpdwResult is not None and lpdwResult.typecode == 'I': - lpdwResult[0] = idToRet - - return idToRet - - def IsWindow(self, hWnd): - """Wraps the windows API call of IsWindow""" - return self.__IsWindow(hWnd) - - def RegisterWindowMessage(self, lpString): - """Wraps the windows API call of RegisterWindowMessage""" - return self.__RegisterWindowMessage(self.__strType(lpString)) - - def GetWindowText(self, hWnd, lpString = None, nMaxCount = None): - """Wraps the windows API call of SendMessageTimeout""" - text = '' - if hWnd == 0: - return text - - if nMaxCount is None: - nMaxCount = 1025 - - try: - arrayType = 'c' - if self.__strType == unicode: - arrayType = 'u' - path_string = array.array(arrayType, self.__strType('\x00') * nMaxCount) - path_buffer = path_string.buffer_info()[0] - result = self.__GetWindowText(hWnd, - path_buffer, - nMaxCount) - if result > 0: - if self.__strType == unicode: - text = path_string[0:result].tounicode() - else: - text = path_string[0:result].tostring() - except TypeError: - text = self.__GetWindowText(hWnd) - - if lpString is not None and lpString.typecode == 'c': - lpdwResult[0:len(text)] = array.array('c', str(text)); - - if lpString is not None and lpString.typecode == 'u': - lpdwResult[0:len(text)] = array.array('u', unicode(text)); - - return text - - def __init__(self): - """Load up my needed functions""" - # First see if they already have win32gui imported. If so use it. - # This has to be checked first since the auto check looks for ctypes - # first. - try: - self.__FindWindow = win32gui.FindWindow - self.__FindWindowEx = win32gui.FindWindowEx - self.__GetWindowText = win32gui.GetWindowText - self.__IsWindow = win32gui.IsWindow - self.__SendMessage = win32gui.SendMessage - self.__SendMessageTimeout = win32gui.SendMessageTimeout - self.__RegisterWindowMessage = win32gui.RegisterWindowMessage - self.__strType = unicode - - #Something threw a NameError, most likely the win32gui lines - #so do auto check - except NameError: - try: - from ctypes import windll - self.__FindWindow = windll.user32.FindWindowW - self.__FindWindowEx = windll.user32.FindWindowExW - self.__GetWindowText = windll.user32.GetWindowTextW - self.__IsWindow = windll.user32.IsWindow - self.__SendMessage = windll.user32.SendMessageW - self.__SendMessageTimeout = windll.user32.SendMessageTimeoutW - self.__RegisterWindowMessage = windll.user32.RegisterWindowMessageW - self.__strType = unicode - - #FindWindowW wasn't found, look for FindWindowA - except AttributeError: - try: - self.__FindWindow = windll.user32.FindWindowA - self.__FindWindowEx = windll.user32.FindWindowExA - self.__GetWindowText = windll.user32.GetWindowTextA - self.__IsWindow = windll.user32.IsWindow - self.__SendMessage = windll.user32.SendMessageA - self.__SendMessageTimeout = windll.user32.SendMessageTimeoutA - self.__RegisterWindowMessage = windll.user32.RegisterWindowMessageA - # Couldn't find either so Die and tell user why. - except AttributeError: - import sys - sys.stderr.write("Your Windows TM setup seems to be corrupt."+ - " No FindWindow found in user32.\n") - sys.stderr.flush() - sys.exit(3) - - except ImportError: - try: - import win32gui - self.__FindWindow = win32gui.FindWindow - self.__FindWindowEx = win32gui.FindWindowEx - self.__GetWindowText = win32gui.GetWindowText - self.__IsWindow = win32gui.IsWindow - self.__SendMessage = win32gui.SendMessage - self.__SendMessageTimeout = win32gui.SendMessageTimeout - self.__RegisterWindowMessage = win32gui.RegisterWindowMessage - self.__strType = unicode - - except ImportError: - import sys - sys.stderr.write("You need to have either"+ - " ctypes or pywin32 installed.\n") - sys.stderr.flush() - #sys.exit(2) - - -myWin32Funcs = Win32Funcs() - - -SHOW = 1 -HIDE = 2 -UPDATE = 3 -IS_VISIBLE = 4 -GET_VERSION = 5 -REGISTER_CONFIG_WINDOW = 6 -REVOKE_CONFIG_WINDOW = 7 -REGISTER_ALERT = 8 -REVOKE_ALERT = 9 -REGISTER_CONFIG_WINDOW_2 = 10 -GET_VERSION_EX = 11 -SET_TIMEOUT = 12 - -EX_SHOW = 32 - -GLOBAL_MESSAGE = "SnarlGlobalMessage" -GLOBAL_MSG = "SnarlGlobalEvent" - -#Messages That may be received from Snarl -SNARL_LAUNCHED = 1 -SNARL_QUIT = 2 -SNARL_ASK_APPLET_VER = 3 -SNARL_SHOW_APP_UI = 4 - -SNARL_NOTIFICATION_CLICKED = 32 #notification was right-clicked by user -SNARL_NOTIFICATION_CANCELLED = SNARL_NOTIFICATION_CLICKED #Name clarified -SNARL_NOTIFICATION_TIMED_OUT = 33 -SNARL_NOTIFICATION_ACK = 34 #notification was left-clicked by user - -#Snarl Test Message -WM_SNARLTEST = myWin32Funcs.WM_USER + 237 - -M_ABORTED = 0x80000007L -M_ACCESS_DENIED = 0x80000009L -M_ALREADY_EXISTS = 0x8000000CL -M_BAD_HANDLE = 0x80000006L -M_BAD_POINTER = 0x80000005L -M_FAILED = 0x80000008L -M_INVALID_ARGS = 0x80000003L -M_NO_INTERFACE = 0x80000004L -M_NOT_FOUND = 0x8000000BL -M_NOT_IMPLEMENTED = 0x80000001L -M_OK = 0x00000000L -M_OUT_OF_MEMORY = 0x80000002L -M_TIMED_OUT = 0x8000000AL - -ErrorCodeRev = { - 0x80000007L : "M_ABORTED", - 0x80000009L : "M_ACCESS_DENIED", - 0x8000000CL : "M_ALREADY_EXISTS", - 0x80000006L : "M_BAD_HANDLE", - 0x80000005L : "M_BAD_POINTER", - 0x80000008L : "M_FAILED", - 0x80000003L : "M_INVALID_ARGS", - 0x80000004L : "M_NO_INTERFACE", - 0x8000000BL : "M_NOT_FOUND", - 0x80000001L : "M_NOT_IMPLEMENTED", - 0x00000000L : "M_OK", - 0x80000002L : "M_OUT_OF_MEMORY", - 0x8000000AL : "M_TIMED_OUT" - } - -class SnarlMessage(object): - """The main Snarl interface object.

1 0

gajim: don't commit SQL request too fast to improve performences...
by Yann Leboulanger 07 Apr '12

07 Apr '12

changeset 692089c2d7d4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=692089c2d7d4 description: don't commit SQL request too fast to improve performences. Fixes #6905 diffstat: src/common/logger.py | 49 ++++++++++++++++++++++++++++++------------------- 1 files changed, 30 insertions(+), 19 deletions(-) diffs (121 lines): diff -r 8655f45bc38f -r 692089c2d7d4 src/common/logger.py --- a/src/common/logger.py Sun Apr 01 20:17:05 2012 +0200 +++ b/src/common/logger.py Tue Apr 03 19:38:15 2012 +0200 @@ -34,6 +34,7 @@ import datetime from gzip import GzipFile from cStringIO import StringIO +import gobject import exceptions import gajim @@ -106,6 +107,7 @@ def __init__(self): self.jids_already_in = [] # holds jids that we already have in DB self.con = None + self.commit_timout_id = None if not os.path.exists(LOG_DB_PATH): # this can happen only the first time (the time we create the db) @@ -163,15 +165,25 @@ self.open_db() self.get_jids_already_in_db() + def _really_commit(self): + try: + self.con.commit() + except sqlite.OperationalError, e: + print >> sys.stderr, str(e) + self.commit_timout_id = None + return False + + def _timeout_commit(self): + if self.commit_timout_id: + return + self.commit_timout_id = gobject.timeout_add(500, self._really_commit) + def simple_commit(self, sql_to_commit): """ Helper to commit """ self.cur.execute(sql_to_commit) - try: - self.con.commit() - except sqlite.OperationalError, e: - print >> sys.stderr, str(e) + self._timeout_commit() def get_jids_already_in_db(self): try: @@ -398,12 +410,14 @@ except sqlite.OperationalError, e: raise exceptions.PysqliteOperationalError(str(e)) message_id = None - try: - self.con.commit() - if write_unread: + if write_unread: + try: + self.con.commit() message_id = self.cur.lastrowid - except sqlite.OperationalError, e: - print >> sys.stderr, str(e) + except sqlite.OperationalError, e: + print >> sys.stderr, str(e) + else: + self._timeout_commit() if message_id: self.insert_unread_events(message_id, values[0]) return message_id @@ -909,10 +923,7 @@ VALUES (?, ?, ?, ?); ''', (hash_method, hash_, buffer(data), int(time.time()))) # (1) -- note above - try: - self.con.commit() - except sqlite.OperationalError, e: - print >> sys.stderr, str(e) + self._timeout_commit() def update_caps_time(self, method, hash_): sql = '''UPDATE caps_cache SET last_seen = %d @@ -950,9 +961,9 @@ # Fill roster tables with the new roster for jid in roster: self.add_or_update_contact(account_jid, jid, roster[jid]['name'], - roster[jid]['subscription'], roster[jid]['ask'], - roster[jid]['groups'], commit=False) - self.con.commit() + roster[jid]['subscription'], roster[jid]['ask'], + roster[jid]['groups'], commit=False) + self._timeout_commit() # At this point, we are sure the replacement works properly so we can # set the new roster_version value. @@ -974,7 +985,7 @@ self.cur.execute( 'DELETE FROM roster_entry WHERE account_jid_id=? AND jid_id=?', (account_jid_id, jid_id)) - self.con.commit() + self._timeout_commit() def add_or_update_contact(self, account_jid, jid, name, sub, ask, groups, commit=True): @@ -1009,7 +1020,7 @@ self.convert_human_subscription_values_to_db_api_values(sub), bool(ask))) if commit: - self.con.commit() + self._timeout_commit() def get_roster(self, account_jid): """ @@ -1062,7 +1073,7 @@ (account_jid_id,)) self.cur.execute('DELETE FROM roster_group WHERE account_jid_id=?', (account_jid_id,)) - self.con.commit() + self._timeout_commit() def save_if_not_exists(self, with_, direction, tim, msg='', nick=None): if tim:

1 0

gajim: we require PyGTK2.22 for InfoBar
by Yann Leboulanger 07 Apr '12

07 Apr '12

changeset 8655f45bc38f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8655f45bc38f description: we require PyGTK2.22 for InfoBar diffstat: README.html | 2 +- debian/control | 2 +- src/gajim.py | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diffs (46 lines): diff -r 627d4c33003b -r 8655f45bc38f README.html --- a/README.html Sun Apr 01 19:47:11 2012 +0200 +++ b/README.html Sun Apr 01 20:17:05 2012 +0200 @@ -15,7 +15,7 @@ <h2>Runtime Requirements</h2> <ul> <li>python2.5 or higher</li> -<li>pygtk2.16 or higher</li> +<li>pygtk2.22 or higher</li> </ul> <h2>Optional Runtime Requirements</h2> diff -r 627d4c33003b -r 8655f45bc38f debian/control --- a/debian/control Sun Apr 01 19:47:11 2012 +0200 +++ b/debian/control Sun Apr 01 20:17:05 2012 +0200 @@ -10,7 +10,7 @@ Package: gajim Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.16.0), dnsutils +Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.22.0), dnsutils Recommends: dbus, python-dbus, notification-daemon, python-openssl (>= 0.12), python-crypto, python-pyasn1 Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farsight, gstreamer0.10-plugins-ugly, python-pycurl Description: Jabber client written in PyGTK diff -r 627d4c33003b -r 8655f45bc38f src/gajim.py --- a/src/gajim.py Sun Apr 01 19:47:11 2012 +0200 +++ b/src/gajim.py Sun Apr 01 20:17:05 2012 +0200 @@ -233,12 +233,12 @@ elif sysname in ('FreeBSD', 'OpenBSD', 'NetBSD'): libc.setproctitle('gajim') - if gtk.pygtk_version < (2, 16, 0): - pritext = _('Gajim needs PyGTK 2.16 or above') - sectext = _('Gajim needs PyGTK 2.16 or above to run. Quiting...') - elif gtk.gtk_version < (2, 16, 0): - pritext = _('Gajim needs GTK 2.16 or above') - sectext = _('Gajim needs GTK 2.16 or above to run. Quiting...') + if gtk.pygtk_version < (2, 22, 0): + pritext = _('Gajim needs PyGTK 2.22 or above') + sectext = _('Gajim needs PyGTK 2.22 or above to run. Quiting...') + elif gtk.gtk_version < (2, 22, 0): + pritext = _('Gajim needs GTK 2.22 or above') + sectext = _('Gajim needs GTK 2.22 or above to run. Quiting...') from common import check_paths

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2012