Commits May 2007

commits@gajim.org

4 participants
63 discussions

[commit-gajim] r8175 - trunk/src
by roidelapluie＠gajim.org 27 May '07

27 May '07

Author: roidelapluie Date: 2007-05-27 11:16:21 +0200 (Sun, 27 May 2007) New Revision: 8175 Modified: trunk/src/groupchat_control.py Log: Fix a bug with changing status in groupchats. Always print "You are now %s" in groupchats, even if you change from "action menu". Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-05-24 18:12:01 UTC (rev 8174) +++ trunk/src/groupchat_control.py 2007-05-27 09:16:21 UTC (rev 8175) @@ -1408,7 +1408,6 @@ nick = instance.input_entry.get_text().decode('utf-8') nick = helpers.parse_resource(nick) gajim.connections[self.account].join_gc(nick, self.room_jid, None) - self.nick = nick instance = dialogs.InputDialog(title, prompt, proposed_nick, is_modal = False, ok_handler = on_ok)

1 0

[commit-gajim] r8174 - trunk/src
by asterix＠gajim.org 24 May '07

24 May '07

Author: asterix Date: 2007-05-24 20:12:01 +0200 (Thu, 24 May 2007) New Revision: 8174 Modified: trunk/src/dialogs.py Log: [lukas] add autocompletion of jid in privacy lists dialog. fixes #2764 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-05-22 17:55:25 UTC (rev 8173) +++ trunk/src/dialogs.py 2007-05-24 18:12:01 UTC (rev 8174) @@ -7,6 +7,7 @@ ## Copyright (C) 2005 Dimitur Kirov <dkirov(a)gmail.com> ## Copyright (C) 2005-2006 Travis Shirk <travis(a)pobox.com> ## Copyright (C) 2005 Norman Rasmussen <norman(a)rasmussen.co.za> +## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published @@ -2089,6 +2090,16 @@ self.privacy_list_default_checkbutton.set_sensitive(False) self.list_of_rules_combobox.set_sensitive(False) + # set jabber id completion + jids_list_store = gtk.ListStore(gobject.TYPE_STRING) + for jid in gajim.contacts.get_jid_list(self.account): + jids_list_store.append([jid]) + jid_entry_completion = gtk.EntryCompletion() + jid_entry_completion.set_text_column(0) + jid_entry_completion.set_model(jids_list_store) + jid_entry_completion.set_popup_completion(True) + self.edit_type_jabberid_entry.set_completion(jid_entry_completion) + if action == 'EDIT': self.refresh_rules()

1 0

[commit-gajim] r8173 - in trunk: data/glade src
by asterix＠gajim.org 22 May '07

22 May '07

Author: asterix Date: 2007-05-22 19:55:25 +0200 (Tue, 22 May 2007) New Revision: 8173 Modified: trunk/data/glade/service_registration_window.glade trunk/src/config.py Log: introduce a FakeDataForm class that draws a table from dict {entry: value} and use it for service registration Modified: trunk/data/glade/service_registration_window.glade =================================================================== --- trunk/data/glade/service_registration_window.glade 2007-05-22 16:09:14 UTC (rev 8172) +++ trunk/data/glade/service_registration_window.glade 2007-05-22 17:55:25 UTC (rev 8173) @@ -2,6 +2,7 @@ <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> <glade-interface> + <widget class="GtkWindow" id="service_registration_window"> <property name="border_width">6</property> <property name="title" translatable="yes">Register to</property> @@ -18,6 +19,7 @@ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> <child> <widget class="GtkVBox" id="vbox12"> @@ -26,31 +28,6 @@ <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">4</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">4</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> <widget class="GtkTable" id="table"> <property name="visible">True</property> <property name="n_rows">1</property> @@ -232,4 +209,5 @@ </widget> </child> </widget> + </glade-interface> Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-05-22 16:09:14 UTC (rev 8172) +++ trunk/src/config.py 2007-05-22 17:55:25 UTC (rev 8173) @@ -2087,23 +2087,65 @@ self.on_checkbutton_toggled(widget, 'enable_zeroconf') +class FakeDataForm(gtk.Table, object): + '''Class for forms that are in XML format <entry1>value1</entry1> + infos in a table {entry1: value1, }''' + def __init__(self, infos): + gtk.Table.__init__(self) + self.infos = infos + self.entries = {} + self._draw_table() + + def _draw_table(self): + '''Draw the table in the window''' + nbrow = 0 + if self.infos.has_key('instructions'): + nbrow = 1 + self.resize(rows = nbrow, columns = 2) + label = gtk.Label(self.infos['instructions']) + self.attach(label, 0, 2, 0, 1, 0, 0, 0, 0) + for name in self.infos.keys(): + if name in ('key', 'instructions', 'x', 'registered'): + continue + if not name: + continue + + nbrow = nbrow + 1 + self.resize(rows = nbrow, columns = 2) + label = gtk.Label(name.capitalize() + ':') + self.attach(label, 0, 1, nbrow - 1, nbrow, 0, 0, 0, 0) + entry = gtk.Entry() + entry.set_activates_default(True) + if self.infos[name]: + entry.set_text(self.infos[name]) + if name == 'password': + entry.set_visibility(False) + self.attach(entry, 1, 2, nbrow - 1, nbrow, 0, 0, 0, 0) + self.entries[name] = entry + if nbrow == 1: + entry.grab_focus() + + def get_infos(self): + for name in self.entries.keys(): + self.infos[name] = self.entries[name].get_text().decode('utf-8') + return self.infos + class ServiceRegistrationWindow: '''Class for Service registration window: Window that appears when we want to subscribe to a service if is_form we use dataforms_widget else we use service_registarion_window''' def __init__(self, service, infos, account, is_form): self.service = service - self.infos = infos self.account = account self.is_form = is_form self.xml = gtkgui_helpers.get_glade('service_registration_window.glade') self.window = self.xml.get_widget('service_registration_window') self.window.set_transient_for(gajim.interface.roster.window) if self.is_form: - dataform = dataforms.ExtendForm(node = self.infos) + dataform = dataforms.ExtendForm(node = infos) self.data_form_widget = dataforms_widget.DataFormWidget(dataform) if self.data_form_widget.title: - self.window.set_title("%s - Gajim" % self.data_form_widget.title) + self.window.set_title('%s - Gajim' % self.data_form_widget.title) table = self.xml.get_widget('table') table.attach(self.data_form_widget, 0, 2, 0, 1) else: @@ -2111,9 +2153,9 @@ self.window.set_title(_('Edit %s') % service) else: self.window.set_title(_('Register to %s') % service) - self.xml.get_widget('label').set_text(infos['instructions']) - self.entries = {} - self.draw_table() + self.data_form_widget = FakeDataForm(infos) + table = self.xml.get_widget('table') + table.attach(self.data_form_widget, 0, 2, 0, 1) self.xml.signal_autoconnect(self) self.window.show_all() @@ -2121,52 +2163,22 @@ def on_cancel_button_clicked(self, widget): self.window.destroy() - def draw_table(self): - '''Draw the table in the window''' - nbrow = 0 - table = self.xml.get_widget('table') - for name in self.infos.keys(): - if name in ('key', 'instructions', 'x', 'registered'): - continue - if not name: - continue - - nbrow = nbrow + 1 - table.resize(rows = nbrow, columns = 2) - label = gtk.Label(name.capitalize() + ':') - table.attach(label, 0, 1, nbrow - 1, nbrow, 0, 0, 0, 0) - entry = gtk.Entry() - entry.set_activates_default(True) - if self.infos[name]: - entry.set_text(self.infos[name]) - if name == 'password': - entry.set_visibility(False) - table.attach(entry, 1, 2, nbrow - 1, nbrow, 0, 0, 0, 0) - self.entries[name] = entry - if nbrow == 1: - entry.grab_focus() - table.show_all() - def on_ok_button_clicked(self, widget): + # send registration info to the core if self.is_form: form = self.data_form_widget.data_form gajim.connections[self.account].register_agent(self.service, form, True) # True is for is_form else: - # we pressed OK of service_registration_window - # send registration info to the core - for name in self.entries.keys(): - self.infos[name] = self.entries[name].get_text().decode('utf-8') - if self.infos.has_key('instructions'): - del self.infos['instructions'] - if self.infos.has_key('registered'): - del self.infos['registered'] - gajim.connections[self.account].register_agent(self.service, - self.infos) - + infos = self.data_form_widget.get_infos() + if infos.has_key('instructions'): + del infos['instructions'] + if infos.has_key('registered'): + del infos['registered'] + gajim.connections[self.account].register_agent(self.service, infos) + self.window.destroy() - class GroupchatConfigWindow: '''GroupchatConfigWindow class''' def __init__(self, account, room_jid, form = None):

1 0

[commit-gajim] r8172 - trunk/src
by asterix＠gajim.org 22 May '07

22 May '07

Author: asterix Date: 2007-05-22 18:09:14 +0200 (Tue, 22 May 2007) New Revision: 8172 Modified: trunk/src/config.py Log: no need to do a else when there is a return at the end of the if. Unindent some code Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-05-22 14:26:08 UTC (rev 8171) +++ trunk/src/config.py 2007-05-22 16:09:14 UTC (rev 8172) @@ -2868,81 +2868,79 @@ self.back_button.set_sensitive(True) return - else: - widgets = self.get_widgets() - username = widgets['username_entry'].get_text().decode('utf-8') - if not username: - pritext = _('Invalid username') - sectext = _('You must provide a username to configure this account' - '.') - dialogs.ErrorDialog(pritext, sectext) + widgets = self.get_widgets() + username = widgets['username_entry'].get_text().decode('utf-8') + if not username: + pritext = _('Invalid username') + sectext = _('You must provide a username to configure this account.') + dialogs.ErrorDialog(pritext, sectext) + return + server = widgets['server_comboboxentry'].child.get_text().decode('utf-8') + savepass = widgets['save_password_checkbutton'].get_active() + password = widgets['pass1_entry'].get_text().decode('utf-8') + + if not self.modify: + if password == '': + dialogs.ErrorDialog(_('Invalid password'), + _('You must enter a password for the new account.')) return - server = widgets['server_comboboxentry'].child.get_text().decode('utf-8') - savepass = widgets['save_password_checkbutton'].get_active() - password = widgets['pass1_entry'].get_text().decode('utf-8') - if not self.modify: - if password == '': - dialogs.ErrorDialog(_('Invalid password'), - _('You must enter a password for the new account.')) - return - - if widgets['pass2_entry'].get_text() != password: - dialogs.ErrorDialog(_('Passwords do not match'), - _('The passwords typed in both fields must be identical.')) - return - - jid = username + '@' + server - # check if jid is conform to RFC and stringprep it - try: - jid = helpers.parse_jid(jid) - except helpers.InvalidFormat, s: - pritext = _('Invalid Jabber ID') - dialogs.ErrorDialog(pritext, str(s)) + if widgets['pass2_entry'].get_text() != password: + dialogs.ErrorDialog(_('Passwords do not match'), + _('The passwords typed in both fields must be identical.')) return - already_in_jids = [] - for account in gajim.connections: - j = gajim.config.get_per('accounts', account, 'name') - j += '@' + gajim.config.get_per('accounts', account, 'hostname') - already_in_jids.append(j) + jid = username + '@' + server + # check if jid is conform to RFC and stringprep it + try: + jid = helpers.parse_jid(jid) + except helpers.InvalidFormat, s: + pritext = _('Invalid Jabber ID') + dialogs.ErrorDialog(pritext, str(s)) + return - if jid in already_in_jids: - pritext = _('Duplicate Jabber ID') - sectext = _('This account is already configured in Gajim.') - dialogs.ErrorDialog(pritext, sectext) - return + already_in_jids = [] + for account in gajim.connections: + j = gajim.config.get_per('accounts', account, 'name') + j += '@' + gajim.config.get_per('accounts', account, 'hostname') + already_in_jids.append(j) - self.account = server - i = 1 - while self.account in gajim.connections: - self.account = server + str(i) - i += 1 + if jid in already_in_jids: + pritext = _('Duplicate Jabber ID') + sectext = _('This account is already configured in Gajim.') + dialogs.ErrorDialog(pritext, sectext) + return - username, server = gajim.get_name_and_server_from_jid(jid) - self.save_account(username, server, savepass, password) - self.cancel_button.hide() - self.back_button.hide() - self.forward_button.hide() - if self.modify: - finish_text = '<big><b>%s</b></big>\n\n%s' % ( - _('Account has been added successfully'), - _('You can set advanced account options by pressing the ' - 'Advanced button, or later by choosing the Accounts menuitem ' + self.account = server + i = 1 + while self.account in gajim.connections: + self.account = server + str(i) + i += 1 + + username, server = gajim.get_name_and_server_from_jid(jid) + self.save_account(username, server, savepass, password) + self.cancel_button.hide() + self.back_button.hide() + self.forward_button.hide() + if self.modify: + finish_text = '<big><b>%s</b></big>\n\n%s' % ( + _('Account has been added successfully'), + _('You can set advanced account options by pressing the ' + 'Advanced button, or later by choosing the Accounts menuitem ' 'under the Edit menu from the main window.')) - self.finish_label.set_markup(finish_text) - self.finish_button.show() - self.finish_button.set_property('has-default', True) - self.advanced_button.show() - self.go_online_checkbutton.show() - img = self.xml.get_widget('finish_image') - img.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_DIALOG) - self.notebook.set_current_page(3) # show finish page - self.show_vcard_checkbutton.set_active(False) - else: - self.notebook.set_current_page(2) # show creating page - self.update_progressbar_timeout_id = gobject.timeout_add(100, - self.update_progressbar) + self.finish_label.set_markup(finish_text) + self.finish_button.show() + self.finish_button.set_property('has-default', True) + self.advanced_button.show() + self.go_online_checkbutton.show() + img = self.xml.get_widget('finish_image') + img.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_DIALOG) + self.notebook.set_current_page(3) # show finish page + self.show_vcard_checkbutton.set_active(False) + else: + self.notebook.set_current_page(2) # show creating page + self.update_progressbar_timeout_id = gobject.timeout_add(100, + self.update_progressbar) def update_progressbar(self): self.progressbar.pulse()

1 0

[commit-gajim] r8171 - trunk/src
by asterix＠gajim.org 22 May '07

22 May '07

Author: asterix Date: 2007-05-22 16:26:08 +0200 (Tue, 22 May 2007) New Revision: 8171 Modified: trunk/src/roster_window.py Log: don't print awn error to console Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-05-21 21:39:58 UTC (rev 8170) +++ trunk/src/roster_window.py 2007-05-22 14:26:08 UTC (rev 8171) @@ -3387,7 +3387,6 @@ awn = dbus.Interface(obj, 'com.google.code.Awn') awn.SetTaskIconByName('Gajim', os.path.abspath(path)) except Exception, e: - gajim.log.debug(str(e)) pass def _music_track_changed(self, unused_listener, music_track_info):

1 0

[commit-gajim] r8170 - trunk/src
by roidelapluie＠gajim.org 21 May '07

21 May '07

Author: roidelapluie Date: 2007-05-21 23:39:58 +0200 (Mon, 21 May 2007) New Revision: 8170 Modified: trunk/src/groupchat_control.py Log: Improve coding of [1869]. --Cette ligne, et les suivantes ci-dessous, seront ignor?\195?\169es-- M src/groupchat_control.py Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-05-21 21:33:48 UTC (rev 8169) +++ trunk/src/groupchat_control.py 2007-05-21 21:39:58 UTC (rev 8170) @@ -669,11 +669,11 @@ other_tags_for_name, [], other_tags_for_text, xhtml = xhtml) def get_nb_unread(self): + type_events = ['printed_marked_gc_msg'] + if gajim.config.get('notify_on_all_muc_messages'): + type_events.append('printed_gc_msg') nb = len(gajim.events.get_events(self.account, self.room_jid, - ['printed_marked_gc_msg'])) - if gajim.config.get('notify_on_all_muc_messages'): - nb += len(gajim.events.get_events(self.account, self.room_jid, - ['printed_gc_msg'])) + type_events)) nb += self.get_nb_unread_pm() return nb

1 0

[commit-gajim] r8169 - trunk/src
by roidelapluie＠gajim.org 21 May '07

21 May '07

Author: roidelapluie Date: 2007-05-21 23:33:48 +0200 (Mon, 21 May 2007) New Revision: 8169 Modified: trunk/src/groupchat_control.py Log: Improve [8168]: correct window title and print number of marked messages in tabs. Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-05-21 19:43:33 UTC (rev 8168) +++ trunk/src/groupchat_control.py 2007-05-21 21:33:48 UTC (rev 8169) @@ -409,14 +409,13 @@ label_str = self.name # count waiting highlighted messages - if gajim.config.get('notify_on_all_muc_messages'): - unread = '' - num_unread = self.get_nb_unread() - if num_unread == 1: - unread = '*' - elif num_unread > 1: - unread = '[' + unicode(num_unread) + ']' - label_str = unread + label_str + unread = '' + num_unread = self.get_nb_unread() + if num_unread == 1: + unread = '*' + elif num_unread > 1: + unread = '[' + unicode(num_unread) + ']' + label_str = unread + label_str return (label_str, color) def get_tab_image(self): @@ -671,7 +670,10 @@ def get_nb_unread(self): nb = len(gajim.events.get_events(self.account, self.room_jid, - ['printed_gc_msg', 'printed_marked_gc_msg'])) + ['printed_marked_gc_msg'])) + if gajim.config.get('notify_on_all_muc_messages'): + nb += len(gajim.events.get_events(self.account, self.room_jid, + ['printed_gc_msg'])) nb += self.get_nb_unread_pm() return nb

1 0

[commit-gajim] r8168 - trunk/src
by roidelapluie＠gajim.org 21 May '07

21 May '07

Author: roidelapluie Date: 2007-05-21 21:43:33 +0200 (Mon, 21 May 2007) New Revision: 8168 Modified: trunk/src/groupchat_control.py Log: Do not count gc messages in tabs if notify_on_all_muc_messages is false. Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-05-21 17:41:31 UTC (rev 8167) +++ trunk/src/groupchat_control.py 2007-05-21 19:43:33 UTC (rev 8168) @@ -409,13 +409,14 @@ label_str = self.name # count waiting highlighted messages - unread = '' - num_unread = self.get_nb_unread() - if num_unread == 1: - unread = '*' - elif num_unread > 1: - unread = '[' + unicode(num_unread) + ']' - label_str = unread + label_str + if gajim.config.get('notify_on_all_muc_messages'): + unread = '' + num_unread = self.get_nb_unread() + if num_unread == 1: + unread = '*' + elif num_unread > 1: + unread = '[' + unicode(num_unread) + ']' + label_str = unread + label_str return (label_str, color) def get_tab_image(self):

1 0

[commit-gajim] r8167 - trunk/src
by asterix＠gajim.org 21 May '07

21 May '07

Author: asterix Date: 2007-05-21 19:41:31 +0200 (Mon, 21 May 2007) New Revision: 8167 Modified: trunk/src/gajim.py Log: fix missing argument to handle_event_gc_notify function. Thanks sgala Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-05-20 16:34:34 UTC (rev 8166) +++ trunk/src/gajim.py 2007-05-21 17:41:31 UTC (rev 8167) @@ -660,7 +660,7 @@ # remove in 2007 # It's maybe a GC_NOTIFY (specialy for MSN gc) self.handle_event_gc_notify(account, (jid, array[1], status_message, - array[3], None, None, None, None, None, None, None)) + array[3], None, None, None, None, None, None, None, None)) def handle_event_msg(self, account, array):

1 0

[commit-gajim] r8166 - www-website/imgs
by asterix＠gajim.org 20 May '07

20 May '07

Author: asterix Date: 2007-05-20 18:34:34 +0200 (Sun, 20 May 2007) New Revision: 8166 Modified: www-website/imgs/gajim_roster_4index.png Log: nicer index page image Modified: www-website/imgs/gajim_roster_4index.png =================================================================== (Binary files differ)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2007