Commits July 2006

commits@gajim.org

5 participants
109 discussions

[commit-gajim] r6633 - trunk/src
by asterix＠gajim.org 31 Jul '06

31 Jul '06

Author: asterix Date: 2006-07-31 22:52:28 +0200 (Mon, 31 Jul 2006) New Revision: 6633 Modified: trunk/src/chat_control.py Log: Show "%nick from room %room" in pm banner. Fixes #2197 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2006-07-31 20:27:06 UTC (rev 6632) +++ trunk/src/chat_control.py 2006-07-31 20:52:28 UTC (rev 6633) @@ -901,6 +901,11 @@ if self.resource: name += '/' + self.resource avoid_showing_account_too = True + if self.TYPE_ID == message_control.TYPE_PM: + room_jid = self.contact.jid.split('/')[0] + room_ctrl = gajim.interface.msg_win_mgr.get_control(room_jid, + self.account) + name = _('%s from room %s') % (name, room_ctrl.name) name = gtkgui_helpers.escape_for_pango_markup(name) # We know our contacts nick, but if there are any other controls

1 0

[commit-gajim] r6632 - trunk/src/common
by asterix＠gajim.org 31 Jul '06

31 Jul '06

Author: asterix Date: 2006-07-31 22:27:06 +0200 (Mon, 31 Jul 2006) New Revision: 6632 Modified: trunk/src/common/connection.py trunk/src/common/connection_handlers.py Log: when we get an error (when we asked meta contact) don't except the server to include the sent request as it's only a SHOULD in RFC3390 9.2.3.7. detect the answer by iq id instead. Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2006-07-31 17:08:21 UTC (rev 6631) +++ trunk/src/common/connection.py 2006-07-31 20:27:06 UTC (rev 6632) @@ -936,6 +936,9 @@ iq = common.xmpp.Iq(typ='get') iq2 = iq.addChild(name='query', namespace='jabber:iq:private') iq2.addChild(name='storage', namespace='storage:metacontacts') + id = self.connection.getAnID() + iq.setID(id) + self.awaiting_answers[id] = (METACONTACTS_ARRIVED, ) self.connection.send(iq) def store_metacontacts(self, tags_list): Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2006-07-31 17:08:21 UTC (rev 6631) +++ trunk/src/common/connection_handlers.py 2006-07-31 20:27:06 UTC (rev 6632) @@ -39,6 +39,7 @@ VCARD_PUBLISHED = 'vcard_published' VCARD_ARRIVED = 'vcard_arrived' AGENT_REMOVED = 'agent_removed' +METACONTACTS_ARRIVED = 'metacontacts_arrived' HAS_IDLE = True try: import common.idle as idle # when we launch gajim from sources @@ -970,6 +971,29 @@ elif self.awaiting_answers[id][0] == AGENT_REMOVED: jid = self.awaiting_answers[id][1] self.dispatch('AGENT_REMOVED', jid) + elif self.awaiting_answers[id][0] == METACONTACTS_ARRIVED: + if iq_obj.getType() == 'result': + # Metacontact tags + # http://www.jabber.org/jeps/jep-XXXX.html + meta_list = {} + query = iq_obj.getTag('query') + storage = query.getTag('storage') + metas = storage.getTags('meta') + for meta in metas: + jid = meta.getAttr('jid') + tag = meta.getAttr('tag') + data = {'jid': jid} + order = meta.getAttr('order') + if order != None: + data['order'] = order + if meta_list.has_key(tag): + meta_list[tag].append(data) + else: + meta_list[tag] = [data] + self.dispatch('METACONTACTS', meta_list) + # We can now continue connection by requesting the roster + self.connection.initRoster() + del self.awaiting_answers[id] def _vCardCB(self, con, vc): @@ -1135,26 +1159,6 @@ self.bookmarks.append(bm) self.dispatch('BOOKMARKS', self.bookmarks) - elif ns == 'storage:metacontacts': - # Metacontact tags - # http://www.jabber.org/jeps/jep-XXXX.html - meta_list = {} - metas = storage.getTags('meta') - for meta in metas: - jid = meta.getAttr('jid') - tag = meta.getAttr('tag') - data = {'jid': jid} - order = meta.getAttr('order') - if order != None: - data['order'] = order - if meta_list.has_key(tag): - meta_list[tag].append(data) - else: - meta_list[tag] = [data] - self.dispatch('METACONTACTS', meta_list) - # We can now continue connection by requesting the roster - self.connection.initRoster() - elif ns == 'gajim:prefs': # Preferences data # http://www.jabber.org/jeps/jep-0049.html @@ -1847,8 +1851,6 @@ common.xmpp.NS_ROSTER) con.RegisterHandler('iq', self._PrivateCB, 'result', common.xmpp.NS_PRIVATE) - con.RegisterHandler('iq', self._PrivateErrorCB, 'error', - common.xmpp.NS_PRIVATE) con.RegisterHandler('iq', self._HttpAuthCB, 'get', common.xmpp.NS_HTTP_AUTH) con.RegisterHandler('iq', self._gMailNewMailCB, 'set',

1 0

[commit-gajim] r6631 - in trunk: data/glade src src/common
by asterix＠gajim.org 31 Jul '06

31 Jul '06

Author: asterix Date: 2006-07-31 19:08:21 +0200 (Mon, 31 Jul 2006) New Revision: 6631 Modified: trunk/data/glade/add_new_contact_window.glade trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/dialogs.py trunk/src/gajim.py Log: we can now register to a transport in add contact window is server has such a transport. Fixes #1944 Modified: trunk/data/glade/add_new_contact_window.glade =================================================================== --- trunk/data/glade/add_new_contact_window.glade 2006-07-31 15:06:00 UTC (rev 6630) +++ trunk/data/glade/add_new_contact_window.glade 2006-07-31 17:08:21 UTC (rev 6631) @@ -19,6 +19,7 @@ <property name="focus_on_map">True</property> <property name="urgency_hint">False</property> <signal name="key_press_event" handler="on_add_new_contact_window_key_press_event" last_modification_time="Thu, 28 Apr 2005 12:59:51 GMT"/> + <signal name="destroy" handler="on_add_new_contact_window_destroy" last_modification_time="Mon, 31 Jul 2006 16:45:22 GMT"/> <child> <widget class="GtkVBox" id="vbox8"> Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2006-07-31 15:06:00 UTC (rev 6630) +++ trunk/src/common/connection.py 2006-07-31 17:08:21 UTC (rev 6631) @@ -85,6 +85,8 @@ self.retrycount = 0 self.jids_for_auto_auth = [] # list of jid to auto-authorize self.muc_jid = None + self.available_transports = {} # list of available transports on this + # server {'icq': 'icq.server.com', } self.vcard_supported = True # END __init__ Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2006-07-31 15:06:00 UTC (rev 6630) +++ trunk/src/common/connection_handlers.py 2006-07-31 17:08:21 UTC (rev 6631) @@ -755,6 +755,8 @@ gajim.proxy65_manager.resolve(jid, self.connection, self.name) if features.__contains__(common.xmpp.NS_MUC) and is_muc: self.muc_jid = jid + if transport_type: + self.available_transports[transport_type] = jid self.dispatch('AGENT_INFO_INFO', (jid, node, identities, features, data)) Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-07-31 15:06:00 UTC (rev 6630) +++ trunk/src/dialogs.py 2006-07-31 17:08:21 UTC (rev 6631) @@ -413,6 +413,15 @@ self.account = account else: accounts = [self.account] + if self.account: + location = gajim.interface.instances[self.account] + else: + location = gajim.interface.instances + if location.has_key('add_contact'): + location['add_contact'].window.present() + # An instance is already opened + return + location['add_contact'] = self self.xml = gtkgui_helpers.get_glade('add_new_contact_window.glade') self.account_combobox = self.xml.get_widget('account_combobox') self.account_hbox = self.xml.get_widget('account_hbox') @@ -450,7 +459,11 @@ widget = self.xml.get_widget(type_ + '_register_form') widget.set_no_show_all(True) widget.hide() - #TODO: make button sensitive if we can register and add callback + if type_ in gajim.connections[self.account].available_transports: + widget = self.xml.get_widget(type_ + '_register_button') + widget.set_sensitive(True) + widget.connect('clicked', self.on_register_button_clicked, + gajim.connections[self.account].available_transports[type_]) if jid: type_ = gajim.get_transport_name_from_jid(jid) @@ -489,6 +502,16 @@ self.xml.signal_autoconnect(self) self.window.show_all() + def on_add_new_contact_window_destroy(self, widget): + if self.account: + location = gajim.interface.instances[self.account] + else: + location = gajim.interface.instances + del location['add_contact'] + + def on_register_button_clicked(self, widget, jid): + gajim.connections[self.account].request_register_agent_info(jid) + def on_add_new_contact_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: # ESCAPE self.window.destroy() @@ -558,6 +581,22 @@ group = group, pseudo = nickname, auto_auth = auto_auth) self.window.destroy() + def transport_signed_in(self, jid): + type_ = gajim.get_transport_name_from_jid(jid) + self.xml.get_widget(type_ + '_register_button').hide() + self.agents[type_] = jid + widget = self.xml.get_widget(type_ + '_register_form') + widget.set_no_show_all(False) + widget.show_all() + + def transport_signed_out(self, jid): + type_ = gajim.get_transport_name_from_jid(jid) + widget = self.xml.get_widget(type_ + '_register_button') + widget.set_no_show_all(False) + widget.show_all() + del self.agents[type_] + self.xml.get_widget(type_ + '_register_form').hide() + class AboutDialog: '''Class for about dialog''' def __init__(self): Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2006-07-31 15:06:00 UTC (rev 6630) +++ trunk/src/gajim.py 2006-07-31 17:08:21 UTC (rev 6631) @@ -439,6 +439,15 @@ gajim.block_signed_in_notifications[account_ji] = True gobject.timeout_add(30000, self.unblock_signed_in_notifications, account_ji) + locations = (self.instances, self.instances[account]) + for location in locations: + if location.has_key('add_contact'): + if old_show == 0 and new_show > 1: + location['add_contact'].transport_signed_in(jid) + break + elif old_show > 1 and new_show == 0: + location['add_contact'].transport_signed_out(jid) + break elif ji in jid_list: # It isn't an agent # reset chatstate if needed:

1 0

[commit-gajim] r6630 - trunk/src
by asterix＠gajim.org 31 Jul '06

31 Jul '06

Author: asterix Date: 2006-07-31 17:06:00 +0200 (Mon, 31 Jul 2006) New Revision: 6630 Modified: trunk/src/dialogs.py Log: remove a useless print Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-07-31 15:05:29 UTC (rev 6629) +++ trunk/src/dialogs.py 2006-07-31 15:06:00 UTC (rev 6630) @@ -2291,7 +2291,6 @@ # event value = gajim.config.get_per('notifications', str(self.active_num), 'event') - print value if value: self.event_combobox.set_active(self.events_list.index(value)) else:

1 0

[commit-gajim] r6629 - trunk/src
by asterix＠gajim.org 31 Jul '06

31 Jul '06

Author: asterix Date: 2006-07-31 17:05:29 +0200 (Mon, 31 Jul 2006) New Revision: 6629 Modified: trunk/src/dialogs.py Log: remove some FIXME Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-07-31 14:36:49 UTC (rev 6628) +++ trunk/src/dialogs.py 2006-07-31 15:05:29 UTC (rev 6629) @@ -2273,8 +2273,6 @@ # No rule selected at init time self.conditions_treeview.get_selection().unselect_all() - #TODO -# self.conditions_treeview.set_cursor(None) self.active_num = -1 self.config_vbox.set_sensitive(False) self.delete_button.set_sensitive(False) @@ -2293,11 +2291,11 @@ # event value = gajim.config.get_per('notifications', str(self.active_num), 'event') + print value if value: self.event_combobox.set_active(self.events_list.index(value)) else: - #TODO: unselect all - pass + self.event_combobox.set_active(-1) # recipient_type value = gajim.config.get_per('notifications', str(self.active_num), 'recipient_type') @@ -2305,8 +2303,7 @@ self.recipient_type_combobox.set_active( self.recipient_types_list.index(value)) else: - #TODO: unselect all - pass + self.recipient_type_combobox.set_active(-1) # recipient value = gajim.config.get_per('notifications', str(self.active_num), 'recipients') @@ -2476,7 +2473,11 @@ def on_event_combobox_changed(self, widget): if self.active_num < 0: return - event = self.events_list[self.event_combobox.get_active()] + active = self.event_combobox.get_active() + if active == -1: + event = '' + else: + event = self.events_list[active] gajim.config.set_per('notifications', str(self.active_num), 'event', event) self.set_treeview_string()

1 0

[commit-gajim] r6628 - trunk/src
by asterix＠gajim.org 31 Jul '06

31 Jul '06

Author: asterix Date: 2006-07-31 16:36:49 +0200 (Mon, 31 Jul 2006) New Revision: 6628 Modified: trunk/src/dialogs.py Log: better string Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-07-31 13:55:21 UTC (rev 6627) +++ trunk/src/dialogs.py 2006-07-31 14:36:49 UTC (rev 6628) @@ -1372,8 +1372,7 @@ def prepare_widgets_for(self, action): if len(gajim.connections) > 1: - #FIXME: for Received with should become 'in' - title = _('Single Message with account %s') % self.account + title = _('Single Message in account %s') % self.account else: title = _('Single Message')

1 0

[commit-gajim] r6627 - in trunk/src: . common
by asterix＠gajim.org 31 Jul '06

31 Jul '06

Author: asterix Date: 2006-07-31 15:55:21 +0200 (Mon, 31 Jul 2006) New Revision: 6627 Modified: trunk/src/chat_control.py trunk/src/common/config.py trunk/src/dialogs.py Log: we can now the language we want for speller. Just use speller_language advanced option to define it. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2006-07-31 13:32:40 UTC (rev 6626) +++ trunk/src/chat_control.py 2006-07-31 13:55:21 UTC (rev 6627) @@ -157,7 +157,10 @@ # Attach speller if gajim.config.get('use_speller') and HAS_GTK_SPELL: try: - gtkspell.Spell(self.msg_textview) + spell = gtkspell.Spell(self.msg_textview) + lang = gajim.config.get('speller_language') + if lang: + spell.set_language(lang) except gobject.GError, msg: #FIXME: add a ui for this use spell.set_language() dialogs.ErrorDialog(unicode(msg), _('If that is not your language ' Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2006-07-31 13:32:40 UTC (rev 6626) +++ trunk/src/common/config.py 2006-07-31 13:55:21 UTC (rev 6627) @@ -80,6 +80,7 @@ 'mergeaccounts': [ opt_bool, False, '', True ], 'sort_by_show': [ opt_bool, True, '', True ], 'use_speller': [ opt_bool, False, ], + 'speller_language': [ opt_str, '', _('Language used by speller')], 'print_time': [ opt_str, 'always', _('\'always\' - print time for every message.\n\'sometimes\' - print time every print_ichat_every_foo_minutes minute.\n\'never\' - never print time.')], 'print_time_fuzzy': [ opt_int, 0, _('Value of fuzziness from 1 to 4 or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one.') ], 'emoticons_theme': [opt_str, 'static', '', True ], Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-07-31 13:32:40 UTC (rev 6626) +++ trunk/src/dialogs.py 2006-07-31 13:55:21 UTC (rev 6627) @@ -1298,10 +1298,13 @@ if gajim.config.get('use_speller') and HAS_GTK_SPELL and action == 'send': try: - gtkspell.Spell(self.conversation_textview.tv) - gtkspell.Spell(self.message_textview) + spell1 = gtkspell.Spell(self.conversation_textview.tv) + spell2 = gtkspell.Spell(self.message_textview) + lang = gajim.config.get('speller_language') + if lang: + spell1.set_language(lang) + spell2.set_language(lang) except gobject.GError, msg: - #FIXME: add a ui for this use spell.set_language() ErrorDialog(unicode(msg), _('If that is not your language for which you want to highlight misspelled words, then please set your $LANG as appropriate. Eg. for French do export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it global in /etc/profile.\n\nHighlighting misspelled words feature will not be used')) gajim.config.set('use_speller', False)

1 0

[commit-gajim] r6626 - in trunk: data/glade src
by asterix＠gajim.org 31 Jul '06

31 Jul '06

Author: asterix Date: 2006-07-31 15:32:40 +0200 (Mon, 31 Jul 2006) New Revision: 6626 Modified: trunk/data/glade/add_new_contact_window.glade trunk/src/dialogs.py Log: new add contact window. TODO: enable the register button when our server have this transport. Fixes #872 Modified: trunk/data/glade/add_new_contact_window.glade =================================================================== --- trunk/data/glade/add_new_contact_window.glade 2006-07-31 13:25:30 UTC (rev 6625) +++ trunk/data/glade/add_new_contact_window.glade 2006-07-31 13:32:40 UTC (rev 6626) @@ -17,6 +17,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> <signal name="key_press_event" handler="on_add_new_contact_window_key_press_event" last_modification_time="Thu, 28 Apr 2005 12:59:51 GMT"/> <child> @@ -51,55 +52,45 @@ </child> <child> - <widget class="GtkTable" id="table21"> + <widget class="GtkTable" id="table22"> <property name="border_width">6</property> <property name="visible">True</property> - <property name="n_rows">7</property> + <property name="n_rows">4</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> - <widget class="GtkCheckButton" id="auto_authorize_checkbutton"> + <widget class="GtkLabel" id="label227"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">A_llow this contact to view my status</property> + <property name="label" translatable="yes">_Nickname:</property> <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">nickname_entry</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="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkComboBoxEntry" id="group_comboboxentry"> - <property name="visible">True</property> - <property name="items" translatable="yes"></property> - <property name="add_tearoffs">False</property> - <property name="has_frame">True</property> - <property name="focus_on_click">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">fill</property> - </packing> - </child> - - <child> <widget class="GtkEntry" id="nickname_entry"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -114,36 +105,15 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="jid_entry"> + <widget class="GtkLabel" id="label228"> <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="editable">False</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label223"> - <property name="visible">True</property> <property name="label" translatable="yes">_Group:</property> <property name="use_underline">True</property> <property name="use_markup">False</property> @@ -162,18 +132,40 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label188"> + <widget class="GtkCheckButton" id="auto_authorize_checkbutton"> <property name="visible">True</property> - <property name="label" translatable="yes">_Nickname:</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">A_llow this contact to view my status</property> <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">True</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="account_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Account:</property> + <property name="use_underline">True</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> @@ -182,7 +174,6 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">nickname_entry</property> <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> <property name="width_chars">-1</property> <property name="single_line_mode">False</property> @@ -191,23 +182,194 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label187"> + <widget class="GtkHBox" id="account_hbox"> <property name="visible">True</property> - <property name="label" translatable="yes">_Jabber ID:</property> - <property name="use_underline">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkComboBox" id="account_combobox"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkComboBoxEntry" id="group_comboboxentry"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="has_frame">True</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkNotebook" id="transports_notebook"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="show_tabs">True</property> + <property name="show_border">True</property> + <property name="tab_pos">GTK_POS_TOP</property> + <property name="scrollable">False</property> + <property name="enable_popup">False</property> + + <child> + <widget class="GtkTable" id="table21"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + + <child> + <widget class="GtkLabel" id="label187"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Jabber ID:</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <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="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="jabber_entry"> + <property name="visible">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow6"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <widget class="GtkTextView" id="jabber_message_textview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="overwrite">False</property> + <property name="accepts_tab">True</property> + <property name="justification">GTK_JUSTIFY_LEFT</property> + <property name="wrap_mode">GTK_WRAP_WORD</property> + <property name="cursor_visible">True</property> + <property name="pixels_above_lines">0</property> + <property name="pixels_below_lines">0</property> + <property name="pixels_inside_wrap">0</property> + <property name="left_margin">0</property> + <property name="right_margin">0</property> + <property name="indent">0</property> + <property name="text" translatable="yes">I would like to add you to my contact list.</property> + </widget> + </child> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + </packing> + </child> + </widget> + <packing> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label223"> + <property name="visible">True</property> + <property name="label" translatable="yes">Jabber</property> + <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">0</property> + <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> @@ -217,25 +379,111 @@ <property name="angle">0</property> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkLabel" id="account_label"> + <widget class="GtkVBox" id="vbox9"> + <property name="border_width">6</property> <property name="visible">True</property> - <property name="label" translatable="yes">_Account:</property> - <property name="use_underline">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkButton" id="aim_register_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Register</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="aim_register_form"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkLabel" id="label238"> + <property name="visible">True</property> + <property name="label" translatable="yes">AIM Address:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</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">0</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">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="aim_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label235"> + <property name="visible">True</property> + <property name="label" translatable="yes">AIM</property> + <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">0</property> + <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> @@ -245,106 +493,253 @@ <property name="angle">0</property> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkEntry" id="uid_entry"> + <widget class="GtkVBox" id="vbox10"> + <property name="border_width">6</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">True</property> - <signal name="changed" handler="on_uid_entry_changed" last_modification_time="Mon, 28 Feb 2005 23:05:24 GMT"/> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkButton" id="gadu-gadu_register_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Register</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="gadu-gadu_register_form"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkLabel" id="label239"> + <property name="visible">True</property> + <property name="label" translatable="yes">Gadu Gadu Number:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</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">0</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">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="gadu-gadu_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <placeholder/> + </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> </packing> </child> <child> - <widget class="GtkLabel" id="label185"> + <widget class="GtkLabel" id="label232"> <property name="visible">True</property> - <property name="label" translatable="yes">_User ID:</property> - <property name="use_underline">True</property> + <property name="label" translatable="yes">Gadu Gadu</property> + <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">0</property> + <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">uid_entry</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="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkLabel" id="protocol_label"> + <widget class="GtkVBox" id="vbox11"> + <property name="border_width">6</property> <property name="visible">True</property> - <property name="label" translatable="yes">_Protocol:</property> - <property name="use_underline">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkButton" id="icq_register_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Register</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="icq_register_form"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkLabel" id="label240"> + <property name="visible">True</property> + <property name="label" translatable="yes">ICQ Number:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</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">0</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">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="icq_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label225"> + <property name="visible">True</property> + <property name="label" translatable="yes">ICQ</property> + <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">0</property> + <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">uid_entry</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="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkHBox" id="account_hbox"> + <widget class="GtkVBox" id="vbox12"> + <property name="border_width">6</property> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="spacing">6</property> <child> - <widget class="GtkComboBox" id="account_combobox"> + <widget class="GtkButton" id="msn_register_button"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> - <property name="add_tearoffs">False</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Register</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> </widget> <packing> @@ -355,32 +750,111 @@ </child> <child> + <widget class="GtkHBox" id="msn_register_form"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkLabel" id="label241"> + <property name="visible">True</property> + <property name="label" translatable="yes">MSN Address:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</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">0</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">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="msn_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> <placeholder/> </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> </packing> </child> <child> - <widget class="GtkHBox" id="protocol_hbox"> + <widget class="GtkLabel" id="label224"> <property name="visible">True</property> + <property name="label" translatable="yes">MSN</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</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">0</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="type">tab</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox13"> + <property name="border_width">6</property> + <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="spacing">6</property> <child> - <widget class="GtkComboBox" id="protocol_combobox"> + <widget class="GtkButton" id="yahoo_register_button"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> - <property name="add_tearoffs">False</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Register</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="changed" handler="on_protocol_combobox_changed" last_modification_time="Wed, 23 Mar 2005 13:13:12 GMT"/> </widget> <packing> <property name="padding">0</property> @@ -390,59 +864,98 @@ </child> <child> + <widget class="GtkHBox" id="yahoo_register_form"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkLabel" id="label242"> + <property name="visible">True</property> + <property name="label" translatable="yes">Yahoo Address:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</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">0</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">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="yahoo_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> <placeholder/> </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> </packing> </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow6"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - <child> - <widget class="GtkTextView" id="message_textview"> + <widget class="GtkLabel" id="label231"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="overwrite">False</property> - <property name="accepts_tab">True</property> - <property name="justification">GTK_JUSTIFY_LEFT</property> - <property name="wrap_mode">GTK_WRAP_WORD</property> - <property name="cursor_visible">True</property> - <property name="pixels_above_lines">0</property> - <property name="pixels_below_lines">0</property> - <property name="pixels_inside_wrap">0</property> - <property name="left_margin">0</property> - <property name="right_margin">0</property> - <property name="indent">0</property> - <property name="text" translatable="yes">I would like to add you to my contact list.</property> + <property name="label" translatable="yes">Yahoo!</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</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">0</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="type">tab</property> + </packing> </child> </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> </packing> </child> @@ -463,7 +976,7 @@ <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Mon, 28 Feb 2005 22:46:06 GMT"/> + <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Sun, 30 Jul 2006 20:11:14 GMT"/> </widget> </child> @@ -471,14 +984,13 @@ <widget class="GtkButton" id="subscribe_button"> <property name="visible">True</property> <property name="can_default">True</property> - <property name="has_default">True</property> <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_subscribe_button_clicked" last_modification_time="Mon, 28 Feb 2005 22:46:16 GMT"/> + <signal name="clicked" handler="on_subscribe_button_clicked" last_modification_time="Sun, 30 Jul 2006 20:11:09 GMT"/> <child> - <widget class="GtkAlignment" id="alignment39"> + <widget class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> @@ -490,13 +1002,13 @@ <property name="right_padding">0</property> <child> - <widget class="GtkHBox" id="hbox2915"> + <widget class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image280"> + <widget class="GtkImage" id="image1"> <property name="visible">True</property> <property name="stock">gtk-ok</property> <property name="icon_size">4</property> @@ -513,7 +1025,7 @@ </child> <child> - <widget class="GtkLabel" id="label192"> + <widget class="GtkLabel" id="label237"> <property name="visible">True</property> <property name="label" translatable="yes">_Subscribe</property> <property name="use_underline">True</property> @@ -545,8 +1057,8 @@ </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> </widget> Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-07-31 13:25:30 UTC (rev 6625) +++ trunk/src/dialogs.py 2006-07-31 13:32:40 UTC (rev 6626) @@ -395,6 +395,9 @@ class AddNewContactWindow: '''Class for AddNewContactWindow''' + tab_transport = {0: 'jabber', 1:'aim', 2:'gadu-gadu', 3:'icq', 4:'msn', + 5:'yahoo'} + tab_num = {'jabber':0, 'aim':1, 'gadu-gadu':2, 'icq':3, 'msn':4, 'yahoo':5} def __init__(self, account = None, jid = None, user_nick = None, group = None): self.account = account @@ -416,60 +419,47 @@ self.account_label = self.xml.get_widget('account_label') self.window = self.xml.get_widget('add_new_contact_window') self.window.set_transient_for(gajim.interface.roster.window) - self.uid_entry = self.xml.get_widget('uid_entry') - self.protocol_combobox = self.xml.get_widget('protocol_combobox') - self.protocol_hbox = self.xml.get_widget('protocol_hbox') - self.jid_entry = self.xml.get_widget('jid_entry') self.nickname_entry = self.xml.get_widget('nickname_entry') + self.transports_notebook = self.xml.get_widget('transports_notebook') if account and len(gajim.connections) >= 2: prompt_text =\ _('Please fill in the data of the contact you want to add in account %s') %account else: prompt_text = _('Please fill in the data of the contact you want to add') self.xml.get_widget('prompt_label').set_text(prompt_text) - self.old_uid_value = '' - liststore = gtk.ListStore(str, str) - liststore.append(['Jabber', '']) - self.agents = ['Jabber'] - jid_agents = [] + self.agents = {'jabber': ''} for acct in accounts: for j in gajim.contacts.get_jid_list(acct): contact = gajim.contacts.get_first_contact_from_jid(acct, j) - if _('Transports') in contact.groups and contact.show != 'offline' and\ - contact.show != 'error': - jid_agents.append(j) - for a in jid_agents: - if a.find('aim') > -1: - name = 'AIM' - elif a.find('icq') > -1: - name = 'ICQ' - elif a.find('msn') > -1: - name = 'MSN' - elif a.find('yahoo') > -1: - name = 'Yahoo!' - else: - name = a - liststore.append([name, a]) - self.agents.append(name) - self.protocol_combobox.set_model(liststore) - self.protocol_combobox.set_active(0) - self.fill_jid() + if _('Transports') in contact.groups and contact.show != 'offline' \ + and contact.show != 'error': + type_ = gajim.get_transport_name_from_jid(contact.jid) + if not type_ in self.tab_num: + # unknown transport type + continue + if type_ in self.agents: + # we already have it + continue + widget = self.xml.get_widget(type_ + '_register_button') + widget.set_no_show_all(True) + widget.hide() + self.agents[type_] = contact.jid + for type_ in self.tab_num: + if type_ in self.agents: + continue + widget = self.xml.get_widget(type_ + '_register_form') + widget.set_no_show_all(True) + widget.hide() + #TODO: make button sensitive if we can register and add callback + if jid: - self.jid_entry.set_text(jid) - self.uid_entry.set_sensitive(False) - jid_splited = jid.split('@') - if jid_splited[1] in jid_agents: - uid = jid_splited[0].replace('%', '@') - self.uid_entry.set_text(uid) - self.protocol_combobox.set_active(jid_agents.index(jid_splited[1])\ - + 1) - else: - self.uid_entry.set_text(jid) - self.protocol_combobox.set_active(0) + type_ = gajim.get_transport_name_from_jid(jid) + if not type_: + type_ = 'jabber' + self.xml.get_widget(type_ + '_entry').set_text(jid) + self.transports_notebook.set_active_tab(self.tab_num[type_]) if user_nick: self.nickname_entry.set_text(user_nick) - else: - self.set_nickname() self.nickname_entry.grab_focus() self.group_comboboxentry = self.xml.get_widget('group_comboboxentry') liststore = gtk.ListStore(str) @@ -485,18 +475,11 @@ self.group_comboboxentry.set_active(i) i += 1 - if not jid_agents: - # There are no transports, so hide the protocol combobox and label - self.protocol_hbox.hide() - self.protocol_hbox.set_no_show_all(True) - protocol_label = self.xml.get_widget('protocol_label') - protocol_label.hide() - protocol_label.set_no_show_all(True) if self.account: - self.account_label.hide() self.account_hbox.hide() - self.account_label.set_no_show_all(True) + self.account_label.hide() self.account_hbox.set_no_show_all(True) + self.account_label.set_no_show_all(True) else: liststore = gtk.ListStore(str, str) for acct in accounts: @@ -516,11 +499,19 @@ def on_subscribe_button_clicked(self, widget): '''When Subscribe button is clicked''' - jid = self.jid_entry.get_text().decode('utf-8') - nickname = self.nickname_entry.get_text().decode('utf-8') + active_tab = self.transports_notebook.get_current_page() + type_ = self.tab_transport[active_tab] + if type_ not in self.agents: + pritext = _('Transport Not Registered') + ErrorDialog(pritext, _('You must register to a transport to be able to add a %s contact.') % type_) + return + + jid = self.xml.get_widget(type_ + '_entry').get_text().decode('utf-8') if not jid: return - + if type_ != 'jabber': + jid = jid.replace('@', '%') + '@' + self.agents[type_] + # check if jid is conform to RFC and stringprep it try: jid = helpers.parse_jid(jid) @@ -535,6 +526,10 @@ ErrorDialog(pritext, _('The user ID must not contain a resource.')) return + nickname = self.nickname_entry.get_text().decode('utf-8') + if not nickname: + nickname = '' + # get value of account combobox, if account was not specified if not self.account: model = self.account_combobox.get_model() @@ -549,53 +544,20 @@ _('This contact is already listed in your roster.')) return - message_buffer = self.xml.get_widget('message_textview').get_buffer() - start_iter = message_buffer.get_start_iter() - end_iter = message_buffer.get_end_iter() - message = message_buffer.get_text(start_iter, end_iter).decode('utf-8') + if type_ == 'jabber': + message_buffer = self.xml.get_widget('jabber_message_textview').\ + get_buffer() + start_iter = message_buffer.get_start_iter() + end_iter = message_buffer.get_end_iter() + message = message_buffer.get_text(start_iter, end_iter).decode('utf-8') + else: + message = '' group = self.group_comboboxentry.child.get_text().decode('utf-8') auto_auth = self.xml.get_widget('auto_authorize_checkbutton').get_active() gajim.interface.roster.req_sub(self, jid, message, self.account, group = group, pseudo = nickname, auto_auth = auto_auth) self.window.destroy() - - def fill_jid(self): - model = self.protocol_combobox.get_model() - index = self.protocol_combobox.get_active() - jid = self.uid_entry.get_text().decode('utf-8').strip() - if index > 0: # it's not jabber but a transport - jid = jid.replace('@', '%') - agent = model[index][1].decode('utf-8') - if agent: - jid += '@' + agent - self.jid_entry.set_text(jid) - def on_protocol_combobox_changed(self, widget): - self.fill_jid() - - def guess_agent(self): - uid = self.uid_entry.get_text().decode('utf-8') - model = self.protocol_combobox.get_model() - - #If login contains only numbers, it's probably an ICQ number - if uid.isdigit(): - if 'ICQ' in self.agents: - self.protocol_combobox.set_active(self.agents.index('ICQ')) - return - - def set_nickname(self): - uid = self.uid_entry.get_text().decode('utf-8') - nickname = self.nickname_entry.get_text().decode('utf-8') - if nickname == self.old_uid_value: - self.nickname_entry.set_text(uid.split('@')[0]) - - def on_uid_entry_changed(self, widget): - uid = self.uid_entry.get_text().decode('utf-8') - self.guess_agent() - self.set_nickname() - self.fill_jid() - self.old_uid_value = uid.split('@')[0] - class AboutDialog: '''Class for about dialog''' def __init__(self):

1 0

[commit-gajim] r6625 - trunk/src
by asterix＠gajim.org 31 Jul '06

31 Jul '06

Author: asterix Date: 2006-07-31 15:25:30 +0200 (Mon, 31 Jul 2006) New Revision: 6625 Modified: trunk/src/roster_window.py Log: fix var name (account was used twice) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-07-31 07:45:29 UTC (rev 6624) +++ trunk/src/roster_window.py 2006-07-31 13:25:30 UTC (rev 6625) @@ -1417,11 +1417,11 @@ rooms = [] # a list of (room_jid, account) tuple for gc_control in gajim.interface.msg_win_mgr.get_controls( message_control.TYPE_GC): - account = gc_control.account + acct = gc_control.account room_jid = gc_control.room_jid - if gajim.gc_connected[account].has_key(room_jid) and \ - gajim.gc_connected[account][room_jid]: - rooms.append((room_jid, account)) + if gajim.gc_connected[acct].has_key(room_jid) and \ + gajim.gc_connected[acct][room_jid]: + rooms.append((room_jid, acct)) if len(rooms): item = gtk.SeparatorMenuItem() # separator submenu.append(item)

1 0

[commit-gajim] r6624 - trunk/src/common
by asterix＠gajim.org 31 Jul '06

31 Jul '06

Author: asterix Date: 2006-07-31 09:45:29 +0200 (Mon, 31 Jul 2006) New Revision: 6624 Modified: trunk/src/common/logger.py trunk/src/common/optparser.py Log: re-connect to DB after upgrades (upgrade can modify DB structure) Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2006-07-30 20:06:42 UTC (rev 6623) +++ trunk/src/common/logger.py 2006-07-31 07:45:29 UTC (rev 6624) @@ -99,25 +99,29 @@ class Logger: def __init__(self): self.jids_already_in = [] # holds jids that we already have in DB - + self.con = None + if not os.path.exists(LOG_DB_PATH): # this can happen only the first time (the time we create the db) # db is not created here but in src/common/checks_paths.py return self.init_vars() - + def init_vars(self): # if locked, wait up to 20 sec to unlock # before raise (hopefully should be enough) + if self.con: + self.con.close() self.con = sqlite.connect(LOG_DB_PATH, timeout = 20.0, isolation_level = 'IMMEDIATE') self.cur = self.con.cursor() - + self.get_jids_already_in_db() def get_jids_already_in_db(self): self.cur.execute('SELECT jid FROM jids') rows = self.cur.fetchall() # list of tupples: [(u'aaa@bbb',), (u'cc@dd',)] + self.jids_already_in = [] for row in rows: # row[0] is first item of row (the only result here, the jid) self.jids_already_in.append(row[0]) Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2006-07-30 20:06:42 UTC (rev 6623) +++ trunk/src/common/optparser.py 2006-07-31 07:45:29 UTC (rev 6624) @@ -147,6 +147,7 @@ if old < [0, 10, 1, 3] and new >= [0, 10, 1, 3]: self.update_config_to_01013() + gajim.logger.init_vars() gajim.config.set('version', new_version) def update_config_x_to_09(self):

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2006