Commits September 2007

commits@gajim.org

6 participants
193 discussions

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

05 Sep '07

Author: asterix Date: 2007-09-05 23:18:32 +0200 (Wed, 05 Sep 2007) New Revision: 8738 Modified: branches/gajim_0.11.1/src/config.py Log: fix indentation Modified: branches/gajim_0.11.1/src/config.py =================================================================== --- branches/gajim_0.11.1/src/config.py 2007-09-05 21:16:22 UTC (rev 8737) +++ branches/gajim_0.11.1/src/config.py 2007-09-05 21:18:32 UTC (rev 8738) @@ -635,7 +635,7 @@ def update_theme_list(self): theme_combobox = self.xml.get_widget('theme_combobox') model = gtk.ListStore(str) - theme_combobox.set_model(model) + theme_combobox.set_model(model) i = 0 for config_theme in gajim.config.get_per('themes'): theme = config_theme.replace('_', ' ') @@ -3225,7 +3225,7 @@ list_no_log_for.remove(gajim.ZEROCONF_ACC_NAME) if not self.xml.get_widget('log_history_checkbutton').get_active(): list_no_log_for.append(gajim.ZEROCONF_ACC_NAME) - config['no_log_for'] = ' '.join(list_no_log_for) + config['no_log_for'] = ' '.join(list_no_log_for) st = self.xml.get_widget('sync_with_global_status_checkbutton').\ get_active()

1 0

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

05 Sep '07

Author: asterix Date: 2007-09-05 23:16:22 +0200 (Wed, 05 Sep 2007) New Revision: 8737 Modified: trunk/src/config.py Log: destroy connection instance when we cancel the addition of an account Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-09-05 18:26:42 UTC (rev 8736) +++ trunk/src/config.py 2007-09-05 21:16:22 UTC (rev 8737) @@ -2976,6 +2976,11 @@ self.window.show_all() def on_wizard_window_destroy(self, widget): + page = self.notebook.get_current_page() + if page > 2 and page < 5 and self.account in gajim.connections: + # connection instance is saved in gajim.connections and we canceled the + # addition of the account + del gajim.connections[self.account] del gajim.interface.instances['account_creation_wizard'] def on_register_server_features_button_clicked(self, widget): @@ -2993,6 +2998,8 @@ self.notebook.set_current_page(0) self.back_button.set_sensitive(False) elif self.notebook.get_current_page() == 3: + if self.account in gajim.connections: + del gajim.connections[self.account] self.notebook.set_current_page(2) self.xml.get_widget('form_vbox').remove(self.data_form_widget) elif self.notebook.get_current_page() == 5: # finish page

1 0

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

05 Sep '07

Author: asterix Date: 2007-09-05 20:26:42 +0200 (Wed, 05 Sep 2007) New Revision: 8736 Modified: branches/gajim_0.11.1/src/groupchat_control.py Log: don't check if there is a @ when we invite a JID. Modified: branches/gajim_0.11.1/src/groupchat_control.py =================================================================== --- branches/gajim_0.11.1/src/groupchat_control.py 2007-09-05 18:23:16 UTC (rev 8735) +++ branches/gajim_0.11.1/src/groupchat_control.py 2007-09-05 18:26:42 UTC (rev 8736) @@ -1168,19 +1168,13 @@ if len(message_array): message_array = message_array[0].split() invitee = message_array.pop(0) - if invitee.find('@') >= 0: - reason = ' '.join(message_array) - gajim.connections[self.account].send_invite(self.room_jid, - invitee, reason) - s = _('Invited %(contact_jid)s to %(room_jid)s.') % { - 'contact_jid': invitee, - 'room_jid': self.room_jid} - self.print_conversation(s, 'info') - self.clear(self.msg_textview) - else: - #%s is something the user wrote but it is not a jid so we inform - s = _('%s does not appear to be a valid JID') % invitee - self.print_conversation(s, 'info') + reason = ' '.join(message_array) + gajim.connections[self.account].send_invite(self.room_jid, invitee, reason) + s = _('Invited %(contact_jid)s to %(room_jid)s.') % { + 'contact_jid': invitee, + 'room_jid': self.room_jid} + self.print_conversation(s, 'info') + self.clear(self.msg_textview) else: self.get_command_help(command) return True

1 0

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

05 Sep '07

Author: asterix Date: 2007-09-05 20:23:16 +0200 (Wed, 05 Sep 2007) New Revision: 8735 Modified: trunk/src/groupchat_control.py Log: don't check if there is a @ when we invite a JID. Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-09-05 16:10:26 UTC (rev 8734) +++ trunk/src/groupchat_control.py 2007-09-05 18:23:16 UTC (rev 8735) @@ -1276,19 +1276,13 @@ if len(message_array): message_array = message_array[0].split() invitee = message_array.pop(0) - if invitee.find('@') >= 0: - reason = ' '.join(message_array) - gajim.connections[self.account].send_invite(self.room_jid, - invitee, reason) - s = _('Invited %(contact_jid)s to %(room_jid)s.') % { - 'contact_jid': invitee, - 'room_jid': self.room_jid} - self.print_conversation(s, 'info') - self.clear(self.msg_textview) - else: - #%s is something the user wrote but it is not a jid so we inform - s = _('%s does not appear to be a valid JID') % invitee - self.print_conversation(s, 'info') + reason = ' '.join(message_array) + gajim.connections[self.account].send_invite(self.room_jid, invitee, reason) + s = _('Invited %(contact_jid)s to %(room_jid)s.') % { + 'contact_jid': invitee, + 'room_jid': self.room_jid} + self.print_conversation(s, 'info') + self.clear(self.msg_textview) else: self.get_command_help(command) return True

1 0

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

05 Sep '07

Author: asterix Date: 2007-09-05 18:10:26 +0200 (Wed, 05 Sep 2007) New Revision: 8734 Modified: branches/gajim_0.11.1/src/roster_window.py Log: don't send music changement if we're not correctly connected Modified: branches/gajim_0.11.1/src/roster_window.py =================================================================== --- branches/gajim_0.11.1/src/roster_window.py 2007-09-05 15:45:20 UTC (rev 8733) +++ branches/gajim_0.11.1/src/roster_window.py 2007-09-05 16:10:26 UTC (rev 8734) @@ -3005,7 +3005,9 @@ if not gajim.config.get_per('accounts', account, 'sync_with_global_status'): continue - if not gajim.connections[account].connected: + if gajim.connections[account].connected < gajim.SHOW_LIST.index( + 'online') or gajim.connections[account].connected > gajim.SHOW_LIST.\ + index('invisible'): continue current_show = gajim.SHOW_LIST[gajim.connections[account].connected] self.send_status(account, current_show, status_message)

1 0

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

05 Sep '07

Author: asterix Date: 2007-09-05 17:45:20 +0200 (Wed, 05 Sep 2007) New Revision: 8733 Modified: trunk/src/roster_window.py Log: don't send music changement if we're not correctly connected Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-09-05 14:15:20 UTC (rev 8732) +++ trunk/src/roster_window.py 2007-09-05 15:45:20 UTC (rev 8733) @@ -3699,7 +3699,9 @@ if not gajim.config.get_per('accounts', account, 'sync_with_global_status'): continue - if not gajim.connections[account].connected: + if gajim.connections[account].connected < gajim.SHOW_LIST.index( + 'online') or gajim.connections[account].connected > gajim.SHOW_LIST.\ + index('invisible'): continue current_show = gajim.SHOW_LIST[gajim.connections[account].connected] self.send_status(account, current_show, status_message)

1 0

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

05 Sep '07

Author: asterix Date: 2007-09-05 16:15:20 +0200 (Wed, 05 Sep 2007) New Revision: 8732 Modified: branches/gajim_0.11.1/data/glade/message_window.glade branches/gajim_0.11.1/src/config.py branches/gajim_0.11.1/src/groupchat_control.py branches/gajim_0.11.1/src/roster_window.py Log: Enable ellipsization in roster and chatwindow. Fixes #2079, #2739 Reorder occupantlist in groupchat to match roster. see #2102 Modified: branches/gajim_0.11.1/data/glade/message_window.glade =================================================================== --- branches/gajim_0.11.1/data/glade/message_window.glade 2007-09-05 14:05:27 UTC (rev 8731) +++ branches/gajim_0.11.1/data/glade/message_window.glade 2007-09-05 14:15:20 UTC (rev 8732) @@ -591,7 +591,7 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> <property name="width_chars">-1</property> <property name="single_line_mode">False</property> <property name="angle">0</property> Modified: branches/gajim_0.11.1/src/config.py =================================================================== --- branches/gajim_0.11.1/src/config.py 2007-09-05 14:05:27 UTC (rev 8731) +++ branches/gajim_0.11.1/src/config.py 2007-09-05 14:15:20 UTC (rev 8732) @@ -575,7 +575,14 @@ def on_show_avatars_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_avatars_in_roster') gajim.interface.roster.draw_roster() - + # Redraw connected groupchats (in an ugly way) + for account in gajim.connections: + if gajim.connections[account].connected: + for gc_control in gajim.interface.msg_win_mgr.get_controls( + message_control.TYPE_GC) + \ + gajim.interface.minimized_controls[account].values(): + gc_control.draw_roster() + def on_emoticons_combobox_changed(self, widget): active = widget.get_active() model = widget.get_model() Modified: branches/gajim_0.11.1/src/groupchat_control.py =================================================================== --- branches/gajim_0.11.1/src/groupchat_control.py 2007-09-05 14:05:27 UTC (rev 8731) +++ branches/gajim_0.11.1/src/groupchat_control.py 2007-09-05 14:15:20 UTC (rev 8732) @@ -277,14 +277,8 @@ # first one img, second one text, third is sec pixbuf column = gtk.TreeViewColumn() - renderer_pixbuf = gtk.CellRendererPixbuf() # avatar image - column.pack_start(renderer_pixbuf, expand = False) - column.add_attribute(renderer_pixbuf, 'pixbuf', C_AVATAR) - column.set_cell_data_func(renderer_pixbuf, tree_cell_data_func, - self.list_treeview) - renderer_pixbuf.set_property('xalign', 1) # align pixbuf to the right - renderer_image = cell_renderer_image.CellRendererImage(0, 0) # status img + renderer_image.set_property('width', 26) column.pack_start(renderer_image, expand = False) column.add_attribute(renderer_image, 'image', C_IMG) column.set_cell_data_func(renderer_image, tree_cell_data_func, @@ -293,9 +287,17 @@ renderer_text = gtk.CellRendererText() # nickname column.pack_start(renderer_text, expand = True) column.add_attribute(renderer_text, 'markup', C_TEXT) + renderer_text.set_property("ellipsize", pango.ELLIPSIZE_END) column.set_cell_data_func(renderer_text, tree_cell_data_func, self.list_treeview) + renderer_pixbuf = gtk.CellRendererPixbuf() # avatar image + column.pack_start(renderer_pixbuf, expand = False) + column.add_attribute(renderer_pixbuf, 'pixbuf', C_AVATAR) + column.set_cell_data_func(renderer_pixbuf, tree_cell_data_func, + self.list_treeview) + renderer_pixbuf.set_property('xalign', 1) # align pixbuf to the right + self.list_treeview.append_column(column) # workaround to avoid gtk arrows to be shown @@ -767,6 +769,8 @@ self.add_contact_to_roster(nick, gc_contact.show, gc_contact.role, gc_contact.affiliation, gc_contact.status, gc_contact.jid) + # Recalculate column width for ellipsizin + self.list_treeview.columns_autosize() def on_send_pm(self, widget = None, model = None, iter = None, nick = None, msg = None): Modified: branches/gajim_0.11.1/src/roster_window.py =================================================================== --- branches/gajim_0.11.1/src/roster_window.py 2007-09-05 14:05:27 UTC (rev 8731) +++ branches/gajim_0.11.1/src/roster_window.py 2007-09-05 14:15:20 UTC (rev 8732) @@ -16,6 +16,7 @@ ## import gtk +import pango import gobject import os import time @@ -1104,6 +1105,8 @@ for acct in gajim.connections: self.add_account_to_roster(acct) self.add_account_contacts(acct) + # Recalculate column width for ellipsizing + self.tree.columns_autosize() def add_account_contacts(self, account): '''adds contacts of group to roster treeview''' @@ -4487,6 +4490,7 @@ col.set_cell_data_func(render_image, self.iconCellDataFunc, None) render_text = gtk.CellRendererText() # contact or group or account name + render_text.set_property("ellipsize", pango.ELLIPSIZE_END) col.pack_start(render_text, expand = True) col.add_attribute(render_text, 'markup', C_NAME) # where we hold the name col.set_cell_data_func(render_text, self.nameCellDataFunc, None)

1 0

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

05 Sep '07

Author: asterix Date: 2007-09-05 16:05:27 +0200 (Wed, 05 Sep 2007) New Revision: 8731 Modified: branches/gajim_0.11.1/src/roster_window.py Log: send status to room only once Modified: branches/gajim_0.11.1/src/roster_window.py =================================================================== --- branches/gajim_0.11.1/src/roster_window.py 2007-09-05 12:30:14 UTC (rev 8730) +++ branches/gajim_0.11.1/src/roster_window.py 2007-09-05 14:05:27 UTC (rev 8731) @@ -2813,11 +2813,6 @@ passphrase) gajim.connections[account].gpg_passphrase(passphrase) - for gc_control in gajim.interface.msg_win_mgr.get_controls( - message_control.TYPE_GC): - if gc_control.account == account: - gajim.connections[account].send_gc_status(gc_control.nick, - gc_control.room_jid, status, txt) if gajim.account_is_connected(account): if status == 'online' and gajim.interface.sleeper.getState() != \ common.sleepy.STATE_UNKNOWN:

1 0

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

05 Sep '07

Author: asterix Date: 2007-09-05 14:30:14 +0200 (Wed, 05 Sep 2007) New Revision: 8730 Modified: branches/gajim_0.11.1/debian/control Log: updated debian control files with fixed dep to python-sqlite2 and new suggested packages Modified: branches/gajim_0.11.1/debian/control =================================================================== --- branches/gajim_0.11.1/debian/control 2007-09-05 12:29:35 UTC (rev 8729) +++ branches/gajim_0.11.1/debian/control 2007-09-05 12:30:14 UTC (rev 8730) @@ -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), python2.4-pysqlite2 | python2.5 +Depends: ${python:Depends}, python-glade2 (>= 2.6.0), python-gtk2 (>= 2.6.0), python-pysqlite2 Recommends: dnsutils, dbus, python-dbus, notification-daemon, python-gnupginterface -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] r8729 - trunk/debian
by asterix＠gajim.org 05 Sep '07

05 Sep '07

Author: asterix Date: 2007-09-05 14:29:35 +0200 (Wed, 05 Sep 2007) New Revision: 8729 Modified: trunk/debian/control Log: fix debian package names Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2007-09-05 12:24:56 UTC (rev 8728) +++ trunk/debian/control 2007-09-05 12:29:35 UTC (rev 8729) @@ -11,7 +11,7 @@ Architecture: any XB-Python-Version: ${python:Versions} 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 +Recommends: dnsutils, 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) Description: Jabber client written in PyGTK Gajim is a Jabber client. It has a tabbed user interface with normal chats,

1 0

← Newer
1
...
12
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