Commits September 2007

commits@gajim.org

6 participants
193 discussions

[commit-gajim] r8728 - trunk/debian
by asterix＠gajim.org 05 Sep '07

05 Sep '07

Author: asterix Date: 2007-09-05 14:24:56 +0200 (Wed, 05 Sep 2007) New Revision: 8728 Modified: trunk/debian/control Log: updated debian control files with fixed dep to python2.4-sqlite2 and new suggested packages Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-09-05 12:06:16 UTC (rev 8727) +++ trunk/debian/control 2007-09-05 12:24:56 UTC (rev 8728) @@ -10,9 +10,9 @@ Package: gajim Architecture: any XB-Python-Version: ${python:Versions} -Depends: ${python:Depends}, python-glade2 (>= 2.6.0), python-gtk2 (>= 2.6.0), python-pysqlite2 | python2.5 +Depends: ${python:Depends}, python-glade2 (>= 2.6.0), python-gtk2 (>= 2.6.0), python-pysqlite2 Recommends: dnsutils, python2.4-dbus, notification-daemon, python-gnupginterface, python-pyopenssl -Suggests: python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager +Suggests: python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnome2-desktop (>= 2.16.0) 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,

1 0

[commit-gajim] r8727 - branches/gajim_0.11.1/src
by asterix＠gajim.org 05 Sep '07

05 Sep '07

Author: asterix Date: 2007-09-05 14:06:16 +0200 (Wed, 05 Sep 2007) New Revision: 8727 Modified: branches/gajim_0.11.1/src/roster_window.py Log: fix wrong func name Modified: branches/gajim_0.11.1/src/roster_window.py =================================================================== --- branches/gajim_0.11.1/src/roster_window.py 2007-09-05 11:57:19 UTC (rev 8726) +++ branches/gajim_0.11.1/src/roster_window.py 2007-09-05 12:06:16 UTC (rev 8727) @@ -2611,7 +2611,7 @@ self.tree.get_selection().select_path(path) type_ = model[path][C_TYPE] if type_ in ('agent', 'contact', 'self_contact'): - self.on_row_activated(widget, path) + self.on_roster_treeview_row_activated(widget, path) elif type_ == 'account': account = model[path][C_ACCOUNT].decode('utf-8') if account != 'all':

1 0

[commit-gajim] r8726 - branches/gajim_0.11.1/src/common
by asterix＠gajim.org 05 Sep '07

05 Sep '07

Author: asterix Date: 2007-09-05 13:57:19 +0200 (Wed, 05 Sep 2007) New Revision: 8726 Modified: branches/gajim_0.11.1/src/common/connection_handlers.py Log: convert order to int Modified: branches/gajim_0.11.1/src/common/connection_handlers.py =================================================================== --- branches/gajim_0.11.1/src/common/connection_handlers.py 2007-09-05 11:55:37 UTC (rev 8725) +++ branches/gajim_0.11.1/src/common/connection_handlers.py 2007-09-05 11:57:19 UTC (rev 8726) @@ -1031,6 +1031,10 @@ tag = meta.getAttr('tag') data = {'jid': jid} order = meta.getAttr('order') + try: + order = int(order) + except: + order = 0 if order != None: data['order'] = order if meta_list.has_key(tag):

1 0

[commit-gajim] r8725 - branches/gajim_0.11.1/src/common/zeroconf
by asterix＠gajim.org 05 Sep '07

05 Sep '07

Author: asterix Date: 2007-09-05 13:55:37 +0200 (Wed, 05 Sep 2007) New Revision: 8725 Modified: branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py Log: zeroconf don't support private storage Modified: branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py =================================================================== --- branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py 2007-09-05 11:44:05 UTC (rev 8724) +++ branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py 2007-09-05 11:55:37 UTC (rev 8725) @@ -87,6 +87,7 @@ self.muc_jid = {} # jid of muc server for each transport type self.vcard_supported = False + self.private_storage_supported = False def get_config_values_or_default(self): ''' get name, host, port from config, or

1 0

[commit-gajim] r8724 - in branches/gajim_0.11.1/src: . common
by asterix＠gajim.org 05 Sep '07

05 Sep '07

Author: asterix Date: 2007-09-05 13:44:05 +0200 (Wed, 05 Sep 2007) New Revision: 8724 Modified: branches/gajim_0.11.1/src/common/connection.py branches/gajim_0.11.1/src/common/connection_handlers.py branches/gajim_0.11.1/src/config.py branches/gajim_0.11.1/src/dialogs.py branches/gajim_0.11.1/src/groupchat_control.py branches/gajim_0.11.1/src/roster_window.py Log: don't allow to bookmark a room on server that don't support private storage. Modified: branches/gajim_0.11.1/src/common/connection.py =================================================================== --- branches/gajim_0.11.1/src/common/connection.py 2007-09-05 11:34:28 UTC (rev 8723) +++ branches/gajim_0.11.1/src/common/connection.py 2007-09-05 11:44:05 UTC (rev 8724) @@ -97,7 +97,7 @@ self.available_transports = {} # list of available transports on this # server {'icq': ['icq.server.com', 'icq2.server.com'], } self.vcard_supported = True - self.metacontacts_supported = True + self.private_storage_supported = True # END __init__ def put_event(self, ev): Modified: branches/gajim_0.11.1/src/common/connection_handlers.py =================================================================== --- branches/gajim_0.11.1/src/common/connection_handlers.py 2007-09-05 11:34:28 UTC (rev 8723) +++ branches/gajim_0.11.1/src/common/connection_handlers.py 2007-09-05 11:44:05 UTC (rev 8724) @@ -1039,7 +1039,7 @@ meta_list[tag] = [data] self.dispatch('METACONTACTS', meta_list) else: - self.metacontacts_supported = False + self.private_storage_supported = False # We can now continue connection by requesting the roster self.connection.initRoster() elif self.awaiting_answers[id][0] == PRIVACY_ARRIVED: @@ -1247,7 +1247,7 @@ if storage_tag: ns = storage_tag.getNamespace() if ns == 'storage:metacontacts': - self.metacontacts_supported = False + self.private_storage_supported = False # Private XML Storage (XEP49) is not supported by server # Continue connecting self.connection.initRoster() Modified: branches/gajim_0.11.1/src/config.py =================================================================== --- branches/gajim_0.11.1/src/config.py 2007-09-05 11:34:28 UTC (rev 8723) +++ branches/gajim_0.11.1/src/config.py 2007-09-05 11:44:05 UTC (rev 8724) @@ -2483,7 +2483,9 @@ continue if gajim.connections[account].is_zeroconf: continue - iter = self.treestore.append(None, [None, account,None, + if not gajim.connections[account].private_storage_supported: + continue + iter = self.treestore.append(None, [None, account, None, None, None, None, None]) for bookmark in gajim.connections[account].bookmarks: Modified: branches/gajim_0.11.1/src/dialogs.py =================================================================== --- branches/gajim_0.11.1/src/dialogs.py 2007-09-05 11:34:28 UTC (rev 8723) +++ branches/gajim_0.11.1/src/dialogs.py 2007-09-05 11:44:05 UTC (rev 8724) @@ -1190,6 +1190,9 @@ if len(self._empty_required_widgets): self.xml.get_widget('join_button').set_sensitive(False) + if not gajim.connections[account].private_storage_supported: + self.xml.get_widget('auto_join_checkbutton').set_sensitive(False) + self.window.show_all() def on_join_groupchat_window_destroy(self, widget): Modified: branches/gajim_0.11.1/src/groupchat_control.py =================================================================== --- branches/gajim_0.11.1/src/groupchat_control.py 2007-09-05 11:34:28 UTC (rev 8723) +++ branches/gajim_0.11.1/src/groupchat_control.py 2007-09-05 11:44:05 UTC (rev 8724) @@ -215,10 +215,10 @@ # connect the menuitems to their respective functions xm = gtkgui_helpers.get_glade('gc_control_popup_menu.glade') - widget = xm.get_widget('bookmark_room_menuitem') - id = widget.connect('activate', + self.bookmark_room_menuitem = xm.get_widget('bookmark_room_menuitem') + id = self.bookmark_room_menuitem.connect('activate', self._on_bookmark_room_menuitem_activate) - self.handlers[id] = widget + self.handlers[id] = self.bookmark_room_menuitem widget = xm.get_widget('change_nick_menuitem') id = widget.connect('activate', self._on_change_nick_menuitem_activate) @@ -481,6 +481,8 @@ childs = menu.get_children() # hide chat buttons childs[5].set_active(self.hide_chat_buttons_current) + if not gajim.connections[self.account].private_storage_supported: + self.bookmark_room_menuitem.set_sensitive(False) if gajim.gc_connected[self.account][self.room_jid]: c = gajim.contacts.get_gc_contact(self.account, self.room_jid, self.nick) Modified: branches/gajim_0.11.1/src/roster_window.py =================================================================== --- branches/gajim_0.11.1/src/roster_window.py 2007-09-05 11:34:28 UTC (rev 8723) +++ branches/gajim_0.11.1/src/roster_window.py 2007-09-05 11:44:05 UTC (rev 8724) @@ -870,6 +870,9 @@ join_gc_menuitem.set_submenu(gc_sub_menu) connected_accounts = gajim.get_number_of_connected_accounts() + + connected_accounts_with_private_storage = 0 + if connected_accounts > 1: # 2 or more accounts? make submenus add_sub_menu = gtk.Menu() disco_sub_menu = gtk.Menu() @@ -893,6 +896,8 @@ continue # join gc + if gajim.connections[account].private_storage_supported: + connected_accounts_with_private_storage += 1 label = gtk.Label() label.set_markup('<u>' + account.upper() +'</u>') label.set_use_underline(False) @@ -900,13 +905,11 @@ gc_item.add(label) gc_item.connect('state-changed', gtkgui_helpers.on_bm_header_changed_state) + gc_item = gtk.MenuItem(_('using account %s') % account, False) gc_sub_menu.append(gc_item) self.add_bookmarks_list(gc_sub_menu, account) - # the 'manage gc bookmarks' item is shown - # below to avoid duplicate code - # add add_item = gtk.MenuItem(_('to %s account') % account, False) add_sub_menu.append(add_item) @@ -918,7 +921,6 @@ disco_item.connect('activate', self.on_service_disco_menuitem_activate, account) - add_new_contact_menuitem.set_submenu(add_sub_menu) add_sub_menu.show_all() service_disco_menuitem.set_submenu(disco_sub_menu) @@ -930,7 +932,10 @@ for account in gajim.connections: if gajim.account_is_connected(account): # THE connected account # gc + if gajim.connections[account].private_storage_supported: + connected_accounts_with_private_storage += 1 self.add_bookmarks_list(gc_sub_menu, account) + gc_sub_menu.show_all() # add if not self.add_new_contact_handler_id: self.add_new_contact_handler_id =\ @@ -974,10 +979,21 @@ add_new_contact_menuitem, service_disco_menuitem]: item.set_sensitive(False) + if connected_accounts_with_private_storage > 0: + # At least one account with private storage support # show the 'manage gc bookmarks' item newitem = gtk.SeparatorMenuItem() # separator gc_sub_menu.append(newitem) + newitem = gtk.ImageMenuItem(_('_Manage Bookmarks...')) + img = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES, + gtk.ICON_SIZE_MENU) + newitem.set_image(img) + newitem.connect('activate', + self.on_manage_bookmarks_menuitem_activate) + gc_sub_menu.append(newitem) + gc_sub_menu.show_all() + connected_accounts_with_vcard = [] for account in gajim.connections: if gajim.account_is_connected(account) and \ @@ -1008,15 +1024,6 @@ else: profile_avatar_menuitem.set_sensitive(True) - newitem = gtk.ImageMenuItem(_('_Manage Bookmarks...')) - img = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES, - gtk.ICON_SIZE_MENU) - newitem.set_image(img) - newitem.connect('activate', - self.on_manage_bookmarks_menuitem_activate) - gc_sub_menu.append(newitem) - gc_sub_menu.show_all() - # Advanced Actions if len(gajim.connections) == 0: # user has no accounts advanced_menuitem.set_sensitive(False) @@ -4033,8 +4040,8 @@ def on_drop_in_contact(self, widget, account_source, c_source, account_dest, c_dest, was_big_brother, context, etime): - if not gajim.connections[account_source].metacontacts_supported or not \ - gajim.connections[account_dest].metacontacts_supported: + if not gajim.connections[account_source].private_storage_supported or not\ + gajim.connections[account_dest].private_storage_supported: dialogs.WarningDialog(_('Metacontacts storage not supported by your ' 'server'), _('Your server does not support storing metacontacts information. '

1 0

[commit-gajim] r8723 - branches/gajim_0.11.1/src/common
by asterix＠gajim.org 05 Sep '07

05 Sep '07

Author: asterix Date: 2007-09-05 13:34:28 +0200 (Wed, 05 Sep 2007) New Revision: 8723 Modified: branches/gajim_0.11.1/src/common/dataforms.py Log: default value in boolean fields is False if none is provided. Modified: branches/gajim_0.11.1/src/common/dataforms.py =================================================================== --- branches/gajim_0.11.1/src/common/dataforms.py 2007-09-04 21:47:12 UTC (rev 8722) +++ branches/gajim_0.11.1/src/common/dataforms.py 2007-09-05 11:34:28 UTC (rev 8723) @@ -168,7 +168,7 @@ v = self.getTagData('value') if v in ('0', 'false'): return False if v in ('1', 'true'): return True - if v is None: return None + if v is None: return False # default value is False raise WrongFieldValue def fset(self, value): self.setTagData('value', value and '1' or '0')

1 0

[commit-gajim] r8722 - branches/gajim_0.11.1/src
by asterix＠gajim.org 04 Sep '07

04 Sep '07

Author: asterix Date: 2007-09-04 23:47:12 +0200 (Tue, 04 Sep 2007) New Revision: 8722 Modified: branches/gajim_0.11.1/src/groupchat_control.py Log: catch traceback and show error message when we try to change our nickname with not allowed chars Modified: branches/gajim_0.11.1/src/groupchat_control.py =================================================================== --- branches/gajim_0.11.1/src/groupchat_control.py 2007-09-04 21:46:22 UTC (rev 8721) +++ branches/gajim_0.11.1/src/groupchat_control.py 2007-09-04 21:47:12 UTC (rev 8722) @@ -1092,7 +1092,13 @@ # example: /nick foo if len(message_array) and message_array[0] != self.nick: nick = message_array[0] - nick = helpers.parse_resource(nick) + try: + nick = helpers.parse_resource(nick) + except: + # Invalid Nickname + dialogs.ErrorDialog(_('Invalid nickname'), + _('The nickname has not allowed characters.')) + return True gajim.connections[self.account].join_gc(nick, self.room_jid, None) self.clear(self.msg_textview) else: @@ -1373,7 +1379,13 @@ '''asks user for new nick and on ok it sets it on room''' def on_ok(widget): nick = instance.input_entry.get_text().decode('utf-8') - nick = helpers.parse_resource(nick) + try: + nick = helpers.parse_resource(nick) + except: + # invalid char + dialogs.ErrorDialog(_('Invalid nickname'), + _('The nickname has not allowed characters.')) + return gajim.connections[self.account].join_gc(nick, self.room_jid, None) instance = dialogs.InputDialog(title, prompt, proposed_nick, is_modal = False, ok_handler = on_ok)

1 0

[commit-gajim] r8721 - trunk/src
by asterix＠gajim.org 04 Sep '07

04 Sep '07

Author: asterix Date: 2007-09-04 23:46:22 +0200 (Tue, 04 Sep 2007) New Revision: 8721 Modified: trunk/src/groupchat_control.py Log: catch traceback and show error message when we try to change our nickname with not allowed chars Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-09-04 21:36:35 UTC (rev 8720) +++ trunk/src/groupchat_control.py 2007-09-04 21:46:22 UTC (rev 8721) @@ -1205,7 +1205,13 @@ # example: /nick foo if len(message_array) and message_array[0] != self.nick: nick = message_array[0] - nick = helpers.parse_resource(nick) + try: + nick = helpers.parse_resource(nick) + except: + # Invalid Nickname + dialogs.ErrorDialog(_('Invalid nickname'), + _('The nickname has not allowed characters.')) + return True gajim.connections[self.account].join_gc(nick, self.room_jid, None) self.nick = nick self.clear(self.msg_textview) @@ -1487,7 +1493,13 @@ '''asks user for new nick and on ok it sets it on room''' def on_ok(widget): nick = instance.input_entry.get_text().decode('utf-8') - nick = helpers.parse_resource(nick) + try: + nick = helpers.parse_resource(nick) + except: + # invalid char + dialogs.ErrorDialog(_('Invalid nickname'), + _('The nickname has not allowed characters.')) + return gajim.connections[self.account].join_gc(nick, self.room_jid, None) self.nick = nick instance = dialogs.InputDialog(title, prompt, proposed_nick,

1 0

[commit-gajim] r8720 - trunk/src
by asterix＠gajim.org 04 Sep '07

04 Sep '07

Author: asterix Date: 2007-09-04 23:36:35 +0200 (Tue, 04 Sep 2007) New Revision: 8720 Modified: trunk/src/conversation_textview.py Log: fix TB when scrolling is too long Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2007-09-04 20:16:15 UTC (rev 8719) +++ trunk/src/conversation_textview.py 2007-09-04 21:36:35 UTC (rev 8720) @@ -205,6 +205,9 @@ return True def smooth_scroll_timeout(self): + if not self.smooth_id: + # we finished scrolling + return gobject.source_remove(self.smooth_id) self.smooth_id = None parent = self.tv.get_parent()

1 0

[commit-gajim] r8719 - in branches/gajim_0.11.1/src: . common
by asterix＠gajim.org 04 Sep '07

04 Sep '07

Author: asterix Date: 2007-09-04 22:16:15 +0200 (Tue, 04 Sep 2007) New Revision: 8719 Modified: branches/gajim_0.11.1/src/common/contacts.py branches/gajim_0.11.1/src/roster_window.py Log: clear contact list when we connect. fixes #3234 Modified: branches/gajim_0.11.1/src/common/contacts.py =================================================================== --- branches/gajim_0.11.1/src/common/contacts.py 2007-09-04 20:15:52 UTC (rev 8718) +++ branches/gajim_0.11.1/src/common/contacts.py 2007-09-04 20:16:15 UTC (rev 8719) @@ -189,6 +189,9 @@ if len(self._contacts[account][contact.jid]) == 0: del self._contacts[account][contact.jid] + def clear_contacts(self, account): + self._contacts[account] = {} + def remove_jid(self, account, jid): '''Removes all contacts for a given jid''' if not self._contacts.has_key(account): Modified: branches/gajim_0.11.1/src/roster_window.py =================================================================== --- branches/gajim_0.11.1/src/roster_window.py 2007-09-04 20:15:52 UTC (rev 8718) +++ branches/gajim_0.11.1/src/roster_window.py 2007-09-04 20:16:15 UTC (rev 8719) @@ -1119,6 +1119,8 @@ gajim.contacts.add_account(account) if not gajim.groups.has_key(account): gajim.groups[account] = {} + # Empty contact list + gajim.contacts.clear_contacts(account) for jid in array.keys(): jids = jid.split('/') #get jid

1 0

← Newer
1
...
13
14
15
16
17
18
19
20
Older →

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 September 2007