Commits June 2009

commits@gajim.org

7 participants
114 discussions

gajim: Put in button that starts new widget. Changed widget so i...
by Ummu＠lagaule.org 28 Jun '09

28 Jun '09

changeset a33567165405 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a33567165405 description: Put in button that starts new widget. Changed widget so it takes in gajim.connection[self.account]. diffstat: data/glade/message_window.glade | 23 +++++++++++++++++++++++ src/chat_control.py | 24 +++++++++++++++--------- src/whiteboardwidget.py | 2 +- 3 files changed, 39 insertions(+), 10 deletions(-) diffs (84 lines): diff -r f7147f583a98 -r a33567165405 data/glade/message_window.glade --- a/data/glade/message_window.glade Fri Jun 26 00:25:32 2009 -0700 +++ b/data/glade/message_window.glade Sun Jun 28 04:56:25 2009 -0700 @@ -332,6 +332,29 @@ <property name="expand">False</property> <property name="position">4</property> </packing> + </child> <child> + <widget class="GtkButton" id="start_whiteboard_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip" translatable="yes">Start using Whiteboard</property> + <property name="relief">none</property> + <property name="focus_on_click">False</property> + <child> + <widget class="GtkImage" id="image12"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="stock">gtk-info</property> + <property name="icon-size">2</property> + </widget> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">4</property> + </packing> </child> <child> <widget class="GtkButton" id="convert_to_gc_button"> diff -r f7147f583a98 -r a33567165405 src/chat_control.py --- a/src/chat_control.py Fri Jun 26 00:25:32 2009 -0700 +++ b/src/chat_control.py Sun Jun 28 04:56:25 2009 -0700 @@ -292,14 +292,11 @@ self.smooth = True self.msg_textview.grab_focus() - # Whiteboard - whiteboard = Whiteboard() - hbox = self.xml.get_widget('chat_child_hbox') - try: - hbox.pack_start(whiteboard) - except: - pass # It is a group chat, do it later - + # Hook up whiteboard button + widget = self.xml.get_widget('start_whiteboard_button') + id_ = widget.connect('clicked', self._on_whiteboard_button_clicked) + self.handlers[id_] = widget + def set_speller(self): try: lang = gajim.config.get('speller_language') @@ -2749,5 +2746,14 @@ self.print_conversation(' (', 'status', simple=True) self.print_conversation('%s' % (status), 'status', simple=True) self.print_conversation(')', 'status', simple=True) - + + def _on_whiteboard_button_clicked(self, widget): + whiteboard = Whiteboard(gajim.connections[self.account]) + hbox = self.xml.get_widget('chat_child_hbox') + try: + hbox.pack_start(whiteboard) + whiteboard.show() + except: + pass # TODO: Fix problem with groupchat? + # vim: se ts=3: diff -r f7147f583a98 -r a33567165405 src/whiteboardwidget.py --- a/src/whiteboardwidget.py Fri Jun 26 00:25:32 2009 -0700 +++ b/src/whiteboardwidget.py Sun Jun 28 04:56:25 2009 -0700 @@ -9,7 +9,7 @@ """ class Whiteboard(goocanvas.Canvas): - def __init__(self): + def __init__(self, connection): goocanvas.Canvas.__init__(self) self.set_flags(gtk.CAN_FOCUS) self.root = self.get_root_item()

1 0

gajim: * added 'ask' support
by Anaël Verrier 27 Jun '09

27 Jun '09

changeset b67198acb52f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b67198acb52f description: * added 'ask' support * fixed a bug (when a contact does not have a name) diffstat: src/common/check_paths.py | 1 + src/common/connection_handlers.py | 2 +- src/common/logger.py | 29 ++++++++++++++++++++--------- src/common/optparser.py | 1 + 4 files changed, 23 insertions(+), 10 deletions(-) diffs (98 lines): diff -r af17977674b1 -r b67198acb52f src/common/check_paths.py --- a/src/common/check_paths.py Sat Jun 27 17:56:04 2009 +0200 +++ b/src/common/check_paths.py Sat Jun 27 20:54:49 2009 +0200 @@ -102,6 +102,7 @@ jid_id INTEGER, name TEXT, subscription INTEGER, + ask BOOLEAN, PRIMARY KEY (account_jid_id, jid_id) ); diff -r af17977674b1 -r b67198acb52f src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Jun 27 17:56:04 2009 +0200 +++ b/src/common/connection_handlers.py Sat Jun 27 20:54:49 2009 +0200 @@ -1565,7 +1565,7 @@ if version: account_jid = gajim.get_jid_from_account(self.name) gajim.logger.add_or_update_contact(account_jid, jid, name, sub, - groups) + ask, groups) gajim.config.set_per('accounts', self.name, 'roster_version', version) if not self.connection or self.connected < 2: diff -r af17977674b1 -r b67198acb52f src/common/logger.py --- a/src/common/logger.py Sat Jun 27 17:56:04 2009 +0200 +++ b/src/common/logger.py Sat Jun 27 20:54:49 2009 +0200 @@ -846,7 +846,8 @@ # 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]['groups']) + roster[jid]['subscription'], roster[jid]['ask'], + roster[jid]['groups']) gajim.config.set_per('accounts', account_name, 'roster_version', roster_version) @@ -860,7 +861,7 @@ sql = 'DELETE FROM roster_entry WHERE account_jid_id = %d AND jid_id = %d' % (account_jid_id, jid_id) self.simple_commit(sql) - def add_or_update_contact(self, account_jid, jid, name, sub, groups): + def add_or_update_contact(self, account_jid, jid, name, sub, ask, groups): ''' Add or update a contact from account_jid roster. ''' if sub == 'remove': self.del_contact(account_jid, jid) @@ -882,9 +883,13 @@ account_jid_id, jid_id, group) self.cur.execute(sql) - sql = 'REPLACE INTO roster_entry VALUES("%d", "%d", "%s", "%d")' % ( - account_jid_id, jid_id, name, - self.convert_human_subscription_values_to_db_api_values(sub)) + if name is None: + name = '' + + sql = 'REPLACE INTO roster_entry VALUES("%d", "%d", "%s", "%s", "%d")'\ + % (account_jid_id, jid_id, name, + self.convert_human_subscription_values_to_db_api_values(sub), + bool(ask)) self.simple_commit(sql) def get_roster(self, account_jid): @@ -893,14 +898,20 @@ account_jid_id = self.get_jid_id(account_jid) # First we fill data with roster_entry informations - self.cur.execute('SELECT j.jid, re.jid_id, re.name, re.subscription FROM roster_entry re, jids j WHERE re.account_jid_id="%(account_jid_id)s" AND j.jid_id=re.jid_id' % {'account_jid_id': account_jid_id}) - for jid, jid_id, name, subscription in self.cur: + self.cur.execute('SELECT j.jid, re.jid_id, re.name, re.subscription, re.ask FROM roster_entry re, jids j WHERE re.account_jid_id="%(account_jid_id)s" AND j.jid_id=re.jid_id' % {'account_jid_id': account_jid_id}) + for jid, jid_id, name, subscription, ask in self.cur: data[jid] = {} - data[jid]['name'] = name + if name: + data[jid]['name'] = name + else: + data[jid]['name'] = None data[jid]['subscription'] = self.convert_db_api_values_to_human_subscription_values(subscription) data[jid]['groups'] = [] data[jid]['resources'] = {} - data[jid]['ask'] = None + if ask: + data[jid]['ask'] = 'subscribe' + else: + data[jid]['ask'] = None data[jid]['id'] = jid_id # Then we add group for roster entries diff -r af17977674b1 -r b67198acb52f src/common/optparser.py --- a/src/common/optparser.py Sat Jun 27 17:56:04 2009 +0200 +++ b/src/common/optparser.py Sat Jun 27 20:54:49 2009 +0200 @@ -687,6 +687,7 @@ jid_id INTEGER, name TEXT, subscription INTEGER, + ask BOOLEAN, PRIMARY KEY (account_jid_id, jid_id) );

1 0

gajim: * added a method to load roster from DB
by Anaël Verrier 27 Jun '09

27 Jun '09

changeset af17977674b1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=af17977674b1 description: * added a method to load roster from DB * now we load roster from DB when we receive an iq result for the roster without any query * added a "force" argument to NonBlockingRoster.getRoster(), to force the return of the instance diffstat: src/common/connection_handlers.py | 19 +++++++-- src/common/logger.py | 67 ++++++++++++++++++++++++++++++++- src/common/xmpp/client_nb.py | 6 +- src/common/xmpp/roster_nb.py | 25 +++++++++--- 4 files changed, 101 insertions(+), 16 deletions(-) diffs (267 lines): diff -r aa48681bbda0 -r af17977674b1 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Jun 23 22:24:39 2009 +0200 +++ b/src/common/connection_handlers.py Sat Jun 27 17:56:04 2009 +0200 @@ -65,6 +65,7 @@ VCARD_ARRIVED = 'vcard_arrived' AGENT_REMOVED = 'agent_removed' METACONTACTS_ARRIVED = 'metacontacts_arrived' +ROSTER_ARRIVED = 'roster_arrived' PRIVACY_ARRIVED = 'privacy_arrived' PEP_CONFIG = 'pep_config' HAS_IDLE = True @@ -1166,7 +1167,16 @@ # We can now continue connection by requesting the roster version = gajim.config.get_per('accounts', self.name, 'roster_version') - self.connection.initRoster(version=version) + iq_id = self.connection.initRoster(version=version) + self.awaiting_answers[iq_id] = (ROSTER_ARRIVED, ) + elif self.awaiting_answers[id_][0] == ROSTER_ARRIVED: + if iq_obj.getType() == 'result': + if not iq_obj.getTag('query'): + account_jid = gajim.get_jid_from_account(self.name) + roster_data = gajim.logger.get_roster(account_jid) + roster = self.connection.getRoster(force=True) + roster.setRaw(roster_data) + self._getRoster() elif self.awaiting_answers[id_][0] == PRIVACY_ARRIVED: if iq_obj.getType() != 'error': self.privacy_rules_supported = True @@ -2418,7 +2428,7 @@ self.connection.send(result) raise common.xmpp.NodeProcessed - def _getRosterCB(self, con, iq_obj): + def _getRoster(self): log.debug('getRosterCB') if not self.connection: return @@ -2441,6 +2451,7 @@ gajim.proxy65_manager.resolve(proxy, self.connection, our_jid) def _on_roster_set(self, roster): + roster_version = roster.version raw_roster = roster.getRaw() roster = {} our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name)) @@ -2480,6 +2491,8 @@ self.discoverInfo(jid) self.dispatch('ROSTER', roster) + gajim.logger.replace_roster(self.name, roster_version, roster) + print raw_roster def _send_first_presence(self, signed = ''): show = self.continue_connect_info[0] @@ -2621,8 +2634,6 @@ common.xmpp.NS_MUC_OWNER) con.RegisterHandler('iq', self._MucAdminCB, 'result', common.xmpp.NS_MUC_ADMIN) - con.RegisterHandler('iq', self._getRosterCB, 'result', - common.xmpp.NS_ROSTER) con.RegisterHandler('iq', self._PrivateCB, 'result', common.xmpp.NS_PRIVATE) con.RegisterHandler('iq', self._HttpAuthCB, 'get', diff -r aa48681bbda0 -r af17977674b1 src/common/logger.py --- a/src/common/logger.py Tue Jun 23 22:24:39 2009 +0200 +++ b/src/common/logger.py Sat Jun 27 17:56:04 2009 +0200 @@ -339,6 +339,7 @@ return 'mrim' def convert_human_subscription_values_to_db_api_values(self, sub): + '''converts from string style to constant ints for db''' if sub == 'none': return constants.SUBSCRIPTION_NONE if sub == 'to': @@ -348,6 +349,17 @@ if sub == 'both': return constants.SUBSCRIPTION_BOTH + def convert_db_api_values_to_human_subscription_values(self, sub): + '''converts from constant ints for db to string style''' + if sub == constants.SUBSCRIPTION_NONE: + return 'none' + if sub == constants.SUBSCRIPTION_TO: + return 'to' + if sub == constants.SUBSCRIPTION_FROM: + return 'from' + if sub == constants.SUBSCRIPTION_BOTH: + return 'both' + def commit_to_db(self, values, write_unread = False): sql = 'INSERT INTO logs (jid_id, contact_name, time, kind, show, message, subject) VALUES (?, ?, ?, ?, ?, ?, ?)' try: @@ -816,7 +828,30 @@ except sqlite.OperationalError, e: print >> sys.stderr, str(e) + def replace_roster(self, account_name, roster_version, roster): + ''' Replace current roster in DB by a new one. + accout_name is the name of the account to change + roster_version is the version of the new roster + roster is the new version ''' + gajim.config.set_per('accounts', account_name, 'roster_version', '') + account_jid = gajim.get_jid_from_account(account_name) + account_jid_id = self.get_jid_id(account_jid) + + # Delete old roster + sql = 'DELETE FROM roster_entry WHERE account_jid_id = %d' % ( + account_jid_id) + sql = 'DELETE FROM roster_group WHERE account_jid_id = %d' % ( + account_jid_id) + + # 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]['groups']) + gajim.config.set_per('accounts', account_name, 'roster_version', + roster_version) + def del_contact(self, account_jid, jid): + ''' Remove jid from account_jid roster. ''' try: account_jid_id = self.get_jid_id(account_jid) jid_id = self.get_jid_id(jid) @@ -826,6 +861,7 @@ self.simple_commit(sql) def add_or_update_contact(self, account_jid, jid, name, sub, groups): + ''' Add or update a contact from account_jid roster. ''' if sub == 'remove': self.del_contact(account_jid, jid) return @@ -836,11 +872,11 @@ except exceptions.PysqliteOperationalError, e: raise exceptions.PysqliteOperationalError(str(e)) - # update groups information - # first we delete all previous groups information + # Update groups information + # First we delete all previous groups information sql = 'DELETE FROM roster_group WHERE account_jid_id = %d AND jid_id = %d' % (account_jid_id, jid_id) self.cur.execute(sql) - # then we add all new groups information + # Then we add all new groups information for group in groups: sql = 'INSERT INTO roster_group VALUES("%d", "%d", "%s")' % ( account_jid_id, jid_id, group) @@ -851,4 +887,29 @@ self.convert_human_subscription_values_to_db_api_values(sub)) self.simple_commit(sql) + def get_roster(self, account_jid): + ''' Return the accound_jid roster in NonBlockingRoster format. ''' + data = {} + account_jid_id = self.get_jid_id(account_jid) + + # First we fill data with roster_entry informations + self.cur.execute('SELECT j.jid, re.jid_id, re.name, re.subscription FROM roster_entry re, jids j WHERE re.account_jid_id="%(account_jid_id)s" AND j.jid_id=re.jid_id' % {'account_jid_id': account_jid_id}) + for jid, jid_id, name, subscription in self.cur: + data[jid] = {} + data[jid]['name'] = name + data[jid]['subscription'] = self.convert_db_api_values_to_human_subscription_values(subscription) + data[jid]['groups'] = [] + data[jid]['resources'] = {} + data[jid]['ask'] = None + data[jid]['id'] = jid_id + + # Then we add group for roster entries + for jid in data: + self.cur.execute('SELECT group_name FROM roster_group WHERE account_jid_id="%(account_jid_id)s" AND jid_id="%(jid_id)s"' % {'account_jid_id': account_jid_id, 'jid_id': data[jid]['id']}) + for (group_name,) in self.cur: + data[jid]['groups'].append(group_name) + del data[jid]['id'] + + return data + # vim: se ts=3: diff -r aa48681bbda0 -r af17977674b1 src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Tue Jun 23 22:24:39 2009 +0200 +++ b/src/common/xmpp/client_nb.py Sat Jun 27 17:56:04 2009 +0200 @@ -506,13 +506,13 @@ def initRoster(self, version=''): ''' Plug in the roster. ''' if not self.__dict__.has_key('NonBlockingRoster'): - roster_nb.NonBlockingRoster.get_instance(version=version).PlugIn(self) + return roster_nb.NonBlockingRoster.get_instance(version=version).PlugIn(self) - def getRoster(self, on_ready=None): + def getRoster(self, on_ready=None, force=False): ''' Return the Roster instance, previously plugging it in and requesting roster from server if needed. ''' if self.__dict__.has_key('NonBlockingRoster'): - return self.NonBlockingRoster.getRoster(on_ready) + return self.NonBlockingRoster.getRoster(on_ready, force) return None def sendPresence(self, jid=None, typ=None, requestRoster=0): diff -r aa48681bbda0 -r af17977674b1 src/common/xmpp/roster_nb.py --- a/src/common/xmpp/roster_nb.py Tue Jun 23 22:24:39 2009 +0200 +++ b/src/common/xmpp/roster_nb.py Sat Jun 27 17:56:04 2009 +0200 @@ -52,8 +52,11 @@ iq = Iq('get',NS_ROSTER) iq.setTagAttr('query', 'ver', self.version) + id_ = self._owner.getAnID() + iq.setID(id_) self._owner.send(iq) log.info('Roster requested from server') + return id_ def RosterIqHandler(self,dis,stanza): ''' Subscription tracker. Used internally for setting items state in @@ -64,6 +67,9 @@ return query = stanza.getTag('query') if query: + self.version = stanza.getTagAttr('query', 'ver') + if self.version is None: + self.version = '' for item in query.getTags('item'): jid=item.getAttr('jid') if item.getAttr('subscription')=='remove': @@ -192,6 +198,11 @@ def getRaw(self): '''Returns the internal data representation of the roster.''' return self._data + def setRaw(self, data): + '''Returns the internal data representation of the roster.''' + self._data = data + self._data[self._owner.User+'@'+self._owner.Server]={'resources':{},'name':None,'ask':None,'subscription':None,'groups':None,} + self.set=1 # copypasted methods for roster.py from constructor to here @@ -203,7 +214,7 @@ self._owner.RegisterHandler('iq', self.RosterIqHandler, 'set', NS_ROSTER) self._owner.RegisterHandler('presence', self.PresenceHandler) if request: - self.Request() + return self.Request() def _on_roster_set(self, data): if data: @@ -216,16 +227,18 @@ self.on_ready = None return True - def getRoster(self, on_ready=None): + def getRoster(self, on_ready=None, force=False): ''' Requests roster from server if neccessary and returns self. ''' + return_self = True if not self.set: self.on_ready = on_ready self._owner.onreceive(self._on_roster_set) - return - if on_ready: + return_self = False + elif on_ready: on_ready(self) - on_ready = None - else: + return_self = False + if return_self or force: return self + return None # vim: se ts=3:

1 0

gajim: ability to block / unblock MUC occupants. Fixes #5051
by Yann Leboulanger 27 Jun '09

27 Jun '09

changeset e4071f6af12b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e4071f6af12b description: ability to block / unblock MUC occupants. Fixes #5051 diffstat: data/glade/gc_occupants_menu.glade | 30 ++++++++++++++- src/groupchat_control.py | 88 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 115 insertions(+), 3 deletions(-) diffs (181 lines): diff -r ff8a9e90594b -r e4071f6af12b data/glade/gc_occupants_menu.glade --- a/data/glade/gc_occupants_menu.glade Sat Jun 27 09:50:50 2009 +0200 +++ b/data/glade/gc_occupants_menu.glade Sat Jun 27 12:29:55 2009 +0200 @@ -121,7 +121,35 @@ </widget> </child> <child> - <widget class="GtkSeparatorMenuItem" id="separator6"> + <widget class="GtkImageMenuItem" id="block_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Block</property> + <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="menu-item-image5"> + <property name="visible">True</property> + <property name="stock">gtk-stop</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="unblock_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Unblock</property> + <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="menu-item-image6"> + <property name="visible">True</property> + <property name="stock">gtk-stop</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkSeparatorMenuItem" id="separator1"> <property name="visible">True</property> </widget> </child> diff -r ff8a9e90594b -r e4071f6af12b src/groupchat_control.py --- a/src/groupchat_control.py Sat Jun 27 09:50:50 2009 +0200 +++ b/src/groupchat_control.py Sat Jun 27 12:29:55 2009 +0200 @@ -171,9 +171,9 @@ class GroupchatControl(ChatControlBase): TYPE_ID = message_control.TYPE_GC # alphanum sorted - MUC_CMDS = ['ban', 'chat', 'query', 'clear', 'close', 'compact', + MUC_CMDS = ['ban', 'block', 'chat', 'query', 'clear', 'close', 'compact', 'help', 'invite', 'join', 'kick', 'leave', 'me', 'msg', 'nick', - 'part', 'names', 'say', 'topic'] + 'part', 'names', 'say', 'topic', 'unblock'] def __init__(self, parent_win, contact, acct, is_continued=False): ChatControlBase.__init__(self, self.TYPE_ID, parent_win, @@ -1037,6 +1037,12 @@ image = state_images[gc_contact.show] name = gobject.markup_escape_text(gc_contact.name) + + # Strike name if blocked + fjid = self.room_jid + '/' + nick + if helpers.jid_is_blocked(self.account, fjid): + name = '<span strikethrough="true">%s</span>' % name + status = gc_contact.status # add status msg, if not empty, under contact name in the treeview if status and gajim.config.get('show_status_msgs_in_roster'): @@ -1641,6 +1647,22 @@ message[4:]) self.clear(self.msg_textview) return True + elif command == 'block': + if len(message_array) == 0: + self.get_command_help(command) + return True + nick = message_array[0].strip() + self.on_block(None, nick) + self.clear(self.msg_textview) + return True + elif command == 'unblock': + if len(message_array) == 0: + self.get_command_help(command) + return True + nick = message_array[0].strip() + self.on_unblock(None, nick) + self.clear(self.msg_textview) + return True return False @@ -1723,6 +1745,12 @@ elif command == 'say': self.print_conversation(_('Usage: /%s <message>, sends a message ' 'without looking for other commands.') % command, 'info') + elif command == 'block': + self.print_conversation(_('Usage: /%s <nickname>, prevent <nickname> ' + 'to send you messages or private messages.') % command, 'info') + elif command == 'unblock': + self.print_conversation(_('Usage: /%s <nickname>, allow <nickname> ' + 'to send you messages and private messages.') % command, 'info') else: self.print_conversation(_('No help info for /%s') % command, 'info') @@ -2124,6 +2152,7 @@ model = self.list_treeview.get_model() nick = model[iter_][C_NICK].decode('utf-8') c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) + fjid = self.room_jid + '/' + nick jid = c.jid target_affiliation = c.affiliation target_role = c.role @@ -2214,6 +2243,19 @@ id_ = item.connect('activate', self.on_add_to_roster, jid) self.handlers[id_] = item + item = xml.get_widget('block_menuitem') + item2 = xml.get_widget('unblock_menuitem') + if helpers.jid_is_blocked(self.account, fjid): + item.set_no_show_all(True) + item.hide() + id_ = item2.connect('activate', self.on_unblock, nick) + self.handlers[id_] = item2 + else: + id_ = item.connect('activate', self.on_block, nick) + self.handlers[id_] = item + item2.set_no_show_all(True) + item2.hide() + item = xml.get_widget('send_private_message_menuitem') id_ = item.connect('activate', self.on_send_pm, model, iter_) self.handlers[id_] = item @@ -2458,6 +2500,48 @@ def on_add_to_roster(self, widget, jid): dialogs.AddNewContactWindow(self.account, jid) + def on_block(self, widget, nick): + fjid = self.room_jid + '/' + nick + connection = gajim.connections[self.account] + if fjid in connection.blocked_contacts: + return + new_rule = {'order': u'1', 'type': u'jid', 'action': u'deny', + 'value' : fjid, 'child': [u'message', u'iq', u'presence-out']} + connection.blocked_list.append(new_rule) + connection.blocked_contacts.append(fjid) + self.draw_contact(nick) + connection.set_privacy_list('block', connection.blocked_list) + if len(connection.blocked_list) == 1: + connection.set_active_list('block') + connection.set_default_list('block') + connection.get_privacy_list('block') + + def on_unblock(self, widget, nick): + fjid = self.room_jid + '/' + nick + connection = gajim.connections[self.account] + connection.new_blocked_list = [] + # needed for draw_contact: + if fjid in connection.blocked_contacts: + connection.blocked_contacts.remove(fjid) + self.draw_contact(nick) + for rule in connection.blocked_list: + if rule['action'] != 'deny' or rule['type'] != 'jid' \ + or rule['value'] != fjid: + connection.new_blocked_list.append(rule) + + connection.set_privacy_list('block', connection.new_blocked_list) + connection.get_privacy_list('block') + if len(connection.new_blocked_list) == 0: + connection.blocked_list = [] + connection.blocked_contacts = [] + connection.blocked_groups = [] + connection.set_default_list('') + connection.set_active_list('') + connection.del_privacy_list('block') + if 'blocked_contacts' in gajim.interface.instances[self.account]: + gajim.interface.instances[self.account]['blocked_contacts'].\ + privacy_list_received([]) + def on_voice_checkmenuitem_activate(self, widget, nick): if widget.get_active(): self.grant_voice(widget, nick)

1 0

gajim: fix missing var
by Yann Leboulanger 27 Jun '09

27 Jun '09

changeset 9b4423fafd6b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9b4423fafd6b description: fix missing var diffstat: src/gajim.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 8b810e2879a9 -r 9b4423fafd6b src/gajim.py --- a/src/gajim.py Sat Jun 27 10:51:30 2009 +0200 +++ b/src/gajim.py Sat Jun 27 11:28:43 2009 +0200 @@ -2659,6 +2659,9 @@ # at least one character in 3 parts (before @, after @, after .) self.sth_at_sth_dot_sth = r'\S+(a)\S+\.\S*[^\s)?]' + # needed for xhtml display + self.emot_only = emoticons_pattern + # Invalid XML chars self.invalid_XML_chars = u'[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x19]|[\ud800-\udfff]|[\ufffe-\uffff]'

1 0

gajim: fix printing emoticons in htmltextview
by Yann Leboulanger 27 Jun '09

27 Jun '09

changeset 8b810e2879a9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8b810e2879a9 description: fix printing emoticons in htmltextview diffstat: src/htmltextview.py | 32 ++------------------------------ 1 files changed, 2 insertions(+), 30 deletions(-) diffs (42 lines): diff -r 99aa3369df47 -r 8b810e2879a9 src/htmltextview.py --- a/src/htmltextview.py Tue Jun 23 19:40:58 2009 +0200 +++ b/src/htmltextview.py Sat Jun 27 10:51:30 2009 +0200 @@ -194,36 +194,8 @@ view.basic_pattern_re = re.compile(basic_pattern) # emoticons emoticons_pattern = '' - try: - if config.get('emoticons_theme'): - # When an emoticon is bordered by an alpha-numeric character it is NOT - # expanded. e.g., foo:) NO, foo :) YES, (brb) NO, (:)) YES, etc. - # We still allow multiple emoticons side-by-side like :P:P:P - # sort keys by length so :qwe emot is checked before :q - keys = interface.emoticons.keys() - keys.sort(interface.on_emoticon_sort) - emoticons_pattern_prematch = '' - emoticons_pattern_postmatch = '' - emoticon_length = 0 - for emoticon in keys: # travel thru emoticons list - emoticon_escaped = re.escape(emoticon) # espace regexp metachars - emoticons_pattern += emoticon_escaped + '|'# | means or in regexp - if (emoticon_length != len(emoticon)): - # Build up expressions to match emoticons next to other emoticons - emoticons_pattern_prematch = emoticons_pattern_prematch[:-1] + ')|(?<=' - emoticons_pattern_postmatch = emoticons_pattern_postmatch[:-1] + ')|(?=' - emoticon_length = len(emoticon) - emoticons_pattern_prematch += emoticon_escaped + '|' - emoticons_pattern_postmatch += emoticon_escaped + '|' - # We match from our list of emoticons, but they must either have - # whitespace, or another emoticon next to it to match successfully - # [\w.] alphanumeric and dot (for not matching 8) in (2.8)) - emoticons_pattern = '|' + \ - '(?:(?<![\w.]' + emoticons_pattern_prematch[:-1] + '))' + \ - '(?:' + emoticons_pattern[:-1] + ')' + \ - '(?:(?![\w.]' + emoticons_pattern_postmatch[:-1] + '))' - except Exception: - pass + if config.get('emoticons_theme'): + emoticons_pattern = gajim.interface.emot_only view.emot_pattern_re = re.compile(emoticons_pattern, re.IGNORECASE) # because emoticons match later (in the string) they need to be after

1 0

gajim: [Spike411] Facebook iconset for Gajim. A great thanks to ...
by Yann Leboulanger 27 Jun '09

27 Jun '09

changeset ff8a9e90594b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ff8a9e90594b description: [Spike411] Facebook iconset for Gajim. A great thanks to Jakub Szypulka for is iconset: http://cubestuff.wordpress.com/2008/05/21/facebook-goes-tango/ diffstat: THANKS.artists | 1 + data/iconsets/transports/facebook/16x16/away.png | data/iconsets/transports/facebook/16x16/chat.png | data/iconsets/transports/facebook/16x16/dnd.png | data/iconsets/transports/facebook/16x16/not_in_roster.png | data/iconsets/transports/facebook/16x16/offline.png | data/iconsets/transports/facebook/16x16/online.png | data/iconsets/transports/facebook/16x16/xa.png | data/iconsets/transports/facebook/32x32/away.png | data/iconsets/transports/facebook/32x32/chat.png | data/iconsets/transports/facebook/32x32/dnd.png | data/iconsets/transports/facebook/32x32/not_in_roster.png | data/iconsets/transports/facebook/32x32/offline.png | data/iconsets/transports/facebook/32x32/online.png | data/iconsets/transports/facebook/32x32/xa.png | data/iconsets/transports/facebook/48x48/offline.png | data/iconsets/transports/facebook/48x48/online.png | src/common/gajim.py | 6 ++++-- src/disco.py | 2 ++ 19 files changed, 7 insertions(+), 2 deletions(-) diffs (80 lines): diff -r 73fb5591ff06 -r ff8a9e90594b THANKS.artists --- a/THANKS.artists Fri Jun 26 19:33:46 2009 +0200 +++ b/THANKS.artists Sat Jun 27 09:50:50 2009 +0200 @@ -5,3 +5,4 @@ Josef Vybíral Membris Khan Rederick Asher +Jakub Szypulka diff -r 73fb5591ff06 -r ff8a9e90594b data/iconsets/transports/facebook/16x16/away.png Binary file data/iconsets/transports/facebook/16x16/away.png has changed diff -r 73fb5591ff06 -r ff8a9e90594b data/iconsets/transports/facebook/16x16/chat.png Binary file data/iconsets/transports/facebook/16x16/chat.png has changed diff -r 73fb5591ff06 -r ff8a9e90594b data/iconsets/transports/facebook/16x16/dnd.png Binary file data/iconsets/transports/facebook/16x16/dnd.png has changed diff -r 73fb5591ff06 -r ff8a9e90594b data/iconsets/transports/facebook/16x16/not_in_roster.png Binary file data/iconsets/transports/facebook/16x16/not_in_roster.png has changed diff -r 73fb5591ff06 -r ff8a9e90594b data/iconsets/transports/facebook/16x16/offline.png Binary file data/iconsets/transports/facebook/16x16/offline.png has changed diff -r 73fb5591ff06 -r ff8a9e90594b data/iconsets/transports/facebook/16x16/online.png Binary file data/iconsets/transports/facebook/16x16/online.png has changed diff -r 73fb5591ff06 -r ff8a9e90594b data/iconsets/transports/facebook/16x16/xa.png Binary file data/iconsets/transports/facebook/16x16/xa.png has changed diff -r 73fb5591ff06 -r ff8a9e90594b data/iconsets/transports/facebook/32x32/away.png Binary file data/iconsets/transports/facebook/32x32/away.png has changed diff -r 73fb5591ff06 -r ff8a9e90594b data/iconsets/transports/facebook/32x32/chat.png Binary file data/iconsets/transports/facebook/32x32/chat.png has changed diff -r 73fb5591ff06 -r ff8a9e90594b data/iconsets/transports/facebook/32x32/dnd.png Binary file data/iconsets/transports/facebook/32x32/dnd.png has changed diff -r 73fb5591ff06 -r ff8a9e90594b data/iconsets/transports/facebook/32x32/not_in_roster.png Binary file data/iconsets/transports/facebook/32x32/not_in_roster.png has changed diff -r 73fb5591ff06 -r ff8a9e90594b data/iconsets/transports/facebook/32x32/offline.png Binary file data/iconsets/transports/facebook/32x32/offline.png has changed diff -r 73fb5591ff06 -r ff8a9e90594b data/iconsets/transports/facebook/32x32/online.png Binary file data/iconsets/transports/facebook/32x32/online.png has changed diff -r 73fb5591ff06 -r ff8a9e90594b data/iconsets/transports/facebook/32x32/xa.png Binary file data/iconsets/transports/facebook/32x32/xa.png has changed diff -r 73fb5591ff06 -r ff8a9e90594b data/iconsets/transports/facebook/48x48/offline.png Binary file data/iconsets/transports/facebook/48x48/offline.png has changed diff -r 73fb5591ff06 -r ff8a9e90594b data/iconsets/transports/facebook/48x48/online.png Binary file data/iconsets/transports/facebook/48x48/online.png has changed diff -r 73fb5591ff06 -r ff8a9e90594b src/common/gajim.py --- a/src/common/gajim.py Fri Jun 26 19:33:46 2009 +0200 +++ b/src/common/gajim.py Sat Jun 27 09:50:50 2009 +0200 @@ -344,12 +344,14 @@ host = host_splitted[0] if host in ('aim', 'irc', 'icq', 'msn', 'sms', 'tlen', 'weather', 'yahoo', - 'mrim'): + 'mrim', 'facebook'): return host elif host == 'gg': return 'gadu-gadu' elif host == 'jit': return 'icq' + elif host == 'facebook': + return 'facebook' else: return None @@ -384,7 +386,7 @@ def get_notification_image_prefix(jid): '''returns the prefix for the notification images''' transport_name = get_transport_name_from_jid(jid) - if transport_name in ('aim', 'icq', 'msn', 'yahoo'): + if transport_name in ('aim', 'icq', 'msn', 'yahoo', 'facebook'): prefix = transport_name else: prefix = 'jabber' diff -r 73fb5591ff06 -r ff8a9e90594b src/disco.py --- a/src/disco.py Fri Jun 26 19:33:46 2009 +0200 +++ b/src/disco.py Sat Jun 27 09:50:50 2009 +0200 @@ -109,6 +109,8 @@ ('_jid', 'yahoo'): (False, 'yahoo.png'), ('gateway', 'mrim'): (False, 'mrim.png'), ('_jid', 'mrim'): (False, 'mrim.png'), + ('gateway', 'facebook'): (False, 'facebook.png'), + ('_jid', 'facebook'): (False, 'facebook.png'), } # Category type to "human-readable" description string, and sort priority

1 0

gajim: do not request XEP-0012 when there are several resources
by Yann Leboulanger 26 Jun '09

26 Jun '09

changeset ee54f48b9f64 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ee54f48b9f64 description: do not request XEP-0012 when there are several resources X-Hg-Repo: gajim Subject: gajim: some coding standards From: Yann Leboulanger <asterix(a)lagaule.org> changeset 73fb5591ff06 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=73fb5591ff06 description: some coding standards diffstat: src/chat_control.py | 8 +++----- src/vcard.py | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diffs (37 lines): diff -r bf4f20dac149 -r 73fb5591ff06 src/chat_control.py --- a/src/chat_control.py Thu Jun 25 19:28:23 2009 +0200 +++ b/src/chat_control.py Fri Jun 26 19:33:46 2009 +0200 @@ -1781,8 +1781,7 @@ else: self.print_conversation(_('No help info for /%s') % command, 'info') - def send_message(self, message, keyID = '', chatstate = None, - xhtml = None): + def send_message(self, message, keyID='', chatstate=None, xhtml=None): '''Send a message to contact''' if message in ('', None, '\n') or self._process_command(message): return None @@ -1846,9 +1845,8 @@ else: xep0184_id = None - self.print_conversation(message, self.contact.jid, - encrypted = encrypted, xep0184_id = xep0184_id, - xhtml = xhtml) + self.print_conversation(message, self.contact.jid, encrypted=encrypted, + xep0184_id=xep0184_id, xhtml=xhtml) ChatControlBase.send_message(self, message, keyID, type_='chat', chatstate=chatstate_to_send, composing_xep=composing_xep, diff -r bf4f20dac149 -r 73fb5591ff06 src/vcard.py --- a/src/vcard.py Thu Jun 25 19:28:23 2009 +0200 +++ b/src/vcard.py Fri Jun 26 19:33:46 2009 +0200 @@ -417,8 +417,6 @@ c.resource) gobject.idle_add(gajim.connections[self.account].\ request_entity_time, c.jid, c.resource) - gajim.connections[self.account].request_last_status_time(c.jid, - c.resource) self.os_info[i] = {'resource': c.resource, 'client': '', 'os': ''} self.time_info[i] = {'resource': c.resource, 'time': ''}

1 0

gajim: Fixed problem with clicking not producing anything.
by Ummu＠lagaule.org 26 Jun '09

26 Jun '09

changeset f7147f583a98 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f7147f583a98 description: Fixed problem with clicking not producing anything. diffstat: src/whiteboardwidget.py | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 deletions(-) diffs (80 lines): diff -r d97926068f3c -r f7147f583a98 src/whiteboardwidget.py --- a/src/whiteboardwidget.py Thu Jun 25 22:43:44 2009 -0700 +++ b/src/whiteboardwidget.py Fri Jun 26 00:25:32 2009 -0700 @@ -22,7 +22,7 @@ # Config self.draw_tool = 'brush' - self.line_width = 3 + self.line_width = 10 # SVG Storage #TODO: get height width info @@ -30,6 +30,7 @@ # Temporary Variables for items self.item_temp = None + self.item_temp_coords = (0,0) self.item_data = None @@ -38,13 +39,19 @@ x = event.x y = event.y state = event.state + self.item_temp_coords = (x,y) if self.draw_tool == 'brush': - self.item_data = 'M %s,%s L ' % (x, y) - self.item_temp = goocanvas.Path(parent = self.root, - data = self.item_data + 'z', - line_width = self.line_width) - self.request_update() + self.item_data = 'M %s,%s ' % (x, y) + self.item_temp = goocanvas.Ellipse(parent = self.root, + center_x = x, + center_y = y, + radius_x = 1, + radius_y = 1, + stroke_color = "black", + fill_color = "black", + line_width = self.line_width) + self.item_data = self.item_data + 'L ' def motion_notify_event(self, widget, event): x = event.x @@ -67,13 +74,23 @@ if self.draw_tool == 'brush': self.item_data = self.item_data + '%s,%s' % (x, y) + if x == self.item_temp_coords[0] and y == self.item_temp_coords[1]: + goocanvas.Ellipse(parent = self.root, + center_x = x, + center_y = y, + radius_x = 1, + radius_y = 1, + stroke_color = "black", + fill_color = "black", + line_width = self.line_width) self.image.add_path(self.item_data, self.line_width) - + self.item_data = None if self.item_temp is not None: self.item_temp.remove() self.item_temp = None - + + #TODO: get keypresses working def key_press_event(self, widget, event): print 'test' if event.keyval == 'p': @@ -83,7 +100,7 @@ ''' A class to store the svg document and make changes to it. Stores items in a tuple that's (minidom node, goocanvas object).''' - def __init__(self, root, height = 1000, width = 1000): + def __init__(self, root, height = 500, width = 500): self.items = [] self.root = root

1 0

gajim: Now there is valid SVG produced
by Ummu＠lagaule.org 26 Jun '09

26 Jun '09

changeset d97926068f3c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d97926068f3c description: Now there is valid SVG produced diffstat: src/whiteboardwidget.py | 142 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 142 insertions(+), 0 deletions(-) diffs (146 lines): diff -r a6060b725966 -r d97926068f3c src/whiteboardwidget.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/whiteboardwidget.py Thu Jun 25 22:43:44 2009 -0700 @@ -0,0 +1,142 @@ +import gtk +import goocanvas +from xml.dom.minidom import Document + +""" +A whiteboard widget made for Gajim. Only has basic line tool that draws +SVG Paths. +- Ummu +""" + +class Whiteboard(goocanvas.Canvas): + def __init__(self): + goocanvas.Canvas.__init__(self) + self.set_flags(gtk.CAN_FOCUS) + self.root = self.get_root_item() + + # Events + self.connect("button-press-event", self.button_press_event) + self.connect("button-release-event", self.button_release_event) + self.connect("motion-notify-event", self.motion_notify_event) + self.connect("key-press-event", self.key_press_event) + + # Config + self.draw_tool = 'brush' + self.line_width = 3 + + # SVG Storage + #TODO: get height width info + self.image = SVGObject(self.root) + + # Temporary Variables for items + self.item_temp = None + self.item_data = None + + + + def button_press_event(self, widget, event): + x = event.x + y = event.y + state = event.state + + if self.draw_tool == 'brush': + self.item_data = 'M %s,%s L ' % (x, y) + self.item_temp = goocanvas.Path(parent = self.root, + data = self.item_data + 'z', + line_width = self.line_width) + self.request_update() + + def motion_notify_event(self, widget, event): + x = event.x + y = event.y + state = event.state + if self.item_temp is not None: + self.item_temp.remove() + + if self.draw_tool == 'brush': + if self.item_data is not None: + self.item_data = self.item_data + '%s,%s ' % (x, y) + self.item_temp = goocanvas.Path(parent = self.root, + data = self.item_data, + line_width = self.line_width) + + def button_release_event(self, widget, event): + x = event.x + y = event.y + state = event.state + + if self.draw_tool == 'brush': + self.item_data = self.item_data + '%s,%s' % (x, y) + self.image.add_path(self.item_data, self.line_width) + + self.item_data = None + if self.item_temp is not None: + self.item_temp.remove() + self.item_temp = None + + def key_press_event(self, widget, event): + print 'test' + if event.keyval == 'p': + self.image.print_xml() + +class SVGObject(): + ''' A class to store the svg document and make changes to it. + Stores items in a tuple that's (minidom node, goocanvas object).''' + + def __init__(self, root, height = 1000, width = 1000): + self.items = [] + self.root = root + + # initialize svg document + self.doc = Document() + self.svg = self.doc.createElement('svg') + self.svg.setAttribute('version', '1.1') + self.svg.setAttribute('height', str(height)) + self.svg.setAttribute('width', str(width)) + self.svg.setAttribute('xmlns', 'http://www.w3.org/2000/svg') + self.doc.appendChild(self.svg) + #TODO: make this settable + self.g = self.doc.createElement('g') + self.g.setAttribute('fill', 'none') + self.g.setAttribute('stroke-linecap', 'round') + self.svg.appendChild(self.g) + + def add_path(self, data, line_width): + ''' adds the path to the items listing, both minidom node and goocanvas + object in a tuple ''' + + goocanvas_obj = self.items.append(goocanvas.Path(parent = self.root, + data = data, + line_width = line_width)) + + minidom_obj = self.doc.createElement('path') + minidom_obj.setAttribute('d', data) + minidom_obj.setAttribute('stroke-width', str(line_width)) + minidom_obj.setAttribute('stroke', 'black') + self.g.appendChild(minidom_obj) + + self.items.append((minidom_obj, goocanvas_obj)) + self.print_xml() + + def print_xml(self): + file = open('whiteboardtest.svg','w') + file.writelines(self.doc.toprettyxml(' ')) + file.close() + + +def main(): + window = gtk.Window() + window.set_events(gtk.gdk.EXPOSURE_MASK + | gtk.gdk.LEAVE_NOTIFY_MASK + | gtk.gdk.BUTTON_PRESS_MASK + | gtk.gdk.POINTER_MOTION_MASK + | gtk.gdk.KEY_PRESS_MASK) + board = Whiteboard() + window.add(board) + window.connect("destroy", gtk.main_quit) + window.show_all() + + gtk.main() + +if __name__ == "__main__": + main()

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2009