Commits August 2008

commits@gajim.org

10 participants
272 discussions

[commit-gajim] r10351 - branches/plugin-system/src/plugins
by asterix＠gajim.org 29 Aug '08

29 Aug '08

Author: asterix Date: 2008-08-29 13:54:34 +0200 (Fri, 29 Aug 2008) New Revision: 10351 Modified: branches/plugin-system/src/plugins/gui.py Log: sort plugins by name Modified: branches/plugin-system/src/plugins/gui.py =================================================================== --- branches/plugin-system/src/plugins/gui.py 2008-08-29 11:54:07 UTC (rev 10350) +++ branches/plugin-system/src/plugins/gui.py 2008-08-29 11:54:34 UTC (rev 10351) @@ -140,7 +140,7 @@ def fill_installed_plugins_model(self): pm = gajim.plugin_manager self.installed_plugins_model.clear() - self.installed_plugins_model.set_sort_column_id(0, gtk.SORT_ASCENDING) + self.installed_plugins_model.set_sort_column_id(1, gtk.SORT_ASCENDING) for plugin in pm.plugins: self.installed_plugins_model.append([plugin,

1 0

[commit-gajim] r10350 - branches/plugin-system/data/glade
by asterix＠gajim.org 29 Aug '08

29 Aug '08

Author: asterix Date: 2008-08-29 13:54:07 +0200 (Fri, 29 Aug 2008) New Revision: 10350 Modified: branches/plugin-system/data/glade/plugins_window.glade Log: escape < in glade when using markup Modified: branches/plugin-system/data/glade/plugins_window.glade =================================================================== --- branches/plugin-system/data/glade/plugins_window.glade 2008-08-29 10:38:34 UTC (rev 10349) +++ branches/plugin-system/data/glade/plugins_window.glade 2008-08-29 11:54:07 UTC (rev 10350) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> - + <glade-interface> <widget class="GtkWindow" id="plugins_window"> <property name="width_request">650</property> @@ -57,7 +57,7 @@ <widget class="GtkLabel" id="plugin_name_label"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><empty></property> + <property name="label" translatable="yes">&lt;empty&gt;</property> <property name="use_markup">True</property> <property name="wrap">True</property> <property name="selectable">True</property>

1 0

[commit-gajim] r10349 - trunk/src
by asterix＠gajim.org 29 Aug '08

29 Aug '08

Author: asterix Date: 2008-08-29 12:38:34 +0200 (Fri, 29 Aug 2008) New Revision: 10349 Modified: trunk/src/disco.py Log: don't add twice the same room jid in browser. fixes #4256 Modified: trunk/src/disco.py =================================================================== --- trunk/src/disco.py 2008-08-29 09:38:34 UTC (rev 10348) +++ trunk/src/disco.py 2008-08-29 10:38:34 UTC (rev 10349) @@ -947,6 +947,9 @@ for item in items: jid = item['jid'] node = item.get('node', '') + # If such an item is already here: don't add it + if self._find_item(jid, node): + continue self._total_items += 1 self._add_item(jid, node, item, force) self.window.services_treeview.set_model(self.model) @@ -963,8 +966,7 @@ self._update_error(iter, jid, node) else: # We got our info - self._update_info(iter, jid, node, - identities, features, data) + self._update_info(iter, jid, node, identities, features, data) self.update_actions() def _add_item(self, jid, node, item, force): @@ -1672,7 +1674,8 @@ # Bottom row # Iter compare is broke, use the path instead try: - ex, ey = view.tree_to_widget_coords(rect.x + rect.height, rect.y + rect.height) + ex, ey = view.tree_to_widget_coords(rect.x + rect.height, + rect.y + rect.height) end = view.get_path_at_pos(ex, ey)[0] # end is the last visible, we want to query that aswell end = (end[0] + 1,) @@ -1726,8 +1729,8 @@ name = identities[0].get('name', '') for form in data: typefield = form.getField('FORM_TYPE') - if typefield and typefield.getValue() ==\ - 'http://jabber.org/protocol/muc#roominfo': + if typefield and typefield.getValue() == \ + 'http://jabber.org/protocol/muc#roominfo': # Fill model row from the form's fields users = form.getField('muc#roominfo_occupants') descr = form.getField('muc#roominfo_description')

1 0

[commit-gajim] r10348 - trunk/src
by asterix＠gajim.org 29 Aug '08

29 Aug '08

Author: asterix Date: 2008-08-29 11:38:34 +0200 (Fri, 29 Aug 2008) New Revision: 10348 Modified: trunk/src/groupchat_control.py Log: fix typo Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-08-29 09:35:44 UTC (rev 10347) +++ trunk/src/groupchat_control.py 2008-08-29 09:38:34 UTC (rev 10348) @@ -1186,11 +1186,11 @@ if affiliation != actual_affiliation: if actor: st = _('** Affiliation of %(nick)s has been set to ' - '%(affiliation)s by %(actor)s' % {'nick': nick_jid, + '%(affiliation)s by %(actor)s') % {'nick': nick_jid, 'affiliation': affiliation, 'actor': actor} else: st = _('** Affiliation of %(nick)s has been set to ' - '%(affiliation)s' % {'nick': nick_jid, + '%(affiliation)s') % {'nick': nick_jid, 'affiliation': affiliation} if reason: st += ' (%s)' % reason @@ -1203,10 +1203,10 @@ affiliation, status, jid) if actor: st = _('** Role of %(nick)s has been set to %(role)s by ' - '%(actor)s' % {'nick': nick_jid, 'role': role, + '%(actor)s') % {'nick': nick_jid, 'role': role, 'actor': actor} else: - st = _('** Role of %(nick)s has been set to %(role)s' % { + st = _('** Role of %(nick)s has been set to %(role)s') % { 'nick': nick_jid, 'role': role} if reason: st += ' (%s)' % reason

1 0

[commit-gajim] r10347 - trunk/src
by asterix＠gajim.org 29 Aug '08

29 Aug '08

Author: asterix Date: 2008-08-29 11:35:44 +0200 (Fri, 29 Aug 2008) New Revision: 10347 Modified: trunk/src/groupchat_control.py Log: show role and affiliation in groupchat correctly. fixes #3871 Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-08-29 08:06:28 UTC (rev 10346) +++ trunk/src/groupchat_control.py 2008-08-29 09:35:44 UTC (rev 10347) @@ -1017,7 +1017,16 @@ affiliation = 'none' fake_jid = self.room_jid + '/' + nick newly_created = False + nick_jid = nick + # Set to true if role or affiliation have changed + right_changed = False + + if jid: + # delete ressource + simple_jid = gajim.get_jid_without_resource(jid) + nick_jid += ' (%s)' % simple_jid + # statusCode # http://www.xmpp.org/extensions/xep-0045.html#registrar-statuscodes-init if statusCode: @@ -1173,11 +1182,36 @@ # save sha in mem NOW con.vcard_shas[fake_jid] = avatar_sha + actual_affiliation = gc_c.affiliation + if affiliation != actual_affiliation: + if actor: + st = _('** Affiliation of %(nick)s has been set to ' + '%(affiliation)s by %(actor)s' % {'nick': nick_jid, + 'affiliation': affiliation, 'actor': actor} + else: + st = _('** Affiliation of %(nick)s has been set to ' + '%(affiliation)s' % {'nick': nick_jid, + 'affiliation': affiliation} + if reason: + st += ' (%s)' % reason + self.print_conversation(st, tim=tim) + right_changed = True actual_role = self.get_role(nick) if role != actual_role: self.remove_contact(nick) self.add_contact_to_roster(nick, show, role, affiliation, status, jid) + if actor: + st = _('** Role of %(nick)s has been set to %(role)s by ' + '%(actor)s' % {'nick': nick_jid, 'role': role, + 'actor': actor} + else: + st = _('** Role of %(nick)s has been set to %(role)s' % { + 'nick': nick_jid, 'role': role} + if reason: + st += ' (%s)' % reason + self.print_conversation(st, tim=tim) + right_changed = True else: if gc_c.show == show and gc_c.status == status and \ gc_c.affiliation == affiliation: # no change @@ -1186,9 +1220,8 @@ gc_c.affiliation = affiliation gc_c.status = status self.draw_contact(nick) - if (time.time() - self.room_creation) > 30 and \ - nick != self.nick and (not statusCode or \ - '303' not in statusCode): + if (time.time() - self.room_creation) > 30 and nick != self.nick and \ + (not statusCode or '303' not in statusCode) and not right_changed: st = '' print_status = None for bookmark in gajim.connections[self.account].bookmarks: @@ -1197,11 +1230,6 @@ break if not print_status: print_status = gajim.config.get('print_status_in_muc') - nick_jid = nick - if jid: - # delete ressource - simple_jid = gajim.get_jid_without_resource(jid) - nick_jid += ' (%s)' % simple_jid if show == 'offline': if nick in self.attention_list: self.attention_list.remove(nick)

1 0

[commit-gajim] r10346 - in trunk/src: . common
by asterix＠gajim.org 29 Aug '08

29 Aug '08

Author: asterix Date: 2008-08-29 10:06:28 +0200 (Fri, 29 Aug 2008) New Revision: 10346 Modified: trunk/src/common/connection_handlers.py trunk/src/gajim.py trunk/src/groupchat_control.py Log: ask to change nickname for a groupchat only once. Fixes #4250 Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-08-29 07:37:55 UTC (rev 10345) +++ trunk/src/common/connection_handlers.py 2008-08-29 08:06:28 UTC (rev 10346) @@ -2014,13 +2014,8 @@ _('You are not in the members list in groupchat %s.') % \ room_jid)) elif errcode == '409': # nick conflict - # the jid_from in this case is FAKE JID: room_jid/nick - # resource holds the bad nick so propose a new one - proposed_nickname = resource + \ - gajim.config.get('gc_proposed_nick_char') room_jid = gajim.get_room_from_fjid(who) - self.dispatch('ASK_NEW_NICK', (room_jid, _('Unable to join group chat'), - _('Your desired nickname in group chat %s is in use or registered by another occupant.\nPlease specify another nickname below:') % room_jid, proposed_nickname)) + self.dispatch('ASK_NEW_NICK', (room_jid,)) else: # print in the window the error self.dispatch('ERROR_ANSWER', ('', jid_stripped, errmsg, errcode)) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-08-29 07:37:55 UTC (rev 10345) +++ trunk/src/gajim.py 2008-08-29 08:06:28 UTC (rev 10346) @@ -536,17 +536,18 @@ dialogs.InformationDialog(data[0], data[1]) def handle_event_ask_new_nick(self, account, data): - #('ASK_NEW_NICK', account, (room_jid, title_text, prompt_text, proposed_nick)) + #('ASK_NEW_NICK', account, (room_jid,)) room_jid = data[0] - title = data[1] - prompt = data[2] - proposed_nick = data[3] gc_control = self.msg_win_mgr.get_gc_control(room_jid, account) if not gc_control and \ room_jid in self.minimized_controls[account]: gc_control = self.minimized_controls[account][room_jid] if gc_control: # user may close the window before we are here - gc_control.show_change_nick_input_dialog(title, prompt, proposed_nick) + title = _('Unable to join group chat') + prompt = _('Your desired nickname in group chat %s is in use or ' + 'registered by another occupant.\nPlease specify another nickname ' + 'below:') % room_jid + gc_control.show_change_nick_input_dialog(title, prompt) def handle_event_http_auth(self, account, data): #('HTTP_AUTH', account, (method, url, transaction_id, iq_obj, msg)) Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-08-29 07:37:55 UTC (rev 10345) +++ trunk/src/groupchat_control.py 2008-08-29 08:06:28 UTC (rev 10346) @@ -171,6 +171,7 @@ self.is_continued=is_continued self.is_anonymous = True + self.change_nick_dialog = None self.actions_button = self.xml.get_widget('muc_window_actions_button') id = self.actions_button.connect('clicked', self.on_actions_button_clicked) @@ -1589,10 +1590,14 @@ else: return 'visitor' - def show_change_nick_input_dialog(self, title, prompt, proposed_nick = None): + def show_change_nick_input_dialog(self, title, prompt): '''asks user for new nick and on ok it sets it on room''' + if self.change_nick_dialog: + # A dialog is already opened + return def on_ok(widget): - nick = instance.input_entry.get_text().decode('utf-8') + nick = self.change_nick_dialog.input_entry.get_text().decode('utf-8') + self.change_nick_dialog = None try: nick = helpers.parse_resource(nick) except: @@ -1602,7 +1607,7 @@ return gajim.connections[self.account].join_gc(nick, self.room_jid, None) if gajim.gc_connected[self.account][self.room_jid]: - # We are changing nick, we will change self.nick when we receive + # We are changing nick, we will change self.nick when we receive # presence that inform that it works self.new_nick = nick else: @@ -1610,9 +1615,12 @@ # change it NOW. We don't already have a nick so it's harmless self.nick = nick def on_cancel(): - self.new_nick = '' - instance = dialogs.InputDialog(title, prompt, proposed_nick, - is_modal = False, ok_handler = on_ok, cancel_handler = on_cancel) + self.change_nick_dialog = None + self.new_nick = '' + proposed_nick = self.nick + gajim.config.get('gc_proposed_nick_char') + self.change_nick_dialog = dialogs.InputDialog(title, prompt, + proposed_nick, is_modal=False, ok_handler=on_ok, + cancel_handler=on_cancel) def minimize(self, status='offline'): # Minimize it @@ -1744,7 +1752,7 @@ def _on_change_nick_menuitem_activate(self, widget): title = _('Changing Nickname') prompt = _('Please specify the new nickname you want to use:') - self.show_change_nick_input_dialog(title, prompt, self.nick) + self.show_change_nick_input_dialog(title, prompt) def _on_configure_room_menuitem_activate(self, widget): c = gajim.contacts.get_gc_contact(self.account, self.room_jid, self.nick)

1 0

[commit-gajim] r10345 - trunk/src
by asterix＠gajim.org 29 Aug '08

29 Aug '08

Author: asterix Date: 2008-08-29 09:37:55 +0200 (Fri, 29 Aug 2008) New Revision: 10345 Modified: trunk/src/dialogs.py Log: fix missing self. Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-08-29 07:25:34 UTC (rev 10344) +++ trunk/src/dialogs.py 2008-08-29 07:37:55 UTC (rev 10345) @@ -1558,7 +1558,7 @@ self.dialog.show_all() def on_dubbleinput_dialog_destroy(self, widget): - if not cancel_handler: + if not self.cancel_handler: return False if isinstance(self.cancel_handler, tuple): self.cancel_handler[0](*self.cancel_handler[1:]) @@ -1569,7 +1569,7 @@ user_input1 = self.input_entry1.get_text().decode('utf-8') user_input2 = self.input_entry2.get_text().decode('utf-8') self.dialog.destroy() - if not ok_handler: + if not self.ok_handler: return if isinstance(self.ok_handler, tuple): self.ok_handler[0](user_input1, user_input2, *self.ok_handler[1:])

1 0

[commit-gajim] r10344 - in trunk: debian src
by asterix＠gajim.org 29 Aug '08

29 Aug '08

Author: asterix Date: 2008-08-29 09:25:34 +0200 (Fri, 29 Aug 2008) New Revision: 10344 Modified: trunk/debian/control trunk/src/gajim.py Log: patch has been announce and is in gettext upstream. Debian includes it, let's remove the FIXME. Fixes #4166 Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2008-08-29 06:09:56 UTC (rev 10343) +++ trunk/debian/control 2008-08-29 07:25:34 UTC (rev 10344) @@ -2,7 +2,7 @@ Section: net Priority: optional Maintainer: Yann Le Boulanger <asterix(a)lagaule.org> -Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-support (>= 0.7.1), python-dev, libgtk2.0-dev, python-gtk2-dev, libgtkspell-dev, gettext, libxss-dev, intltool, imagemagick, python-central (>= 0.5), libdbus-1-dev +Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-support (>= 0.7.1), python-dev, libgtk2.0-dev, python-gtk2-dev, libgtkspell-dev, gettext (>= 0.17-4), libxss-dev, intltool, imagemagick, python-central (>= 0.5), libdbus-1-dev Build-Conflicts: python2.3 XS-Python-Version: >= 2.4 Standards-Version: 3.7.3 @@ -15,7 +15,7 @@ XB-Python-Version: ${python:Versions} Depends: python (>= 2.4), python-support (>= 0.7.1), python-glade2 (>= 2.8.0), python-gtk2 (>= 2.8.0), python-pysqlite2 | python (>= 2.5), dnsutils Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-pyopenssl -Suggests: python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnome2-desktop (>= 2.16.0) +Suggests: python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnome2-desktop (>= 2.16.0), gnome-keyring Description: Jabber client written in PyGTK Gajim is a Jabber client. It has a tabbed user interface with normal chats, group chats, and has many features such as, TLS, GPG, SSL, multiple accounts, Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-08-29 06:09:56 UTC (rev 10343) +++ trunk/src/gajim.py 2008-08-29 07:25:34 UTC (rev 10344) @@ -2456,9 +2456,7 @@ self.sth_at_sth_dot_sth_re = re.compile(r'\S+(a)\S+\.\S*[^\s)?]') # Invalid XML chars -# invalid_XML_chars = u'[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x19]|[\ud800-\udfff]|[\ufffe-\uffff]' - #FIXME: xgettext fails with \udfff char ... see #http://trac.gajim.org/ticket/4166 - invalid_XML_chars = u'[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x19]|[\ufffe-\uffff]' + invalid_XML_chars = u'[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x19]|[\ud800-\udfff]|[\ufffe-\uffff]' self.invalid_XML_chars_re = re.compile(invalid_XML_chars) re.purge() # clear the regular expression cache

1 0

[commit-gajim] r10343 - trunk/po
by asterix＠gajim.org 29 Aug '08

29 Aug '08

Author: asterix Date: 2008-08-29 08:09:56 +0200 (Fri, 29 Aug 2008) New Revision: 10343 Modified: trunk/po/de.po Log: [Nico Gulden] updated german translation Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2008-08-28 22:43:28 UTC (rev 10342) +++ trunk/po/de.po 2008-08-29 06:09:56 UTC (rev 10343) @@ -12,8 +12,8 @@ "Project-Id-Version: gajim 0.11\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-08-28 15:53+0200\n" -"PO-Revision-Date: 2008-08-07 15:57+0200\n" -"Last-Translator: Fabian Fingerle <fabian(a)datensalat.eu>\n" +"PO-Revision-Date: 2008-08-28 22:49+0200\n" +"Last-Translator: Nico Gulden <cilugnedon(a)gmx.de>\n" "Language-Team: German <translators(a)gajim.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1101,11 +1101,11 @@ #: ../data/glade/features_window.glade.h:2 msgid "List of possible features in Gajim:" -msgstr "Liste möglicher Gajim-Fähigkeiten:" +msgstr "Liste möglicher Gajim-Features:" #: ../data/glade/features_window.glade.h:3 msgid "Features" -msgstr "Fähigkeiten" +msgstr "Features" #: ../data/glade/filetransfers.glade.h:1 msgid "A list of active, completed and stopped file transfers" @@ -2449,7 +2449,7 @@ #: ../data/glade/roster_window.glade.h:2 msgid "Fea_tures" -msgstr "Fähigkei_ten" +msgstr "Fähigkei_ten des Servers" #: ../data/glade/roster_window.glade.h:3 msgid "File _Transfers" @@ -3019,7 +3019,7 @@ msgid "" "%(title)s by %(artist)s\n" "from %(source)s" -msgstr "\"%(title)s\" von %(artist)s\n" +msgstr "%(title)s von %(artist)s\n" #: ../src/chat_control.py:1430 #, python-format @@ -3521,7 +3521,6 @@ "seperierten Liste von Gruppenchatnamen geschlossen wird." #: ../src/common/config.py:190 -#, fuzzy msgid "" "Comma separated list of hosts that we send, in addition of local interfaces, " "for File Transfer in case of address translation/port forwarding." @@ -3877,7 +3876,6 @@ "sind in den autopriority_* Optionen definiert." #: ../src/common/config.py:286 -#, fuzzy msgid "" "Status used to autoconnect as. Can be online, chat, away, xa, dnd, " "invisible. NOTE: this option is used only if restore_last_status is disabled" @@ -9348,24 +9346,21 @@ msgid " resource with priority " msgstr " Resource mit Priorität " +#~ msgid "Close" +#~ msgstr "Schließen" + +#~ msgid "Verify remote identity" +#~ msgstr "Idenität überprüfen" + #~ msgid "A_ccounts" #~ msgstr "_Konten" #~ msgid "\"%(title)s\" by " #~ msgstr "\"%(title)s\" von " -#~ msgid "%(title)s by %(artist)s\n" -#~ msgstr "%(title)s von %(artist)s\n" - #~ msgid "The following message was " #~ msgstr "Die folgende Nachricht wurde " -#~ msgid "Close" -#~ msgstr "Schließen" - -#~ msgid "Verify remote identity" -#~ msgstr "Idenität überprüfen" - #, fuzzy #~ msgid "Doing Chores" #~ msgstr "Chatlinien Farbe"

1 0

[commit-gajim] r10342 - trunk/src/common
by roidelapluie＠gajim.org 28 Aug '08

28 Aug '08

Author: roidelapluie Date: 2008-08-29 00:43:28 +0200 (Fri, 29 Aug 2008) New Revision: 10342 Modified: trunk/src/common/pep.py Log: beter way to delete PEP when a user goes oflline Modified: trunk/src/common/pep.py =================================================================== --- trunk/src/common/pep.py 2008-08-28 22:07:40 UTC (rev 10341) +++ trunk/src/common/pep.py 2008-08-28 22:43:28 UTC (rev 10342) @@ -498,26 +498,20 @@ if jid == gajim.get_jid_from_account(name): acc = gajim.connections[name] - for key in activities_keys: - if acc.activity.has_key(key): - del acc.activity[key] - for key in tune_keys: - if acc.tune.has_key(key): - del acc.tune[key] - for key in mood_keys: - if acc.mood.has_key(key): - del acc.mood[key] + del acc.activity + acc.activity = {} + del acc.tune + acc.tune = {} + del acc.mood + acc.mood = {} for contact in gajim.contacts.get_contacts(name, user): - for key in activities_keys: - if contact.activity.has_key(key): - del contact.activity[key] - for key in tune_keys: - if contact.tune.has_key(key): - del contact.tune[key] - for key in mood_keys: - if contact.mood.has_key(key): - del contact.mood[key] + del contact.activity + contact.activity = {} + del contact.tune + contact.tune = {} + del contact.mood + contact.mood = {} if jid == gajim.get_jid_from_account(name): gajim.interface.roster.draw_account(name)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2008