Commits July 2007

commits@gajim.org

8 participants
98 discussions

[commit-gajim] r8366 - branches/e2e_encryption/src
by bct＠gajim.org 05 Jul '07

05 Jul '07

Author: bct Date: 2007-07-05 23:30:09 +0200 (Thu, 05 Jul 2007) New Revision: 8366 Modified: branches/e2e_encryption/src/gajim.py Log: fixed presence leaks Modified: branches/e2e_encryption/src/gajim.py =================================================================== --- branches/e2e_encryption/src/gajim.py 2007-07-05 16:36:54 UTC (rev 8365) +++ branches/e2e_encryption/src/gajim.py 2007-07-05 21:30:09 UTC (rev 8366) @@ -1664,10 +1664,17 @@ session.cancelled_negotiation() return - # encrypted session states. these are descriped in stanza_session.py + # encrypted session states. these are described in stanza_session.py # bob responds - if form.getType() == 'form' and u'e2e' in map(lambda x: x[1], form.getField('security').getOptions()): + if form.getType() == 'form' and u'e2e' in \ + map(lambda x: x[1], form.getField('security').getOptions()): + contact = gajim.contacts.get_contact(account, jid.getStripped(), jid.getResource()) + + if gajim.SHOW_LIST[gajim.connections[account].connected] == 'invisible' or \ + contact.sub not in ('from', 'both'): + return + negotiated, not_acceptable, ask_user = session.verify_options_bob(form) if ask_user: @@ -1685,7 +1692,11 @@ dialog.destroy() dialog = dialogs.YesNoDialog(_('Confirm these session options'), - _('The remote client wants to negotiate an session with these features:\n\n%s\n\nAre these options acceptable?') % (negotiation.describe_features(ask_user)), + _('''The remote client wants to negotiate an session with these features: + +%s + +Are these options acceptable?''') % (negotiation.describe_features(ask_user)), on_response_yes = accept_nondefault_options, on_response_no = reject_nondefault_options) else:

1 0

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

05 Jul '07

Author: asterix Date: 2007-07-05 18:36:54 +0200 (Thu, 05 Jul 2007) New Revision: 8365 Modified: trunk/src/tooltips.py Log: fix tooltip for merged account row Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2007-07-05 09:21:31 UTC (rev 8364) +++ trunk/src/tooltips.py 2007-07-05 16:36:54 UTC (rev 8365) @@ -377,7 +377,7 @@ self.create_table() if not contacts or len(contacts) == 0: # Tooltip for merged accounts row - accounts = helpers.get_accounts_info() + accounts = helpers.get_notification_icon_tooltip_dict() self.table.resize(2, 1) self.spacer_label = '' self.fill_table_with_accounts(accounts)

1 0

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

05 Jul '07

Author: asterix Date: 2007-07-05 11:21:31 +0200 (Thu, 05 Jul 2007) New Revision: 8364 Modified: trunk/src/dialogs.py Log: fix the show transport icon in add contact dialog Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-07-05 08:59:47 UTC (rev 8363) +++ trunk/src/dialogs.py 2007-07-05 09:21:31 UTC (rev 8364) @@ -498,6 +498,8 @@ for j in gajim.contacts.get_jid_list(acct): if gajim.jid_is_transport(j): type_ = gajim.get_transport_name_from_jid(j, False) + if not type_: + continue if self.agents.has_key(type_): self.agents[type_].append(j) else: @@ -532,7 +534,10 @@ for type_ in self.agents: if type_ == 'jabber': continue - img = gajim.interface.roster.transports_state_images['16'][type_]['online'] + imgs = gajim.interface.roster.transports_state_images + img = None + if imgs['16'].has_key(type_) and imgs['16'][type_].has_key('online'): + img = gajim.interface.roster.transports_state_images['16'][type_]['online'] if type_ in uf_type: liststore.append([uf_type[type_], img.get_pixbuf(), type_]) else:

1 0

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

05 Jul '07

Author: asterix Date: 2007-07-05 10:59:47 +0200 (Thu, 05 Jul 2007) New Revision: 8363 Modified: trunk/src/chat_control.py Log: [misc] fix /say command in chat. Fixes #3284 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-07-05 06:26:57 UTC (rev 8362) +++ trunk/src/chat_control.py 2007-07-05 08:59:47 UTC (rev 8363) @@ -896,7 +896,7 @@ '''A control for standard 1-1 chat''' TYPE_ID = message_control.TYPE_CHAT old_msg_kind = None # last kind of the printed message - CHAT_CMDS = ['clear', 'compact', 'help', 'me', 'ping'] + CHAT_CMDS = ['clear', 'compact', 'help', 'me', 'ping', 'say'] def __init__(self, parent_win, contact, acct, resource = None): ChatControlBase.__init__(self, self.TYPE_ID, parent_win, @@ -1202,10 +1202,12 @@ elif command == 'ping': if not len(message_array): gajim.connections[self.account].sendPing(self.contact) - else: + else: self.get_command_help(command) self.clear(self.msg_textview) return True + elif command == 'say': + return False else: self.print_conversation(_('No such command: /%s (if you want to send ' 'this, prefix it with /say)') % command, 'info') @@ -1229,6 +1231,9 @@ elif command == 'ping': self.print_conversation(_('Usage: /%s, sends a ping to the contact') %\ command, 'info') + elif command == 'say': + self.print_conversation(_('Usage: /%s, send the message to the contact') %\ + command, 'info') else: self.print_conversation(_('No help info for /%s') % command, 'info') @@ -1237,6 +1242,9 @@ if message in ('', None, '\n') or self._process_command(message): return + if message.startswith('/say'): + message = message[5:] + # refresh timers self.reset_kbd_mouse_timeout_vars()

1 0

[commit-gajim] r8362 - trunk/data/glade
by asterix＠gajim.org 05 Jul '07

05 Jul '07

Author: asterix Date: 2007-07-05 08:26:57 +0200 (Thu, 05 Jul 2007) New Revision: 8362 Modified: trunk/data/glade/add_new_contact_window.glade Log: missing glade changement. see #3269 Modified: trunk/data/glade/add_new_contact_window.glade =================================================================== --- trunk/data/glade/add_new_contact_window.glade 2007-07-05 06:25:21 UTC (rev 8361) +++ trunk/data/glade/add_new_contact_window.glade 2007-07-05 06:26:57 UTC (rev 8362) @@ -1,527 +1,326 @@ -<?xml version="1.0" standalone="no"?>  -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> + <glade-interface> - -<widget class="GtkWindow" id="add_new_contact_window"> - <property name="border_width">6</property> - <property name="title" translatable="yes">Add New Contact</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">False</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <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"/> - <signal name="destroy" handler="on_add_new_contact_window_destroy" last_modification_time="Thu, 03 Aug 2006 15:49:22 GMT"/> - - <child> - <widget class="GtkVBox" id="vbox8"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkLabel" id="prompt_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">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="GtkHBox" id="account_hbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkLabel" id="account_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">A_ccount:</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="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <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">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="protocol_hbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkLabel" id="protocol_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Protocol:</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="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="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkComboBox" id="protocol_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> - <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> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkComboBox" id="protocol_jid_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> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkTable" id="subscription_table"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="n_rows">3</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="uid_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">_User 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="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">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="uid_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">True</property> - <signal name="changed" handler="on_uid_entry_changed" last_modification_time="Mon, 28 Feb 2005 23:05:24 GMT"/> - </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="GtkLabel" id="label188"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Nickname:</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="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">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="GtkEntry" id="nickname_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">True</property> - </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="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> - <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">2</property> - <property name="bottom_attach">3</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">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">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="auto_authorize_checkbutton"> - <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="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="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkScrolledWindow" id="message_scrolledwindow"> - <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"> - <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="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="register_hbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkLabel" id="label224"> - <property name="visible">True</property> - <property name="label" translatable="yes">You have to register with this transport + <widget class="GtkWindow" id="add_new_contact_window"> + <property name="border_width">6</property> + <property name="title" translatable="yes">Add New Contact</property> + <property name="resizable">False</property> + <signal name="key_press_event" handler="on_add_new_contact_window_key_press_event"/> + <signal name="destroy" handler="on_add_new_contact_window_destroy"/> + <child> + <widget class="GtkVBox" id="vbox8"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <widget class="GtkLabel" id="prompt_label"> + <property name="visible">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="account_hbox"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <widget class="GtkLabel" id="account_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">A_ccount:</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="account_combobox"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="protocol_hbox"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <widget class="GtkLabel" id="protocol_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Protocol:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">uid_entry</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="protocol_combobox"> + <property name="visible">True</property> + <signal name="changed" handler="on_protocol_combobox_changed"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="protocol_jid_combobox"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkTable" id="subscription_table"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <child> + <widget class="GtkComboBoxEntry" id="group_comboboxentry"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <child internal-child="entry"> + <widget class="GtkEntry" id="comboboxentry-entry1"> + </widget> + </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="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label223"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Group:</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="nickname_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">True</property> + </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="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label188"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Nickname:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">nickname_entry</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="uid_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">True</property> + <signal name="changed" handler="on_uid_entry_changed"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="uid_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_User ID:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">uid_entry</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="auto_authorize_checkbutton"> + <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="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> + </packing> + </child> + <child> + <widget class="GtkScrolledWindow" id="message_scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="border_width">6</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> + <child> + <widget class="GtkTextView" id="message_textview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="wrap_mode">GTK_WRAP_WORD</property> + <property name="text" translatable="yes">I would like to add you to my contact list.</property> + </widget> + </child> + </widget> + <packing> + <property name="position">5</property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="register_hbox"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <widget class="GtkLabel" id="label224"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">You have to register with this transport to be able to add a contact from this protocol. Click on register button to proceed.</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</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">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="register_button"> - <property name="visible">True</property> - <property name="can_default">True</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="clicked" handler="on_register_button_clicked" last_modification_time="Thu, 03 Aug 2006 14:29:57 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</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="GtkLabel" id="connected_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">You must be connected to the transport to be able + <property name="wrap">True</property> + </widget> + </child> + <child> + <widget class="GtkButton" id="register_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="label" translatable="yes">_Register</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_register_button_clicked"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="position">6</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="connected_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">You must be connected to the transport to be able to add a contact from this protocol.</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="GtkHButtonBox" id="hbuttonbox1"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkButton" id="cancel_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <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"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="add_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="label">gtk-add</property> - <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_add_button_clicked" last_modification_time="Thu, 03 Aug 2006 14:27:55 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> -</widget> - + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">7</property> + </packing> + </child> + <child> + <widget class="GtkHButtonBox" id="hbuttonbox1"> + <property name="visible">True</property> + <property name="border_width">5</property> + <property name="spacing">12</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + <child> + <widget class="GtkButton" id="cancel_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="label">gtk-cancel</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_cancel_button_clicked"/> + </widget> + </child> + <child> + <widget class="GtkButton" id="add_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="label">gtk-add</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_add_button_clicked"/> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">8</property> + </packing> + </child> + </widget> + </child> + </widget> </glade-interface>

1 0

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

05 Jul '07

Author: asterix Date: 2007-07-05 08:25:21 +0200 (Thu, 05 Jul 2007) New Revision: 8361 Modified: trunk/src/dialogs.py Log: [gerald] add protocol pixbuf in add contact dialog. Fixes #3269 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-07-04 21:10:50 UTC (rev 8360) +++ trunk/src/dialogs.py 2007-07-05 06:25:21 UTC (rev 8361) @@ -513,20 +513,30 @@ self.agents[type_].append(jid_) self.available_types.append(type_) liststore = gtk.ListStore(str) - self.group_comboboxentry.set_model(liststore) - liststore = gtk.ListStore(str, str) + self.group_comboboxentry.set_model(liststore) + # Combobox with transport/jabber icons + liststore = gtk.ListStore(str, gtk.gdk.Pixbuf, str) + cell = gtk.CellRendererPixbuf() + self.protocol_combobox.pack_start(cell, False) + self.protocol_combobox.add_attribute(cell, 'pixbuf', 1) + cell = gtk.CellRendererText() + cell.set_property('xpad', 5) + self.protocol_combobox.pack_start(cell, True) + self.protocol_combobox.add_attribute(cell, 'text', 0) + self.protocol_combobox.set_model(liststore) uf_type = {'jabber': 'Jabber', 'aim': 'AIM', 'gadu-gadu': 'Gadu Gadu', 'icq': 'ICQ', 'msn': 'MSN', 'yahoo': 'Yahoo'} # Jabber as first - liststore.append(['Jabber', 'jabber']) + img = gajim.interface.roster.jabber_state_images['16']['online'] + liststore.append(['Jabber', img.get_pixbuf(), 'jabber']) for type_ in self.agents: if type_ == 'jabber': continue + img = gajim.interface.roster.transports_state_images['16'][type_]['online'] if type_ in uf_type: - liststore.append([uf_type[type_], type_]) + liststore.append([uf_type[type_], img.get_pixbuf(), type_]) else: - liststore.append([type_, type_]) - self.protocol_combobox.set_model(liststore) + liststore.append([type_, img.get_pixbuf(), type_]) self.protocol_combobox.set_active(0) self.protocol_jid_combobox.set_no_show_all(True) self.protocol_jid_combobox.hide() @@ -554,7 +564,7 @@ iter = model.get_iter_first() i = 0 while iter: - if model[iter][1] == type_: + if model[iter][2] == type_: self.protocol_combobox.set_active(i) break iter = model.iter_next(iter) @@ -629,7 +639,7 @@ model = self.protocol_combobox.get_model() iter = self.protocol_combobox.get_active_iter() - type_ = model[iter][1] + type_ = model[iter][2] if type_ != 'jabber': transport = self.protocol_jid_combobox.get_active_text().decode( 'utf-8') @@ -683,7 +693,7 @@ def on_protocol_combobox_changed(self, widget): model = widget.get_model() iter = widget.get_active_iter() - type_ = model[iter][1] + type_ = model[iter][2] model = self.protocol_jid_combobox.get_model() model.clear() if len(self.agents[type_]):

1 0

[commit-gajim] r8360 - in trunk: data/glade src
by asterix＠gajim.org 04 Jul '07

04 Jul '07

Author: asterix Date: 2007-07-04 23:10:50 +0200 (Wed, 04 Jul 2007) New Revision: 8360 Modified: trunk/data/glade/accounts_window.glade trunk/src/config.py trunk/src/roster_window.py Log: new accounts window. one bug remain, see #2744 Modified: trunk/data/glade/accounts_window.glade =================================================================== --- trunk/data/glade/accounts_window.glade 2007-07-04 18:55:53 UTC (rev 8359) +++ trunk/data/glade/accounts_window.glade 2007-07-04 21:10:50 UTC (rev 8360) @@ -1,305 +1,1353 @@ -<?xml version="1.0" standalone="no"?>  -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> + <glade-interface> - -<widget class="GtkWindow" id="accounts_window"> - <property name="border_width">12</property> - <property name="title" translatable="yes">Accounts</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="default_height">150</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="role">accounts</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <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="destroy" handler="on_accounts_window_destroy" last_modification_time="Sat, 02 Apr 2005 20:34:04 GMT"/> - <signal name="key_press_event" handler="on_accounts_window_key_press_event" last_modification_time="Wed, 25 May 2005 23:19:56 GMT"/> - - <child> - <widget class="GtkVBox" id="vbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow"> - <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_NEVER</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="accounts_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">True</property> - <property name="rules_hint">False</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - <property name="fixed_height_mode">False</property> - <property name="hover_selection">False</property> - <property name="hover_expand">False</property> - <signal name="cursor_changed" handler="on_accounts_treeview_cursor_changed" last_modification_time="Tue, 01 Mar 2005 18:21:26 GMT"/> - <signal name="row_activated" handler="on_accounts_treeview_row_activated" last_modification_time="Tue, 04 Oct 2005 07:09:52 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="merge_checkbutton"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">If you have 2 or more accounts and this is checked, Gajim will list all contacts as if you had one account</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Mer_ge accounts</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_merge_checkbutton_toggled" last_modification_time="Sun, 06 Mar 2005 15:07:26 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHSeparator" id="hseparator1"> - <property name="visible">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="enable_zeroconf_checkbutton"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">If checked, all local contacts that use a Bonjour compatible chat client (like iChat, Trillian or Gaim) will be shown in roster. You don't need to be connected to a jabber server for it to work. -This is only available if python-avahi is installed and avahi-daemon is running.</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Enable link-local messaging</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox15"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkButton" id="new_button"> - <property name="visible">True</property> - <property name="label">gtk-new</property> - <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_new_button_clicked" last_modification_time="Tue, 01 Mar 2005 18:20:36 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="modify_button"> - <property name="visible">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_modify_button_clicked" last_modification_time="Tue, 01 Mar 2005 18:20:53 GMT"/> - - <child> - <widget class="GtkAlignment" id="alignment44"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox2919"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image334"> - <property name="visible">True</property> - <property name="stock">gtk-preferences</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label201"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Modify</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.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> - </widget> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkButton" id="remove_button"> - <property name="visible">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_remove_button_clicked" last_modification_time="Tue, 19 Apr 2005 22:15:48 GMT"/> - - <child> - <widget class="GtkAlignment" id="alignment61"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox2953"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image500"> - <property name="visible">True</property> - <property name="stock">gtk-delete</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label244"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Remove</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.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> - </widget> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkButton" id="close_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="has_focus">True</property> - <property name="label">gtk-close</property> - <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_close_button_clicked" last_modification_time="Tue, 01 Mar 2005 18:21:00 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - + <widget class="GtkWindow" id="accounts_window"> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="border_width">12</property> + <property name="default_width">600</property> + <signal name="destroy" handler="on_accounts_window_destroy"/> + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="spacing">6</property> + <child> + <widget class="GtkHPaned" id="hpaned1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="position">175</property> + <child> + <widget class="GtkVBox" id="vbox2"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="spacing">6</property> + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <child> + <widget class="GtkTreeView" id="accounts_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="headers_visible">False</property> + <property name="headers_clickable">True</property> + <signal name="cursor_changed" handler="on_accounts_treeview_cursor_changed"/> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkButton" id="add_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">gtk-add</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_add_button_clicked"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="remove_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">gtk-remove</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_remove_button_clicked"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="rename_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <signal name="clicked" handler="on_rename_button_clicked"/> + <child> + <widget class="GtkHBox" id="hbox8"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="spacing">6</property> + <child> + <widget class="GtkLabel" id="label26"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + </widget> + <packing> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkImage" id="rename_image"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="stock">gtk-missing-image</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label25"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">Re_name</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label27"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + </widget> + <packing> + <property name="position">3</property> + </packing> + </child> + </widget> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">3</property> + </packing> + </child> + </widget> + <packing> + <property name="resize">False</property> + </packing> + </child> + <child> + <widget class="GtkNotebook" id="notebook"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="show_tabs">False</property> + <property name="show_border">False</property> + <child> + <widget class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + </widget> + <packing> + <property name="tab_expand">False</property> + </packing> + </child> + <child> + <placeholder/> + <packing> + <property name="type">tab</property> + </packing> + </child> + <child> + <widget class="GtkNotebook" id="normal_notebook1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <widget class="GtkTable" id="table1"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="n_rows">5</property> + <property name="n_columns">3</property> + <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <child> + <widget class="GtkEntry" id="resource_entry1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)</property> + <property name="invisible_char">*</property> + <property name="text" translatable="yes">Gajim</property> + <signal name="focus_out_event" handler="on_resource_entry1_focus_out_event"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="jid_entry1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">True</property> + <signal name="focus_out_event" handler="on_jid_entry1_focus_out_event"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">3</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkExpander" id="expander1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <widget class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="spacing">11</property> + <property name="homogeneous">True</property> + <child> + <widget class="GtkButton" id="synchronise_contacts_button1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Click to request authorization to all contacts of another account</property> + <property name="label" translatable="yes">Synchronise contacts</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_synchronise_contacts_button1_clicked"/> + </widget> + <packing> + <property name="expand">False</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="change_password_button1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Click to change account's password</property> + <property name="label" translatable="yes">Chan_ge Password</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_change_password_button1_clicked"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="label" translatable="yes">Administration operations</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="right_attach">3</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkSpinButton" id="priority_spinbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events</property> + <property name="adjustment">5 0 127 1 5 5</property> + <property name="climb_rate">1</property> + <property name="numeric">True</property> + <signal name="value_changed" handler="on_priority_spinbutton1_value_changed"/> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="adjust_priority_with_status_checkbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Priority will change automatically according to your status.</property> + <property name="label" translatable="yes">_Adjust to status</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_adjust_priority_with_status_checkbutton1_toggled"/> + </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">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Priori_ty:</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Resour_ce:</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="save_password_checkbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, Gajim will remember the password for this account</property> + <property name="label" translatable="yes">Save pass_word</property> + <property name="use_underline">True</property> + <property name="focus_on_click">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_save_password_checkbutton1_toggled"/> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="password_entry1"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + <property name="invisible_char">*</property> + <property name="activates_default">True</property> + <signal name="changed" handler="on_password_entry1_changed"/> + </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">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Password:</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Jabber ID:</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + </widget> + <packing> + <property name="tab_expand">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="label" translatable="yes">Account</property> + </widget> + <packing> + <property name="type">tab</property> + <property name="tab_expand">False</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <widget class="GtkVBox" id="vbox3"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="spacing">6</property> + <child> + <widget class="GtkCheckButton" id="autoconnect_checkbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, Gajim, when launched, will automatically connect to jabber using this account</property> + <property name="label" translatable="yes">C_onnect on Gajim startup</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_autoconnect_checkbutton_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="autoreconnect_checkbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Auto-reconnect when connection is lost</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_autoreconnect_checkbutton_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="log_history_checkbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Save conversation _logs for all contacts</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_log_history_checkbutton_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="sync_with_global_status_checkbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly</property> + <property name="label" translatable="yes">Synch_ronize account status with global status</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_sync_with_global_status_checkbutton_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="use_ft_proxies_checkbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working.</property> + <property name="label" translatable="yes">Use file transfer proxies</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_use_ft_proxies_checkbutton1_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> + </packing> + </child> + </widget> + <packing> + <property name="position">1</property> + <property name="tab_expand">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="label" translatable="yes">General</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="type">tab</property> + <property name="position">1</property> + <property name="tab_expand">False</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <widget class="GtkVBox" id="vbox6"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="spacing">12</property> + <child> + <widget class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="spacing">6</property> + <child> + <widget class="GtkLabel" id="label9"> + <property name="visible">True</property> + <property name="label" translatable="yes">Proxy:</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="proxies_combobox1"> + <property name="visible">True</property> + <property name="items" translatable="yes" comments="None means no proxy profile selected">None</property> + <signal name="changed" handler="on_proxies_combobox1_changed"/> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="manage_proxies_button1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Manage...</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_manage_proxies_button1_clicked"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + </packing> + </child> + <child> + <widget class="GtkFrame" id="misc_frame1"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + <child> + <widget class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="left_padding">12</property> + <child> + <widget class="GtkVBox" id="vbox7"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="spacing">6</property> + <child> + <widget class="GtkCheckButton" id="use_ssl_checkbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim uses TLS encryption by default if broadcasted by the server, and with this option enabled TLS will be disabled</property> + <property name="label" translatable="yes">Use _SSL (legacy)</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_use_ssl_checkbutton1_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="send_keepalive_checkbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection</property> + <property name="label" translatable="yes">Send keep-alive packets</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_send_keepalive_checkbutton1_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="custom_host_port_checkbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Use custom hostname/port</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_custom_host_port_checkbutton1_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="custom_host_port_hbox1"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="spacing">6</property> + <child> + <widget class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="label" translatable="yes">Hostname: </property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="custom_host_entry1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">*</property> + <signal name="changed" handler="on_custom_host_entry1_changed"/> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label18"> + <property name="visible">True</property> + <property name="label" translatable="yes">Port: </property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="custom_port_entry1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">*</property> + <property name="width_chars">6</property> + <property name="text">5222</property> + <signal name="focus_out_event" handler="on_custom_port_entry_focus_out_event"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">3</property> + </packing> + </child> + </widget> + <packing> + <property name="position">3</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label19"> + <property name="visible">True</property> + <property name="label" translatable="yes">Miscellaneous</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="position">2</property> + <property name="tab_expand">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label20"> + <property name="visible">True</property> + <property name="label" translatable="yes">Connection</property> + </widget> + <packing> + <property name="type">tab</property> + <property name="position">2</property> + <property name="tab_expand">False</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <widget class="GtkVBox" id="vbox8"> + <property name="visible">True</property> + <property name="border_width">5</property> + <property name="spacing">6</property> + <child> + <widget class="GtkFrame" id="frame1"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + <child> + <widget class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="left_padding">12</property> + <child> + <widget class="GtkVBox" id="vbox9"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="spacing">6</property> + <child> + <widget class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <widget class="GtkLabel" id="gpg_key_label1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">No key selected</property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="gpg_name_label1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="gpg_choose_button1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Choose _Key...</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_gpg_choose_button_clicked"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="hbox4"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <widget class="GtkCheckButton" id="gpg_save_password_checkbutton1"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you</property> + <property name="label" translatable="yes">Save _passphrase (insecure)</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_gpg_save_password_checkbutton_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="gpg_password_entry1"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + <property name="invisible_char">*</property> + <signal name="changed" handler="on_gpg_password_entry_changed"/> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label21"> + <property name="visible">True</property> + <property name="label" translatable="yes">OpenPGP</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + </packing> + </child> + <child> + <widget class="GtkFrame" id="frame2"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + <child> + <widget class="GtkAlignment" id="alignment3"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="left_padding">12</property> + <child> + <widget class="GtkButton" id="edit_details_button1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Information about you, as stored in the server</property> + <property name="label" translatable="yes">Edit Personal Information...</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_edit_details_button1_clicked"/> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label22"> + <property name="visible">True</property> + <property name="label" translatable="yes">Personal Information</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="position">3</property> + <property name="tab_expand">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label23"> + <property name="visible">True</property> + <property name="label" translatable="yes">Personal Information</property> + </widget> + <packing> + <property name="type">tab</property> + <property name="position">3</property> + <property name="tab_expand">False</property> + <property name="tab_fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="position">1</property> + <property name="tab_expand">False</property> + </packing> + </child> + <child> + <placeholder/> + <packing> + <property name="type">tab</property> + </packing> + </child> + <child> + <widget class="GtkVBox" id="vbox4"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <widget class="GtkCheckButton" id="enable_zeroconf_checkbutton2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">Enable</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_enable_zeroconf_checkbutton2_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + </packing> + </child> + <child> + <widget class="GtkNotebook" id="zeroconf_notebook"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <widget class="GtkVBox" id="vbox5"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="spacing">6</property> + <child> + <widget class="GtkCheckButton" id="autoconnect_checkbutton2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, Gajim, when launched, will automatically connect to jabber using this account</property> + <property name="label" translatable="yes">C_onnect on Gajim startup</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_autoconnect_checkbutton_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="log_history_checkbutton2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Save conversation _logs for all contacts</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_log_history_checkbutton_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="sync_with_global_status_checkbutton2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly</property> + <property name="label" translatable="yes">Synch_ronize account status with global status</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_sync_with_global_status_checkbutton_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="hbox5"> + <property name="visible">True</property> + <child> + <widget class="GtkCheckButton" id="custom_port_checkbutton2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If the default port that is used for incoming messages is unfitting for your setup you can select another one here. +You might consider to change possible firewall settings.</property> + <property name="label" translatable="yes">Use custom port:</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_custom_port_checkbutton2_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="custom_port_entry2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="width_chars">6</property> + <signal name="focus_out_event" handler="on_custom_port_entry_focus_out_event"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="padding">10</property> + <property name="position">3</property> + </packing> + </child> + </widget> + <packing> + <property name="tab_expand">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="label" translatable="yes">General</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="type">tab</property> + <property name="tab_expand">False</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <widget class="GtkTable" id="table2"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="n_rows">6</property> + <property name="n_columns">2</property> + <property name="column_spacing">2</property> + <property name="row_spacing">5</property> + <child> + <widget class="GtkEntry" id="jabber_id_entry2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_jabber_id_entry2_changed"/> + </widget> + <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="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label12"> + <property name="visible">True</property> + <property name="label" translatable="yes">Jabber ID:</property> + </widget> + <packing> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label13"> + <property name="visible">True</property> + <property name="label" translatable="yes">E-Mail:</property> + </widget> + <packing> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="email_entry2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_email_entry2_changed"/> + </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="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label14"> + <property name="visible">True</property> + <property name="label" translatable="yes">Last Name:</property> + </widget> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="last_name_entry2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_last_name_entry2_changed"/> + </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="label15"> + <property name="visible">True</property> + <property name="label" translatable="yes">First Name:</property> + </widget> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="first_name_entry2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_first_name_entry2_changed"/> + </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> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label16"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Personal Information</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkVBox" id="vbox10"> + <property name="visible">True</property> + <property name="spacing">5</property> + <child> + <widget class="GtkLabel" id="label17"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">OpenPGP</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="hbox6"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <widget class="GtkLabel" id="gpg_key_label2"> + <property name="visible">True</property> + <property name="label" translatable="yes">No key selected</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="gpg_name_label2"> + <property name="visible">True</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="gpg_choose_button2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Choose _Key...</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_gpg_choose_button_clicked"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="hbox7"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <widget class="GtkCheckButton" id="gpg_save_password_checkbutton2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you</property> + <property name="label" translatable="yes">Save _passphrase (insecure)</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_gpg_save_password_checkbutton_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="gpg_password_entry2"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + <property name="invisible_char">*</property> + <signal name="changed" handler="on_gpg_password_entry_changed"/> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> + </widget> + <packing> + <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + </widget> + <packing> + <property name="position">1</property> + <property name="tab_expand">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label24"> + <property name="visible">True</property> + <property name="label" translatable="yes">Personal Information</property> + </widget> + <packing> + <property name="type">tab</property> + <property name="position">1</property> + <property name="tab_expand">False</property> + <property name="tab_fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="position">2</property> + <property name="tab_expand">False</property> + </packing> + </child> + <child> + <placeholder/> + <packing> + <property name="type">tab</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkCheckButton" id="merge_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">Mer_ge accounts</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_merge_checkbutton_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkHSeparator" id="hseparator2"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkHButtonBox" id="hbuttonbox1"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="spacing">6</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + <child> + <widget class="GtkButton" id="close_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">gtk-close</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_close_button_clicked"/> + </widget> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">3</property> + </packing> + </child> + </widget> + </child> + </widget> </glade-interface> Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-07-04 18:55:53 UTC (rev 8359) +++ trunk/src/config.py 2007-07-04 21:10:50 UTC (rev 8360) @@ -1153,542 +1153,6 @@ gajim.interface.roster.enable_syncing_status_msg_from_current_music_track( widget.get_active()) -#---------- AccountModificationWindow class -------------# -class AccountModificationWindow: - '''Class for account informations''' - def on_account_modification_window_destroy(self, widget): - '''close window''' - if gajim.interface.instances.has_key(self.account): - if gajim.interface.instances[self.account].has_key( - 'account_modification'): - del gajim.interface.instances[self.account]['account_modification'] - return - if gajim.interface.instances.has_key('account_modification'): - del gajim.interface.instances['account_modification'] - - def on_cancel_button_clicked(self, widget): - self.window.destroy() - - def __init__(self, account): - self.xml = gtkgui_helpers.get_glade('account_modification_window.glade') - self.window = self.xml.get_widget('account_modification_window') - self.window.set_transient_for(gajim.interface.roster.window) - self.account = account - - # init proxy list - self.update_proxy_list() - - self.xml.signal_autoconnect(self) - self.init_account() - self.xml.get_widget('save_button').grab_focus() - self.window.show_all() - - def on_checkbutton_toggled(self, widget, widgets): - '''set or unset sensitivity of widgets when widget is toggled''' - for w in widgets: - w.set_sensitive(widget.get_active()) - - def init_account_gpg(self): - keyid = gajim.config.get_per('accounts', self.account, 'keyid') - keyname = gajim.config.get_per('accounts', self.account, 'keyname') - savegpgpass = gajim.config.get_per('accounts', self.account, - 'savegpgpass') - - if not keyid or not gajim.config.get('usegpg'): - return - - self.xml.get_widget('gpg_key_label').set_text(keyid) - self.xml.get_widget('gpg_name_label').set_text(keyname) - gpg_save_password_checkbutton = \ - self.xml.get_widget('gpg_save_password_checkbutton') - gpg_save_password_checkbutton.set_sensitive(True) - gpg_save_password_checkbutton.set_active(savegpgpass) - - if savegpgpass: - entry = self.xml.get_widget('gpg_password_entry') - entry.set_sensitive(True) - gpgpassword = gajim.config.get_per('accounts', - self.account, 'gpgpassword') - entry.set_text(gpgpassword) - - def update_proxy_list(self): - if self.account: - our_proxy = gajim.config.get_per('accounts', self.account, 'proxy') - else: - our_proxy = '' - if not our_proxy: - our_proxy = _('None') - self.proxy_combobox = self.xml.get_widget('proxies_combobox') - model = gtk.ListStore(str) - self.proxy_combobox.set_model(model) - l = gajim.config.get_per('proxies') - l.insert(0, _('None')) - for i in xrange(len(l)): - model.append([l[i]]) - if our_proxy == l[i]: - self.proxy_combobox.set_active(i) - - def init_account(self): - '''Initialize window with defaults values''' - self.xml.get_widget('name_entry').set_text(self.account) - jid = gajim.config.get_per('accounts', self.account, 'name') \ - + '@' + gajim.config.get_per('accounts', - self.account, 'hostname') - self.xml.get_widget('jid_entry').set_text(jid) - self.xml.get_widget('save_password_checkbutton').set_active( - gajim.config.get_per('accounts', self.account, 'savepass')) - if gajim.config.get_per('accounts', self.account, 'savepass'): - passstr = passwords.get_password(self.account) or '' - password_entry = self.xml.get_widget('password_entry') - password_entry.set_sensitive(True) - password_entry.set_text(passstr) - - self.xml.get_widget('resource_entry').set_text(gajim.config.get_per( - 'accounts', self.account, 'resource')) - self.xml.get_widget('adjust_priority_with_status_checkbutton').set_active( - gajim.config.get_per('accounts', self.account, - 'adjust_priority_with_status')) - spinbutton = self.xml.get_widget('priority_spinbutton') - if gajim.config.get('enable_negative_priority'): - spinbutton.set_range(-128, 127) - spinbutton.set_value(gajim.config.get_per('accounts', self.account, - 'priority')) - - usessl = gajim.config.get_per('accounts', self.account, 'usessl') - self.xml.get_widget('use_ssl_checkbutton').set_active(usessl) - - self.xml.get_widget('send_keepalive_checkbutton').set_active( - gajim.config.get_per('accounts', self.account, - 'keep_alives_enabled')) - - use_custom_host = gajim.config.get_per('accounts', self.account, - 'use_custom_host') - self.xml.get_widget('custom_host_port_checkbutton').set_active( - use_custom_host) - custom_host = gajim.config.get_per('accounts', self.account, - 'custom_host') - if not custom_host: - custom_host = gajim.config.get_per('accounts', - self.account, 'hostname') - self.xml.get_widget('custom_host_entry').set_text(custom_host) - custom_port = gajim.config.get_per('accounts', self.account, - 'custom_port') - if not custom_port: - custom_port = 5222 - self.xml.get_widget('custom_port_entry').set_text(unicode(custom_port)) - - gpg_key_label = self.xml.get_widget('gpg_key_label') - if gajim.config.get('usegpg'): - self.init_account_gpg() - else: - gpg_key_label.set_text(_('OpenPGP is not usable in this computer')) - self.xml.get_widget('gpg_choose_button').set_sensitive(False) - self.xml.get_widget('autoconnect_checkbutton').set_active(gajim.config.\ - get_per('accounts', self.account, 'autoconnect')) - self.xml.get_widget('autoreconnect_checkbutton').set_active(gajim.config.\ - get_per('accounts', self.account, 'autoreconnect')) - - self.xml.get_widget('sync_with_global_status_checkbutton').set_active( - gajim.config.get_per('accounts', self.account, - 'sync_with_global_status')) - self.xml.get_widget('autoconnect_checkbutton').set_active( - gajim.config.get_per('accounts', self.account, 'autoconnect')) - self.xml.get_widget('use_ft_proxies_checkbutton').set_active( - gajim.config.get_per('accounts', self.account, 'use_ft_proxies')) - list_no_log_for = gajim.config.get_per('accounts', self.account, - 'no_log_for').split() - if self.account in list_no_log_for: - self.xml.get_widget('log_history_checkbutton').set_active(0) - - def option_changed(self, config, opt): - if gajim.config.get_per('accounts', self.account, opt) != config[opt]: - return True - return False - - def options_changed_need_relogin(self, config, options): - '''accepts configuration and options - (tupple of strings of the name of options changed) - and returns True or False depending on if at least one of the options - need relogin to server to apply''' - for option in options: - if self.option_changed(config, option): - return True - return False - - def on_adjust_priority_with_status_checkbutton_toggled(self, widget): - self.xml.get_widget('priority_spinbutton').set_sensitive( - not widget.get_active()) - - def on_save_button_clicked(self, widget): - '''When save button is clicked: Save information in config file''' - config = {} - name = self.xml.get_widget('name_entry').get_text().decode('utf-8') - if gajim.connections.has_key(self.account): - if name != self.account: - if gajim.connections[self.account].connected != 0: - dialogs.ErrorDialog( - _('You are currently connected to the server'), - _('To change the account name, you must be disconnected.')) - return - if len(gajim.events.get_events(self.account)): - dialogs.ErrorDialog(_('Unread events'), - _('To change the account name, you must read all pending ' - 'events.')) - return - if name in gajim.connections: - dialogs.ErrorDialog(_('Account Name Already Used'), - _('This name is already used by another of your accounts. ' - 'Please choose another name.')) - return - if (name == ''): - dialogs.ErrorDialog(_('Invalid account name'), - _('Account name cannot be empty.')) - return - if name.find(' ') != -1: - dialogs.ErrorDialog(_('Invalid account name'), - _('Account name cannot contain spaces.')) - return - jid = self.xml.get_widget('jid_entry').get_text().decode('utf-8') - - # 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 - - n, hn = jid.split('@', 1) - if not n: - pritext = _('Invalid Jabber ID') - sectext = _('A Jabber ID must be in the form "user@servername".') - dialogs.ErrorDialog(pritext, sectext) - return - - resource = self.xml.get_widget('resource_entry').get_text().decode( - 'utf-8') - try: - resource = helpers.parse_resource(resource) - except helpers.InvalidFormat, s: - pritext = _('Invalid Jabber ID') - dialogs.ErrorDialog(pritext, (s)) - return - - config['savepass'] = self.xml.get_widget( - 'save_password_checkbutton').get_active() - config['password'] = self.xml.get_widget('password_entry').get_text().\ - decode('utf-8') - config['resource'] = resource - config['adjust_priority_with_status'] = self.xml.get_widget( - 'adjust_priority_with_status_checkbutton').get_active() - config['priority'] = self.xml.get_widget('priority_spinbutton').\ - get_value_as_int() - config['autoconnect'] = self.xml.get_widget('autoconnect_checkbutton').\ - get_active() - config['autoreconnect'] = self.xml.get_widget( - 'autoreconnect_checkbutton').get_active() - - if self.account: - list_no_log_for = gajim.config.get_per('accounts', self.account, - 'no_log_for').split() - else: - list_no_log_for = [] - if self.account in list_no_log_for: - list_no_log_for.remove(self.account) - if not self.xml.get_widget('log_history_checkbutton').get_active(): - list_no_log_for.append(name) - config['no_log_for'] = ' '.join(list_no_log_for) - - config['sync_with_global_status'] = self.xml.get_widget( - 'sync_with_global_status_checkbutton').get_active() - config['use_ft_proxies'] = self.xml.get_widget( - 'use_ft_proxies_checkbutton').get_active() - - active = self.proxy_combobox.get_active() - proxy = self.proxy_combobox.get_model()[active][0].decode('utf-8') - if proxy == _('None'): - proxy = '' - config['proxy'] = proxy - - config['usessl'] = self.xml.get_widget('use_ssl_checkbutton').get_active() - config['name'] = n - config['hostname'] = hn - - config['use_custom_host'] = self.xml.get_widget( - 'custom_host_port_checkbutton').get_active() - custom_port = self.xml.get_widget('custom_port_entry').get_text() - try: - custom_port = int(custom_port) - except: - dialogs.ErrorDialog(_('Invalid entry'), - _('Custom port must be a port number.')) - return - config['custom_port'] = custom_port - config['custom_host'] = self.xml.get_widget( - 'custom_host_entry').get_text().decode('utf-8') - - # update in case the name was changed to local account's name - config['is_zeroconf'] = False - - config['keyname'] = self.xml.get_widget('gpg_name_label').get_text().\ - decode('utf-8') - if config['keyname'] == '': # no key selected - config['keyid'] = '' - config['savegpgpass'] = False - config['gpgpassword'] = '' - else: - config['keyid'] = self.xml.get_widget('gpg_key_label').get_text().\ - decode('utf-8') - config['savegpgpass'] = self.xml.get_widget( - 'gpg_save_password_checkbutton').get_active() - config['gpgpassword'] = self.xml.get_widget('gpg_password_entry' - ).get_text().decode('utf-8') - # if we modify the name of the account - if name != self.account: - # update variables - gajim.interface.instances[name] = gajim.interface.instances[ - self.account] - gajim.interface.minimized_controls[name] = \ - gajim.interface.minimized_controls[self.account] - gajim.nicks[name] = gajim.nicks[self.account] - gajim.block_signed_in_notifications[name] = \ - gajim.block_signed_in_notifications[self.account] - gajim.groups[name] = gajim.groups[self.account] - gajim.gc_connected[name] = gajim.gc_connected[self.account] - gajim.automatic_rooms[name] = gajim.automatic_rooms[self.account] - gajim.newly_added[name] = gajim.newly_added[self.account] - gajim.to_be_removed[name] = gajim.to_be_removed[self.account] - gajim.sleeper_state[name] = gajim.sleeper_state[self.account] - gajim.encrypted_chats[name] = gajim.encrypted_chats[self.account] - gajim.last_message_time[name] = \ - gajim.last_message_time[self.account] - gajim.status_before_autoaway[name] = \ - gajim.status_before_autoaway[self.account] - gajim.transport_avatar[name] = gajim.transport_avatar[self.account] - - gajim.contacts.change_account_name(self.account, name) - gajim.events.change_account_name(self.account, name) - - # change account variable for chat / gc controls - gajim.interface.msg_win_mgr.change_account_name(self.account, name) - # upgrade account variable in opened windows - for kind in ('infos', 'disco', 'gc_config', 'search'): - for j in gajim.interface.instances[name][kind]: - gajim.interface.instances[name][kind][j].account = name - - # ServiceCache object keep old property account - if hasattr(gajim.connections[self.account], 'services_cache'): - gajim.connections[self.account].services_cache.account = name - del gajim.interface.instances[self.account] - del gajim.interface.minimized_controls[self.account] - del gajim.nicks[self.account] - del gajim.block_signed_in_notifications[self.account] - del gajim.groups[self.account] - del gajim.gc_connected[self.account] - del gajim.automatic_rooms[self.account] - del gajim.newly_added[self.account] - del gajim.to_be_removed[self.account] - del gajim.sleeper_state[self.account] - del gajim.encrypted_chats[self.account] - del gajim.last_message_time[self.account] - del gajim.status_before_autoaway[self.account] - del gajim.transport_avatar[self.account] - gajim.connections[self.account].name = name - gajim.connections[name] = gajim.connections[self.account] - del gajim.connections[self.account] - gajim.config.del_per('accounts', self.account) - gajim.config.add_per('accounts', name) - self.account = name - - resend_presence = False - if gajim.connections[self.account].connected == 0: # we're disconnected - relogin_needed = False - else: # we're connected to the account we want to apply changes - # check if relogin is needed - relogin_needed = False - if self.options_changed_need_relogin(config, - ('resource', 'proxy', 'usessl', 'keyname', - 'use_custom_host', 'custom_host')): - relogin_needed = True - - elif config['use_custom_host'] and (self.option_changed(config, - 'custom_host') or self.option_changed(config, 'custom_port')): - relogin_needed = True - - if self.option_changed(config, 'use_ft_proxies') and \ - config['use_ft_proxies']: - gajim.connections[self.account].discover_ft_proxies() - - if self.option_changed(config, 'priority') or self.option_changed( - config, 'adjust_priority_with_status'): - resend_presence = True - - for opt in config: - gajim.config.set_per('accounts', name, opt, config[opt]) - if config['savepass']: - passwords.save_password(name, config['password']) - else: - passwords.save_password(name, '') - # refresh accounts window - if gajim.interface.instances.has_key('accounts'): - gajim.interface.instances['accounts'].init_accounts() - # refresh roster - gajim.interface.roster.draw_roster() - gajim.interface.save_config() - self.window.destroy() - - if relogin_needed: - def login(account, show_before, status_before): - ''' login with previous status''' - # first make sure connection is really closed, - # 0.5 may not be enough - gajim.connections[account].disconnect(True) - gajim.interface.roster.send_status(account, show_before, - status_before) - - def relog(widget): - self.dialog.destroy() - show_before = gajim.SHOW_LIST[gajim.connections[self.account].\ - connected] - status_before = gajim.connections[self.account].status - gajim.interface.roster.send_status(self.account, 'offline', - _('Be right back.')) - gobject.timeout_add(500, login, self.account, show_before, - status_before) - - def resend(widget): - self.resend_presence() - - on_no = None - if resend_presence: - on_no = resend - self.dialog = dialogs.YesNoDialog(_('Relogin now?'), - _('If you want all the changes to apply instantly, ' - 'you must relogin.'), on_response_yes = relog, - on_response_no = on_no) - elif resend_presence: - self.resend_presence() - - def resend_presence(self): - show = gajim.SHOW_LIST[gajim.connections[self.account].connected] - status = gajim.connections[self.account].status - gajim.connections[self.account].change_status(show, status) - - def on_change_password_button_clicked(self, widget): - try: - dialog = dialogs.ChangePasswordDialog(self.account) - except GajimGeneralException: - #if we showed ErrorDialog, there will not be dialog instance - return - - new_password = dialog.run() - if new_password != -1: - gajim.connections[self.account].change_password(new_password) - if self.xml.get_widget('save_password_checkbutton').get_active(): - self.xml.get_widget('password_entry').set_text(new_password) - - def on_edit_details_button_clicked(self, widget): - if not gajim.interface.instances.has_key(self.account): - dialogs.ErrorDialog(_('No such account available'), - _('You must create your account before editing your personal ' - 'information.')) - return - - # show error dialog if account is newly created (not in gajim.connections) - if not gajim.connections.has_key(self.account) or \ - gajim.connections[self.account].connected < 2: - dialogs.ErrorDialog(_('You are not connected to the server'), - _('Without a connection, you can not edit your personal information.')) - return - - if not gajim.connections[self.account].vcard_supported: - dialogs.ErrorDialog(_("Your server doesn't support Vcard"), - _("Your server can't save your personal information.")) - return - - gajim.interface.edit_own_details(self.account) - - def on_manage_proxies_button_clicked(self, widget): - if gajim.interface.instances.has_key('manage_proxies'): - gajim.interface.instances['manage_proxies'].window.present() - else: - gajim.interface.instances['manage_proxies'] = \ - ManageProxiesWindow() - - def on_synchronise_contacts_button_clicked(self, widget): - try: - dialog = dialogs.SynchroniseSelectAccountDialog(self.account) - except GajimGeneralException: - # If we showed ErrorDialog, there will not be dialog instance - return - - def on_gpg_choose_button_clicked(self, widget, data = None): - if gajim.connections.has_key(self.account): - secret_keys = gajim.connections[self.account].ask_gpg_secrete_keys() - - # self.account is None and/or gajim.connections is {} - else: - from common import GnuPG - if GnuPG.USE_GPG: - secret_keys = GnuPG.GnuPG().get_secret_keys() - else: - secret_keys = [] - if not secret_keys: - dialogs.ErrorDialog(_('Failed to get secret keys'), - _('There was a problem retrieving your OpenPGP secret keys.')) - return - secret_keys[_('None')] = _('None') - instance = dialogs.ChooseGPGKeyDialog(_('OpenPGP Key Selection'), - _('Choose your OpenPGP key'), secret_keys) - keyID = instance.run() - if keyID is None: - return - checkbutton = self.xml.get_widget('gpg_save_password_checkbutton') - gpg_key_label = self.xml.get_widget('gpg_key_label') - gpg_name_label = self.xml.get_widget('gpg_name_label') - if keyID[0] == _('None'): - gpg_key_label.set_text(_('No key selected')) - gpg_name_label.set_text('') - checkbutton.set_sensitive(False) - self.xml.get_widget('gpg_password_entry').set_sensitive(False) - else: - gpg_key_label.set_text(keyID[0]) - gpg_name_label.set_text(keyID[1]) - checkbutton.set_sensitive(True) - checkbutton.set_active(False) - self.xml.get_widget('gpg_password_entry').set_text('') - - def on_checkbutton_toggled_and_clear(self, widget, widgets): - self.on_checkbutton_toggled(widget, widgets) - for w in widgets: - if not widget.get_active(): - w.set_text('') - - def on_use_ssl_checkbutton_toggled(self, widget): - isactive = widget.get_active() - if isactive: - self.xml.get_widget('custom_port_entry').set_text('5223') - else: - self.xml.get_widget('custom_port_entry').set_text('5222') - - def on_send_keepalive_checkbutton_toggled(self, widget): - isactive = widget.get_active() - gajim.config.set_per('accounts', self.account, - 'keep_alives_enabled', isactive) - - def on_custom_host_port_checkbutton_toggled(self, widget): - isactive = widget.get_active() - self.xml.get_widget('custom_host_port_hbox').set_sensitive(isactive) - - def on_gpg_save_password_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled_and_clear(widget, [ - self.xml.get_widget('gpg_password_entry')]) - - def on_save_password_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled_and_clear(widget, - [self.xml.get_widget('password_entry')]) - self.xml.get_widget('password_entry').grab_focus() - #---------- ManageProxiesWindow class -------------# class ManageProxiesWindow: def __init__(self): @@ -1727,11 +1191,9 @@ def on_manage_proxies_window_destroy(self, widget): for account in gajim.connections: - if gajim.interface.instances[account].has_key('account_modification'): - gajim.interface.instances[account]['account_modification'].\ + if gajim.interface.instances.has_key('accounts'): + gajim.interface.instances[account]['accounts'].\ update_proxy_list() - if gajim.interface.instances.has_key('account_modification'): - gajim.interface.instances['account_modification'].update_proxy_list() del gajim.interface.instances['manage_proxies'] def on_add_proxy_button_clicked(self, widget): @@ -1862,69 +1324,335 @@ def on_close_button_clicked(self, widget): self.window.destroy() + def on_accounts_window_destroy(self, widget): + if gajim.interface.instances.has_key('accounts'): + del gajim.interface.instances['accounts'] + def __init__(self): self.xml = gtkgui_helpers.get_glade('accounts_window.glade') self.window = self.xml.get_widget('accounts_window') self.window.set_transient_for(gajim.interface.roster.window) self.accounts_treeview = self.xml.get_widget('accounts_treeview') - self.modify_button = self.xml.get_widget('modify_button') self.remove_button = self.xml.get_widget('remove_button') - model = gtk.ListStore(str, str, bool) + self.rename_button = self.xml.get_widget('rename_button') + #FIXME: I don't understand why this import is necessary + import os + path_to_kbd_input_img = os.path.join(gajim.DATA_DIR, 'pixmaps', + 'kbd_input.png') + img = self.xml.get_widget('rename_image') + img.set_from_file(path_to_kbd_input_img) + self.notebook = self.xml.get_widget('notebook') + # Name + model = gtk.ListStore(str) self.accounts_treeview.set_model(model) - #columns + # column renderer = gtk.CellRendererText() self.accounts_treeview.insert_column_with_attributes(-1, _('Name'), renderer, text = 0) - renderer = gtk.CellRendererText() - self.accounts_treeview.insert_column_with_attributes(-1, - _('Server'), renderer, text = 1) + + self.current_account = None + # When we fill info, we don't want to handle the changed signals + self.ignore_events = False + self.need_relogin = False + self.resend_presence = False + + self.update_proxy_list() self.xml.signal_autoconnect(self) self.init_accounts() self.window.show_all() - #Merge accounts + # Merge accounts st = gajim.config.get('mergeaccounts') self.xml.get_widget('merge_checkbutton').set_active(st) import os - avahi_error = False + self.avahi_available = True try: import avahi except ImportError: - avahi_error = True + self.avahi_available = False - # enable zeroconf - st = gajim.config.get('enable_zeroconf') - w = self.xml.get_widget('enable_zeroconf_checkbutton') - w.set_active(st) - if os.name == 'nt' or (avahi_error and not w.get_active()): - w.set_sensitive(False) - self.zeroconf_toggled_id = w.connect('toggled', - self.on_enable_zeroconf_checkbutton_toggled) - def on_accounts_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: self.window.destroy() + def select_account(self, account): + model = self.accounts_treeview.get_model() + iter = model.get_iter_root() + while iter: + acct = model[iter][0].decode('utf-8') + if account == acct: + self.accounts_treeview.set_cursor(model.get_path(iter)) + return + iter = model.iter_next(iter) + def init_accounts(self): '''initialize listStore with existing accounts''' - self.modify_button.set_sensitive(False) self.remove_button.set_sensitive(False) + self.rename_button.set_sensitive(False) + self.current_account = None + self.init_account() model = self.accounts_treeview.get_model() model.clear() - for account in gajim.connections: + for account in gajim.config.get_per('accounts'): iter = model.append() - model.set(iter, 0, account, 1, gajim.get_hostname_from_account( - account)) + model.set(iter, 0, account) + def resend(self): + show = gajim.SHOW_LIST[gajim.connections[self.current_account].connected] + status = gajim.connections[self.current_account].status + gajim.connections[self.current_account].change_status(show, status) + def on_accounts_treeview_cursor_changed(self, widget): - '''Activate delete and modify buttons when a row is selected''' - self.modify_button.set_sensitive(True) + '''Activate modify buttons when a row is selected, update accounts info''' + # Select previous row + sel = self.accounts_treeview.get_selection() + (model, iter) = sel.get_selected() + if self.need_relogin and self.current_account == gajim.ZEROCONF_ACCT_NAME: + if gajim.connections.has_key(gajim.ZEROCONF_ACC_NAME): + gajim.connections[gajim.ZEROCONF_ACC_NAME].update_details() + return + + elif self.need_relogin and gajim.connections[self.current_account].\ + connected > 0: + def login(account, show_before, status_before): + ''' login with previous status''' + # first make sure connection is really closed, + # 0.5 may not be enough + gajim.connections[account].disconnect(True) + gajim.interface.roster.send_status(account, show_before, + status_before) + + def relog(): + self.dialog.destroy() + show_before = gajim.SHOW_LIST[gajim.connections[ + self.current_account].connected] + status_before = gajim.connections[self.current_account].status + gajim.interface.roster.send_status(self.current_account, 'offline', + _('Be right back.')) + gobject.timeout_add(500, login, self.current_account, show_before, + status_before) + + self.dialog = dialogs.YesNoDialog(_('Relogin now?'), + _('If you want all the changes to apply instantly, ' + 'you must relogin.')) + resp = self.dialog.get_response() + if resp == gtk.RESPONSE_YES: + relog() + elif self.resend_presence: + self.resend() + elif self.resend_presence: + self.resend() + + self.need_relogin = False + self.resend_presence = False self.remove_button.set_sensitive(True) + self.rename_button.set_sensitive(True) + if iter: + account = model[iter][0].decode('utf-8') + self.current_account = account + if account == gajim.ZEROCONF_ACC_NAME: + self.remove_button.set_sensitive(False) + self.rename_button.set_sensitive(False) + self.init_account() + self.update_proxy_list() - def on_new_button_clicked(self, widget): - '''When new button is clicked: open an account information window''' + def update_proxy_list(self): + if self.current_account: + our_proxy = gajim.config.get_per('accounts', self.current_account, + 'proxy') + else: + our_proxy = '' + + if not our_proxy: + our_proxy = _('None') + proxy_combobox = self.xml.get_widget('proxies_combobox1') + model = gtk.ListStore(str) + proxy_combobox.set_model(model) + l = gajim.config.get_per('proxies') + l.insert(0, _('None')) + for i in xrange(len(l)): + model.append([l[i]]) + if our_proxy == l[i]: + proxy_combobox.set_active(i) + + def init_account(self): + if not self.current_account: + self.notebook.set_current_page(0) + return + if gajim.config.get_per('accounts', self.current_account, 'is_zeroconf'): + self.ignore_events = True + self.init_zeroconf_account() + self.ignore_events = False + self.notebook.set_current_page(2) + return + self.ignore_events = True + self.init_normal_account() + self.ignore_events = False + self.notebook.set_current_page(1) + + def init_zeroconf_account(self): + enable = gajim.config.get('enable_zeroconf') + self.xml.get_widget('enable_zeroconf_checkbutton2').set_active(enable) + self.xml.get_widget('zeroconf_notebook').set_sensitive(enable) + # General tab + st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, + 'autoconnect') + self.xml.get_widget('autoconnect_checkbutton2').set_active(st) + + list_no_log_for = gajim.config.get_per('accounts', + gajim.ZEROCONF_ACC_NAME, 'no_log_for').split() + if gajim.ZEROCONF_ACC_NAME in list_no_log_for: + self.xml.get_widget('log_history_checkbutton2').set_active(0) + else: + self.xml.get_widget('log_history_checkbutton2').set_active(1) + + st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, + 'sync_with_global_status') + self.xml.get_widget('sync_with_global_status_checkbutton2').set_active(st) + + st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, + 'use_custom_host') + self.xml.get_widget('custom_port_checkbutton2').set_active(st) + self.xml.get_widget('custom_port_entry2').set_sensitive(st) + + st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, + 'custom_port') + if not st: + gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, + 'custom_port', '5298') + st = '5298' + self.xml.get_widget('custom_port_entry2').set_text(str(st)) + + # Personal tab + gpg_key_label = self.xml.get_widget('gpg_key_label2') + if gajim.config.get('usegpg'): + self.xml.get_widget('gpg_choose_button2').set_sensitive(True) + self.init_account_gpg() + else: + gpg_key_label.set_text(_('OpenPGP is not usable in this computer')) + self.xml.get_widget('gpg_choose_button2').set_sensitive(False) + + for opt in ('first_name', 'last_name', 'jabber_id', 'email'): + st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, + 'zeroconf_' + opt) + self.xml.get_widget(opt + '_entry2').set_text(st) + + def init_account_gpg(self): + account = self.current_account + keyid = gajim.config.get_per('accounts', account, 'keyid') + keyname = gajim.config.get_per('accounts', account, 'keyname') + savegpgpass = gajim.config.get_per('accounts', account, 'savegpgpass') + + if account == gajim.ZEROCONF_ACC_NAME: + widget_name_add = '2' + else: + widget_name_add = '1' + + gpg_key_label = self.xml.get_widget('gpg_key_label' + widget_name_add) + gpg_name_label = self.xml.get_widget('gpg_name_label' + widget_name_add) + gpg_save_password_checkbutton = \ + self.xml.get_widget('gpg_save_password_checkbutton' + widget_name_add) + gpg_password_entry = self.xml.get_widget('gpg_password_entry' + \ + widget_name_add) + + if not keyid or not gajim.config.get('usegpg'): + gpg_save_password_checkbutton.set_sensitive(False) + gpg_password_entry.set_sensitive(False) + gpg_key_label.set_text(_('No key selected')) + gpg_name_label.set_text('') + return + + gpg_key_label.set_text(keyid) + gpg_name_label.set_text(keyname) + gpg_save_password_checkbutton.set_sensitive(True) + gpg_save_password_checkbutton.set_active(savegpgpass) + + if savegpgpass: + gpg_password_entry.set_sensitive(True) + gpgpassword = gajim.config.get_per('accounts', account, 'gpgpassword') + gpg_password_entry.set_text(gpgpassword) + + def init_normal_account(self): + account = self.current_account + # Account tab + jid = gajim.config.get_per('accounts', account, 'name') \ + + '@' + gajim.config.get_per('accounts', account, 'hostname') + self.xml.get_widget('jid_entry1').set_text(jid) + savepass = gajim.config.get_per('accounts', account, 'savepass') + self.xml.get_widget('save_password_checkbutton1').set_active(savepass) + password_entry = self.xml.get_widget('password_entry1') + if savepass: + passstr = passwords.get_password(account) or '' + password_entry.set_sensitive(True) + else: + passstr = '' + password_entry.set_sensitive(False) + password_entry.set_text(passstr) + + self.xml.get_widget('resource_entry1').set_text(gajim.config.get_per( + 'accounts', account, 'resource')) + self.xml.get_widget('adjust_priority_with_status_checkbutton1').\ + set_active(gajim.config.get_per('accounts', account, + 'adjust_priority_with_status')) + spinbutton = self.xml.get_widget('priority_spinbutton1') + if gajim.config.get('enable_negative_priority'): + spinbutton.set_range(-128, 127) + else: + spinbutton.set_range(0, 127) + spinbutton.set_value(gajim.config.get_per('accounts', account, + 'priority')) + + # Connection tab + usessl = gajim.config.get_per('accounts', account, 'usessl') + self.xml.get_widget('use_ssl_checkbutton1').set_active(usessl) + + self.xml.get_widget('send_keepalive_checkbutton1').set_active( + gajim.config.get_per('accounts', account, 'keep_alives_enabled')) + + use_custom_host = gajim.config.get_per('accounts', account, + 'use_custom_host') + self.xml.get_widget('custom_host_port_checkbutton1').set_active( + use_custom_host) + custom_host = gajim.config.get_per('accounts', account, 'custom_host') + if not custom_host: + custom_host = gajim.config.get_per('accounts', account, 'hostname') + self.xml.get_widget('custom_host_entry1').set_text(custom_host) + custom_port = gajim.config.get_per('accounts', account, 'custom_port') + if not custom_port: + custom_port = 5222 + self.xml.get_widget('custom_port_entry1').set_text(unicode(custom_port)) + + # Personal tab + gpg_key_label = self.xml.get_widget('gpg_key_label1') + if gajim.config.get('usegpg'): + self.xml.get_widget('gpg_choose_button1').set_sensitive(True) + self.init_account_gpg() + else: + gpg_key_label.set_text(_('OpenPGP is not usable in this computer')) + self.xml.get_widget('gpg_choose_button1').set_sensitive(False) + + # General tab + self.xml.get_widget('autoconnect_checkbutton1').set_active(gajim.config.\ + get_per('accounts', account, 'autoconnect')) + self.xml.get_widget('autoreconnect_checkbutton1').set_active(gajim. + config.get_per('accounts', account, 'autoreconnect')) + + list_no_log_for = gajim.config.get_per('accounts', account, + 'no_log_for').split() + if account in list_no_log_for: + self.xml.get_widget('log_history_checkbutton1').set_active(False) + else: + self.xml.get_widget('log_history_checkbutton1').set_active(True) + + self.xml.get_widget('sync_with_global_status_checkbutton1').set_active( + gajim.config.get_per('accounts', account, 'sync_with_global_status')) + self.xml.get_widget('use_ft_proxies_checkbutton1').set_active( + gajim.config.get_per('accounts', account, 'use_ft_proxies')) + + def on_add_button_clicked(self, widget): + '''When add button is clicked: open an account information window''' if gajim.interface.instances.has_key('account_creation_wizard'): gajim.interface.instances['account_creation_wizard'].window.present() else: @@ -1934,27 +1662,17 @@ def on_remove_button_clicked(self, widget): '''When delete button is clicked: Remove an account from the listStore and from the config file''' - sel = self.accounts_treeview.get_selection() - (model, iter) = sel.get_selected() - if not iter: + if not self.current_account: return - account = model.get_value(iter, 0).decode('utf-8') + account = self.current_account if len(gajim.events.get_events(account)): dialogs.ErrorDialog(_('Unread events'), _('Read all pending events before removing this account.')) return if gajim.config.get_per('accounts', account, 'is_zeroconf'): - w = self.xml.get_widget('enable_zeroconf_checkbutton') - w.set_active(False) + # Should never happen as button is insensitive return - else: - if gajim.interface.instances[account].has_key('remove_account'): - gajim.interface.instances[account]['remove_account'].window.present( - ) - else: - gajim.interface.instances[account]['remove_account'] = \ - RemoveAccountWindow(account) win_opened = False if gajim.interface.msg_win_mgr.get_controls(acct = account): @@ -1985,39 +1703,417 @@ else: remove(widget, account) - def on_modify_button_clicked(self, widget): - '''When modify button is clicked: - open/show the account modification window for this account''' - sel = self.accounts_treeview.get_selection() - (model, iter) = sel.get_selected() - if not iter: + def on_rename_button_clicked(self, widget): + if gajim.connections[self.current_account].connected != 0: + dialogs.ErrorDialog( + _('You are currently connected to the server'), + _('To change the account name, you must be disconnected.')) return - account = model[iter][0].decode('utf-8') - self.show_modification_window(account) + if len(gajim.events.get_events(self.current_account)): + dialogs.ErrorDialog(_('Unread events'), + _('To change the account name, you must read all pending ' + 'events.')) + return + # Get the new name + def on_renamed(new_name, old_name): + if new_name in gajim.connections: + dialogs.ErrorDialog(_('Account Name Already Used'), + _('This name is already used by another of your accounts. ' + 'Please choose another name.')) + return + if (new_name == ''): + dialogs.ErrorDialog(_('Invalid account name'), + _('Account name cannot be empty.')) + return + if new_name.find(' ') != -1: + dialogs.ErrorDialog(_('Invalid account name'), + _('Account name cannot contain spaces.')) + return + # update variables + gajim.interface.instances[new_name] = gajim.interface.instances[ + old_name] + gajim.interface.minimized_controls[new_name] = \ + gajim.interface.minimized_controls[old_name] + gajim.nicks[new_name] = gajim.nicks[old_name] + gajim.block_signed_in_notifications[new_name] = \ + gajim.block_signed_in_notifications[old_name] + gajim.groups[new_name] = gajim.groups[old_name] + gajim.gc_connected[new_name] = gajim.gc_connected[old_name] + gajim.automatic_rooms[new_name] = gajim.automatic_rooms[old_name] + gajim.newly_added[new_name] = gajim.newly_added[old_name] + gajim.to_be_removed[new_name] = gajim.to_be_removed[old_name] + gajim.sleeper_state[new_name] = gajim.sleeper_state[old_name] + gajim.encrypted_chats[new_name] = gajim.encrypted_chats[old_name] + gajim.last_message_time[new_name] = gajim.last_message_time[old_name] + gajim.status_before_autoaway[new_name] = \ + gajim.status_before_autoaway[old_name] + gajim.transport_avatar[new_name] = gajim.transport_avatar[old_name] - def on_accounts_treeview_row_activated(self, widget, path, column): - model = widget.get_model() - account = model[path][0].decode('utf-8') - self.show_modification_window(account) + gajim.contacts.change_account_name(old_name, new_name) + gajim.events.change_account_name(old_name, new_name) - def show_modification_window(self, account): - if gajim.config.get_per('accounts', account, 'is_zeroconf'): - if gajim.interface.instances.has_key('zeroconf_properties'): - gajim.interface.instances['zeroconf_properties'].window.present() - else: - gajim.interface.instances['zeroconf_properties'] = \ - ZeroconfPropertiesWindow() + # change account variable for chat / gc controls + gajim.interface.msg_win_mgr.change_account_name(old_name, new_name) + # upgrade account variable in opened windows + for kind in ('infos', 'disco', 'gc_config', 'search'): + for j in gajim.interface.instances[new_name][kind]: + gajim.interface.instances[new_name][kind][j].account = new_name + + # ServiceCache object keep old property account + if hasattr(gajim.connections[old_name], 'services_cache'): + gajim.connections[self.account].services_cache.account = new_name + del gajim.interface.instances[old_name] + del gajim.interface.minimized_controls[old_name] + del gajim.nicks[old_name] + del gajim.block_signed_in_notifications[old_name] + del gajim.groups[old_name] + del gajim.gc_connected[old_name] + del gajim.automatic_rooms[old_name] + del gajim.newly_added[old_name] + del gajim.to_be_removed[old_name] + del gajim.sleeper_state[old_name] + del gajim.encrypted_chats[old_name] + del gajim.last_message_time[old_name] + del gajim.status_before_autoaway[old_name] + del gajim.transport_avatar[old_name] + gajim.connections[old_name].name = new_name + gajim.connections[new_name] = gajim.connections[old_name] + del gajim.connections[old_name] + gajim.config.add_per('accounts', new_name) + old_config = gajim.config.get_per('accounts', old_name) + for opt in old_config: + gajim.config.set_per('accounts', new_name, opt, old_config[opt][1]) + gajim.config.del_per('accounts', old_name) + if self.current_account == old_name: + self.current_account = new_name + # refresh roster + gajim.interface.roster.draw_roster() + self.init_accounts() + self.select_account(new_name) + + title = _('Rename Account') + message = _('Enter a new name for account %s') % self.current_account + old_text = self.current_account + dialogs.InputDialog(title, message, old_text, is_modal=False, + ok_handler=(on_renamed, self.current_account)) + + def option_changed(self, option, value): + return gajim.config.get_per('accounts', self.current_account, option) != \ + value + + def on_jid_entry1_focus_out_event(self, widget, event): + if self.ignore_events: + return + jid = widget.get_text() + # check if jid is conform to RFC and stringprep it + try: + jid = helpers.parse_jid(jid) + except helpers.InvalidFormat, s: + if not widget.is_focus(): + pritext = _('Invalid Jabber ID') + dialogs.ErrorDialog(pritext, str(s)) + gobject.idle_add(lambda: widget.grab_focus()) + return + + jid_splited = jid.split('@', 1) + if len(jid_splited) != 2: + if not widget.is_focus(): + pritext = _('Invalid Jabber ID') + sectext = _('A Jabber ID must be in the form "user@servername".') + dialogs.ErrorDialog(pritext, sectext) + gobject.idle_add(lambda: widget.grab_focus()) + return + + if self.option_changed('name', jid_splited[0]) or \ + self.option_changed('hostname', jid_splited[1]): + self.need_relogin = True + + gajim.config.set_per('accounts', self.current_account, 'name', + jid_splited[0]) + gajim.config.set_per('accounts', self.current_account, 'hostname', + jid_splited[1]) + + def on_password_entry1_changed(self, widget): + if self.ignore_events: + return + passwords.save_password(self.current_account, widget.get_text()) + + def on_save_password_checkbutton1_toggled(self, widget): + if self.ignore_events: + return + active = widget.get_active() + gajim.config.set_per('accounts', self.current_account, 'savepass', active) + if active: + password = self.xml.get_widget('password_entry1').get_text() + passwords.save_password(self.current_account, password) else: - if gajim.interface.instances[account].has_key('account_modification'): - gajim.interface.instances[account]['account_modification'].window.\ - present() + passwords.save_password(self.current_account, '') + + def on_resource_entry1_focus_out_event(self, widget, event): + if self.ignore_events: + return + resource = self.xml.get_widget('resource_entry1').get_text().decode( + 'utf-8') + try: + resource = helpers.parse_resource(resource) + except helpers.InvalidFormat, s: + if not widget.is_focus(): + pritext = _('Invalid Jabber ID') + dialogs.ErrorDialog(pritext, str(s)) + gobject.idle_add(lambda: widget.grab_focus()) + return + + if self.option_changed('resource', resource): + self.need_relogin = True + + gajim.config.set_per('accounts', self.current_account, 'resource', + resource) + + def on_adjust_priority_with_status_checkbutton1_toggled(self, widget): + self.xml.get_widget('priority_spinbutton1').set_sensitive( + not widget.get_active()) + self.on_checkbutton_toggled(widget, 'adjust_priority_with_status', + account = self.current_account) + + def on_priority_spinbutton1_value_changed(self, widget): + prio = widget.get_value_as_int() + + if self.option_changed('priority', prio): + self.resend_presence = True + + gajim.config.set_per('accounts', self.current_account, 'priority', prio) + + def on_synchronise_contacts_button1_clicked(self, widget): + try: + dialog = dialogs.SynchroniseSelectAccountDialog(self.current_account) + except GajimGeneralException: + # If we showed ErrorDialog, there will not be dialog instance + return + + def on_change_password_button1_clicked(self, widget): + try: + dialog = dialogs.ChangePasswordDialog(self.current_account) + except GajimGeneralException: + # if we showed ErrorDialog, there will not be dialog instance + return + + new_password = dialog.run() + if new_password != -1: + gajim.connections[self.current_account].change_password(new_password) + if self.xml.get_widget('save_password_checkbutton1').get_active(): + self.xml.get_widget('password_entry1').set_text(new_password) + + def on_autoconnect_checkbutton_toggled(self, widget): + if self.ignore_events: + return + self.on_checkbutton_toggled(widget, 'autoconnect', + account=self.current_account) + + def on_autoreconnect_checkbutton_toggled(self, widget): + if self.ignore_events: + return + self.on_checkbutton_toggled(widget, 'autoreconnect', + account=self.current_account) + + def on_log_history_checkbutton_toggled(self, widget): + if self.ignore_events: + return + list_no_log_for = gajim.config.get_per('accounts', self.current_account, + 'no_log_for').split() + if self.current_account in list_no_log_for: + list_no_log_for.remove(self.current_account) + if not self.xml.get_widget('log_history_checkbutton').get_active(): + list_no_log_for.append(self.current_account) + gajim.config.set_per('accounts', self.current_account, 'no_log_for', + ' '.join(list_no_log_for)) + + def on_sync_with_global_status_checkbutton_toggled(self, widget): + if self.ignore_events: + return + self.on_checkbutton_toggled(widget, 'sync_with_global_status', + account=self.current_account) + + def on_use_ft_proxies_checkbutton1_toggled(self, widget): + if self.ignore_events: + return + self.on_checkbutton_toggled(widget, 'use_ft_proxies', + account=self.current_account) + + def on_proxies_combobox1_changed(self, widget): + active = widget.get_active() + proxy = widget.get_model()[active][0].decode('utf-8') + if proxy == _('None'): + proxy = '' + + if self.option_changed('proxy', proxy): + self.need_relogin = True + + gajim.config.set_per('accounts', self.current_account, 'proxy', proxy) + + def on_manage_proxies_button1_clicked(self, widget): + if gajim.interface.instances.has_key('manage_proxies'): + gajim.interface.instances['manage_proxies'].window.present() + else: + gajim.interface.instances['manage_proxies'] = ManageProxiesWindow() + + def on_use_ssl_checkbutton1_toggled(self, widget): + if self.ignore_events: + return + + if self.option_changed('usessl', widget.get_active()): + self.need_relogin = True + + isactive = widget.get_active() + if isactive: + self.xml.get_widget('custom_port_entry1').set_text('5223') + else: + self.xml.get_widget('custom_port_entry1').set_text('5222') + + self.on_checkbutton_toggled(widget, 'usessl', + account=self.current_account) + + def on_send_keepalive_checkbutton1_toggled(self, widget): + if self.ignore_events: + return + self.on_checkbutton_toggled(widget, 'keep_alives_enabled', + account=self.current_account) + + def on_custom_host_port_checkbutton1_toggled(self, widget): + if self.option_changed('use_custom_host', widget.get_active()): + self.need_relogin = True + + self.on_checkbutton_toggled(widget, 'use_custom_host', + account=self.current_account) + active = widget.get_active() + self.xml.get_widget('custom_host_port_hbox1').set_sensitive(active) + + def on_custom_host_entry1_changed(self, widget): + if self.ignore_events: + return + host = widget.get_text().decode('utf-8') + if self.option_changed('custom_host', host): + self.need_relogin = True + gajim.config.set_per('accounts', self.current_account, 'custom_host', + host) + + def on_custom_port_entry_focus_out_event(self, widget, event): + if self.ignore_events: + return + custom_port = widget.get_text() + try: + custom_port = int(custom_port) + except: + if not widget.is_focus(): + dialogs.ErrorDialog(_('Invalid entry'), + _('Custom port must be a port number.')) + gobject.idle_add(lambda: widget.grab_focus()) + return + if self.option_changed('custom_port', custom_port): + self.need_relogin = True + gajim.config.set_per('accounts', self.current_account, 'custom_port', + custom_port) + + def on_gpg_choose_button_clicked(self, widget, data = None): + if gajim.connections.has_key(self.current_account): + secret_keys = gajim.connections[self.current_account].\ + ask_gpg_secrete_keys() + + # self.current_account is None and/or gajim.connections is {} + else: + from common import GnuPG + if GnuPG.USE_GPG: + secret_keys = GnuPG.GnuPG().get_secret_keys() else: - gajim.interface.instances[account]['account_modification'] = \ - AccountModificationWindow(account) + secret_keys = [] + if not secret_keys: + dialogs.ErrorDialog(_('Failed to get secret keys'), + _('There was a problem retrieving your OpenPGP secret keys.')) + return + secret_keys[_('None')] = _('None') + instance = dialogs.ChooseGPGKeyDialog(_('OpenPGP Key Selection'), + _('Choose your OpenPGP key'), secret_keys) + keyID = instance.run() + if keyID is None: + return + if self.current_account == gajim.ZEROCONF_ACC_NAME: + wiget_name_ext = '2' + else: + wiget_name_ext = '1' + checkbutton = self.xml.get_widget('gpg_save_password_checkbutton' + \ + wiget_name_ext) + gpg_key_label = self.xml.get_widget('gpg_key_label' + wiget_name_ext) + gpg_name_label = self.xml.get_widget('gpg_name_label' + wiget_name_ext) + gpg_password_entry = self.xml.get_widget('gpg_password_entry' + \ + wiget_name_ext) + if keyID[0] == _('None'): + gpg_key_label.set_text(_('No key selected')) + gpg_name_label.set_text('') + checkbutton.set_sensitive(False) + gpg_password_entry.set_sensitive(False) + if self.option_changed('keyid', ''): + self.need_relogin = True + gajim.config.set_per('accounts', self.current_account, 'keyname', '') + gajim.config.set_per('accounts', self.current_account, 'keyid', '') + else: + gpg_key_label.set_text(keyID[0]) + gpg_name_label.set_text(keyID[1]) + checkbutton.set_sensitive(True) + if self.option_changed('keyid', keyID[0]): + self.need_relogin = True + gajim.config.set_per('accounts', self.current_account, 'keyname', + keyID[1]) + gajim.config.set_per('accounts', self.current_account, 'keyid', + keyID[0]) + gajim.config.set_per('accounts', self.current_account, 'savegpgpass', + False) + gajim.config.set_per('accounts', self.current_account, 'gpgpassword', '') + checkbutton.set_active(False) + gpg_password_entry.set_text('') + def on_gpg_save_password_checkbutton_toggled(self, widget): + if self.current_account == gajim.ZEROCONF_ACC_NAME: + wiget_name_ext = '2' + else: + wiget_name_ext = '1' + self.xml.get_widget('gpg_password_entry' + wiget_name_ext).set_sensitive( + widget.get_active()) + self.on_checkbutton_toggled(widget, 'savegpgpass', + account = self.current_account) + + def on_gpg_password_entry_changed(self, widget): + if self.ignore_events: + return + gajim.config.set_per('accounts', self.current_account, 'gpgpassword', + widget.get_text().decode('utf-8')) + + def on_edit_details_button1_clicked(self, widget): + if not gajim.interface.instances.has_key(self.current_account): + dialogs.ErrorDialog(_('No such account available'), + _('You must create your account before editing your personal ' + 'information.')) + return + + # show error dialog if account is newly created (not in gajim.connections) + if not gajim.connections.has_key(self.current_account) or \ + gajim.connections[self.current_account].connected < 2: + dialogs.ErrorDialog(_('You are not connected to the server'), + _('Without a connection, you can not edit your personal information.')) + return + + if not gajim.connections[self.current_account].vcard_supported: + dialogs.ErrorDialog(_("Your server doesn't support Vcard"), + _("Your server can't save your personal information.")) + return + + gajim.interface.edit_own_details(self.current_account) + def on_checkbutton_toggled(self, widget, config_name, - change_sensitivity_widgets = None): - gajim.config.set(config_name, widget.get_active()) + change_sensitivity_widgets = None, account = None): + if account: + gajim.config.set_per('accounts', account, config_name, + widget.get_active()) + else: + gajim.config.set(config_name, widget.get_active()) if change_sensitivity_widgets: for w in change_sensitivity_widgets: w.set_sensitive(widget.get_active()) @@ -2031,8 +2127,7 @@ gajim.interface.roster.regroup = False gajim.interface.roster.draw_roster() - - def on_enable_zeroconf_checkbutton_toggled(self, widget): + def on_enable_zeroconf_checkbutton2_toggled(self, widget): # don't do anything if there is an account with the local name but is a # normal account if gajim.connections.has_key(gajim.ZEROCONF_ACC_NAME) and not \ @@ -2041,14 +2136,11 @@ (_('Account Local already exists.'), _('Please rename or remove it before enabling link-local messaging' '.'))) - widget.disconnect(self.zeroconf_toggled_id) - widget.set_active(False) - self.zeroconf_toggled_id = widget.connect('toggled', - self.on_enable_zeroconf_checkbutton_toggled) return - if gajim.config.get('enable_zeroconf'): - #disable + if gajim.config.get('enable_zeroconf') and not widget.get_active(): + self.xml.get_widget('zeroconf_notebook').set_sensitive(False) + # disable gajim.interface.roster.close_all(gajim.ZEROCONF_ACC_NAME) gajim.connections[gajim.ZEROCONF_ACC_NAME].disable_account() del gajim.connections[gajim.ZEROCONF_ACC_NAME] @@ -2075,10 +2167,9 @@ gajim.interface.roster.regroup = False gajim.interface.roster.draw_roster() gajim.interface.roster.actions_menu_needs_rebuild = True - if gajim.interface.instances.has_key('accounts'): - gajim.interface.instances['accounts'].init_accounts() - - else: + + elif not gajim.config.get('enable_zeroconf') and widget.get_active(): + self.xml.get_widget('zeroconf_notebook').set_sensitive(True) # enable (will create new account if not present) gajim.connections[gajim.ZEROCONF_ACC_NAME] = common.zeroconf.\ connection_zeroconf.ConnectionZeroconf(gajim.ZEROCONF_ACC_NAME) @@ -2100,9 +2191,6 @@ gajim.last_message_time[gajim.ZEROCONF_ACC_NAME] = {} gajim.status_before_autoaway[gajim.ZEROCONF_ACC_NAME] = '' gajim.transport_avatar[gajim.ZEROCONF_ACC_NAME] = {} - # refresh accounts window - if gajim.interface.instances.has_key('accounts'): - gajim.interface.instances['accounts'].init_accounts() # refresh roster if len(gajim.connections) >= 2: # Do not merge accounts if only one exists @@ -2112,10 +2200,53 @@ gajim.interface.roster.draw_roster() gajim.interface.roster.actions_menu_needs_rebuild = True gajim.interface.save_config() - gajim.connections[gajim.ZEROCONF_ACC_NAME].change_status('online', '') self.on_checkbutton_toggled(widget, 'enable_zeroconf') + def on_custom_port_checkbutton2_toggled(self, widget): + self.xml.get_widget('custom_port_entry2').set_sensitive( + widget.get_active()) + self.on_checkbutton_toggled(widget, 'use_custom_host', + account = self.current_account) + if not widget.get_active(): + self.xml.get_widget('custom_port_entry2').set_text('5298') + + def on_first_name_entry2_changed(self, widget): + if self.ignore_events: + return + name = widget.get_text().decode('utf-8') + if self.option_changed('zeroconf_first_name', name): + self.need_relogin = True + gajim.config.set_per('accounts', self.current_account, + 'zeroconf_first_name', name) + + def on_last_name_entry2_changed(self, widget): + if self.ignore_events: + return + name = widget.get_text().decode('utf-8') + if self.option_changed('zeroconf_last_name', name): + self.need_relogin = True + gajim.config.set_per('accounts', self.current_account, + 'zeroconf_last_name', name) + + def on_jabber_id_entry2_changed(self, widget): + if self.ignore_events: + return + id = widget.get_text().decode('utf-8') + if self.option_changed('zeroconf_jabber_id', id): + self.need_relogin = True + gajim.config.set_per('accounts', self.current_account, + 'zeroconf_jabber_id', id) + + def on_email_entry2_changed(self, widget): + if self.ignore_events: + return + email = widget.get_text().decode('utf-8') + if self.option_changed('zeroconf_email', mail): + self.need_relogin = True + gajim.config.set_per('accounts', self.current_account, + 'zeroconf_email', email) + class FakeDataForm(gtk.Table, object): '''Class for forms that are in XML format <entry1>value1</entry1> infos in a table {entry1: value1, }''' @@ -3148,8 +3279,12 @@ gobject.source_remove(self.update_progressbar_timeout_id) def on_advanced_button_clicked(self, widget): - gajim.interface.instances[self.account]['account_modification'] = \ - AccountModificationWindow(self.account) + if gajim.interface.instances.has_key('accounts'): + gajim.interface.instances['accounts'].window.present() + else: + gajim.interface.instances['accounts'] = AccountsWindow() + gajim.interface.instances['accounts'].select_account( + self.account) self.window.destroy() def on_finish_button_clicked(self, widget): @@ -3273,210 +3408,3 @@ gajim.interface.roster.draw_roster() gajim.interface.roster.actions_menu_needs_rebuild = True gajim.interface.save_config() - -#---------- ZeroconfPropertiesWindow class -------------# -class ZeroconfPropertiesWindow: - def __init__(self): - self.xml = gtkgui_helpers.get_glade('zeroconf_properties_window.glade') - self.window = self.xml.get_widget('zeroconf_properties_window') - self.window.set_transient_for(gajim.interface.roster.window) - self.xml.signal_autoconnect(self) - - self.init_account() - self.init_account_gpg() - - self.xml.get_widget('save_button').grab_focus() - self.window.show_all() - - def init_account(self): - st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'autoconnect') - if st: - self.xml.get_widget('autoconnect_checkbutton').set_active(st) - - list_no_log_for = gajim.config.get_per('accounts', - gajim.ZEROCONF_ACC_NAME,'no_log_for').split() - if gajim.ZEROCONF_ACC_NAME in list_no_log_for: - self.xml.get_widget('log_history_checkbutton').set_active(0) - else: - self.xml.get_widget('log_history_checkbutton').set_active(1) - - - st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'sync_with_global_status') - if st: - self.xml.get_widget('sync_with_global_status_checkbutton').set_active( - st) - - for opt in ('first_name', 'last_name', 'jabber_id', 'email'): - st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'zeroconf_' + opt) - if st: - self.xml.get_widget(opt + '_entry').set_text(st) - - st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'custom_port') - if st: - self.xml.get_widget('custom_port_entry').set_text(str(st)) - - st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'use_custom_host') - if st: - self.xml.get_widget('custom_port_checkbutton').set_active(st) - - self.xml.get_widget('custom_port_entry').set_sensitive(bool(st)) - - if not st: - gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'custom_port', '5298') - - def init_account_gpg(self): - keyid = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'keyid') - keyname = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'keyname') - savegpgpass = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'savegpgpass') - - if not keyid or not gajim.config.get('usegpg'): - return - - self.xml.get_widget('gpg_key_label').set_text(keyid) - self.xml.get_widget('gpg_name_label').set_text(keyname) - gpg_save_password_checkbutton = \ - self.xml.get_widget('gpg_save_password_checkbutton') - gpg_save_password_checkbutton.set_sensitive(True) - gpg_save_password_checkbutton.set_active(savegpgpass) - - if savegpgpass: - entry = self.xml.get_widget('gpg_password_entry') - entry.set_sensitive(True) - gpgpassword = gajim.config.get_per('accounts', - gajim.ZEROCONF_ACC_NAME, 'gpgpassword') - entry.set_text(gpgpassword) - - def on_zeroconf_properties_window_destroy(self, widget): - # close window - if gajim.interface.instances.has_key('zeroconf_properties'): - del gajim.interface.instances['zeroconf_properties'] - - def on_custom_port_checkbutton_toggled(self, widget): - st = self.xml.get_widget('custom_port_checkbutton').get_active() - self.xml.get_widget('custom_port_entry').set_sensitive(bool(st)) - - def on_cancel_button_clicked(self, widget): - self.window.destroy() - - def on_save_button_clicked(self, widget): - config = {} - - st = self.xml.get_widget('autoconnect_checkbutton').get_active() - config['autoconnect'] = st - list_no_log_for = gajim.config.get_per('accounts', - gajim.ZEROCONF_ACC_NAME, 'no_log_for').split() - if gajim.ZEROCONF_ACC_NAME in list_no_log_for: - 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) - - st = self.xml.get_widget('sync_with_global_status_checkbutton').\ - get_active() - config['sync_with_global_status'] = st - - st = self.xml.get_widget('first_name_entry').get_text() - config['zeroconf_first_name'] = st.decode('utf-8') - - st = self.xml.get_widget('last_name_entry').get_text() - config['zeroconf_last_name'] = st.decode('utf-8') - - st = self.xml.get_widget('jabber_id_entry').get_text() - config['zeroconf_jabber_id'] = st.decode('utf-8') - - st = self.xml.get_widget('email_entry').get_text() - config['zeroconf_email'] = st.decode('utf-8') - - use_custom_port = self.xml.get_widget('custom_port_checkbutton').\ - get_active() - config['use_custom_host'] = use_custom_port - - old_port = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'custom_port') - if use_custom_port: - port = self.xml.get_widget('custom_port_entry').get_text() - else: - port = 5298 - - config['custom_port'] = port - - config['keyname'] = self.xml.get_widget('gpg_name_label').get_text().\ - decode('utf-8') - if config['keyname'] == '': #no key selected - config['keyid'] = '' - config['savegpgpass'] = False - config['gpgpassword'] = '' - else: - config['keyid'] = self.xml.get_widget('gpg_key_label').get_text().\ - decode('utf-8') - config['savegpgpass'] = self.xml.get_widget( - 'gpg_save_password_checkbutton').get_active() - config['gpgpassword'] = self.xml.get_widget('gpg_password_entry' - ).get_text().decode('utf-8') - - reconnect = False - for opt in ('zeroconf_first_name','zeroconf_last_name', - 'zeroconf_jabber_id', 'zeroconf_email', 'custom_port'): - if gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, opt) != \ - config[opt]: - reconnect = True - - for opt in config: - gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, opt, - config[opt]) - - if gajim.connections.has_key(gajim.ZEROCONF_ACC_NAME): - if port != old_port or reconnect: - gajim.connections[gajim.ZEROCONF_ACC_NAME].update_details() - - self.window.destroy() - - def on_gpg_choose_button_clicked(self, widget, data = None): - if gajim.connections.has_key(gajim.ZEROCONF_ACC_NAME): - secret_keys = gajim.connections[gajim.ZEROCONF_ACC_NAME].\ - ask_gpg_secrete_keys() - - # self.account is None and/or gajim.connections is {} - else: - from common import GnuPG - if GnuPG.USE_GPG: - secret_keys = GnuPG.GnuPG().get_secret_keys() - else: - secret_keys = [] - if not secret_keys: - dialogs.ErrorDialog(_('Failed to get secret keys'), - _('There was a problem retrieving your OpenPGP secret keys.')) - return - secret_keys[_('None')] = _('None') - instance = dialogs.ChooseGPGKeyDialog(_('OpenPGP Key Selection'), - _('Choose your OpenPGP key'), secret_keys) - keyID = instance.run() - if keyID is None: - return - checkbutton = self.xml.get_widget('gpg_save_password_checkbutton') - gpg_key_label = self.xml.get_widget('gpg_key_label') - gpg_name_label = self.xml.get_widget('gpg_name_label') - if keyID[0] == _('None'): - gpg_key_label.set_text(_('No key selected')) - gpg_name_label.set_text('') - checkbutton.set_sensitive(False) - self.xml.get_widget('gpg_password_entry').set_sensitive(False) - else: - gpg_key_label.set_text(keyID[0]) - gpg_name_label.set_text(keyID[1]) - checkbutton.set_sensitive(True) - checkbutton.set_active(False) - self.xml.get_widget('gpg_password_entry').set_text('') - - def on_gpg_save_password_checkbutton_toggled(self, widget): - st = widget.get_active() - w = self.xml.get_widget('gpg_password_entry') - w.set_sensitive(bool(st)) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-07-04 18:55:53 UTC (rev 8359) +++ trunk/src/roster_window.py 2007-07-04 21:10:50 UTC (rev 8360) @@ -2772,20 +2772,18 @@ menu.popup(None, None, None, event_button, event.time) def on_edit_account(self, widget, account): - if gajim.interface.instances[account].has_key('account_modification'): - gajim.interface.instances[account]['account_modification'].\ - window.present() + if gajim.interface.instances.has_key('accounts'): + gajim.interface.instances['accounts'].window.present() else: - gajim.interface.instances[account]['account_modification'] = \ - config.AccountModificationWindow(account) + gajim.interface.instances['accounts'] = config.AccountsWindow() + gajim.interface.instances['accounts'].select_account(account) def on_zeroconf_properties(self, widget, account): - if gajim.interface.instances.has_key('zeroconf_properties'): - gajim.interface.instances['zeroconf_properties'].\ - window.present() + if gajim.interface.instances.has_key('accounts'): + gajim.interface.instances['accounts'].window.present() else: - gajim.interface.instances['zeroconf_properties'] = \ - config.ZeroconfPropertiesWindow() + gajim.interface.instances['accounts'] = config.AccountsWindow() + gajim.interface.instances['accounts'].select_account(account) def on_open_gmail_inbox(self, widget, account): url = 'http://mail.google.com/mail?account_id=%s' % urllib.quote(

1 0

[commit-gajim] r8359 - in branches/e2e_encryption/src: . common
by bct＠gajim.org 04 Jul '07

04 Jul '07

Author: bct Date: 2007-07-04 20:55:53 +0200 (Wed, 04 Jul 2007) New Revision: 8359 Modified: branches/e2e_encryption/src/common/stanza_session.py branches/e2e_encryption/src/gajim.py branches/e2e_encryption/src/negotiation.py Log: interface for SAS Modified: branches/e2e_encryption/src/common/stanza_session.py =================================================================== --- branches/e2e_encryption/src/common/stanza_session.py 2007-07-04 16:50:54 UTC (rev 8358) +++ branches/e2e_encryption/src/common/stanza_session.py 2007-07-04 18:55:53 UTC (rev 8359) @@ -561,7 +561,7 @@ # check for a retained secret # if none exists, prompt the user with the SAS if self.sas_algs == 'sas28x5': - print "sas: %s" % self.sas_28x5(m_a, self.form_b) + self.sas = self.sas_28x5(m_a, self.form_b) result.addChild(node=xmpp.DataField(name='identity', value=base64.b64encode(id_a))) result.addChild(node=xmpp.DataField(name='mac', value=base64.b64encode(m_a))) @@ -629,7 +629,7 @@ # check for a retained secret # if none exists, prompt the user with the SAS if self.sas_algs == 'sas28x5': - print "sas: %s" % self.sas_28x5(m_a, self.form_b) + self.sas = self.sas_28x5(m_a, self.form_b) k = self.sha256(k + self.srs + oss) Modified: branches/e2e_encryption/src/gajim.py =================================================================== --- branches/e2e_encryption/src/gajim.py 2007-07-04 16:50:54 UTC (rev 8358) +++ branches/e2e_encryption/src/gajim.py 2007-07-04 18:55:53 UTC (rev 8359) @@ -1699,10 +1699,12 @@ if ask_user: def accept_nondefault_options(widget): + dialog.destroy() + negotiated.update(ask_user) session.accept_e2e_alice(form, negotiated) - dialog.destroy() + negotiation.show_sas_dialog(jid, session.sas) def reject_nondefault_options(widget): session.reject_negotiation() @@ -1714,10 +1716,13 @@ on_response_no = reject_nondefault_options) else: session.accept_e2e_alice(form, negotiated) + + negotiation.show_sas_dialog(jid, session.sas) return elif session.status == 'responded-e2e' and form.getType() == 'result': session.accept_e2e_bob(form) + negotiation.show_sas_dialog(jid, session.sas) return elif session.status == 'identified-alice' and form.getType() == 'result': session.final_steps_alice(form) Modified: branches/e2e_encryption/src/negotiation.py =================================================================== --- branches/e2e_encryption/src/negotiation.py 2007-07-04 16:50:54 UTC (rev 8358) +++ branches/e2e_encryption/src/negotiation.py 2007-07-04 18:55:53 UTC (rev 8359) @@ -1,6 +1,8 @@ import gtkgui_helpers import dataforms_widget +import dialogs + from common import dataforms from common import gajim from common import xmpp @@ -8,10 +10,15 @@ def describe_features(features): '''a human-readable description of the features that have been negotiated''' if features['logging'] == 'may': - return '- messages will be logged' + return _('- messages will be logged') elif features['logging'] == 'mustnot': - return '- messages will not be logged' + return _('- messages will not be logged') +def show_sas_dialog(jid, sas): + dialogs.InformationDialog(_('''Verify the remote client's identity'''), _('''You've begun an encrypted session with %s, but it can't be guaranteed that you're talking directly to the person you think you are. + +You should speak with them directly (in person or on the phone) and confirm that their Short Authentication String is identical to this one: %s''') % (jid, sas)) + class FeatureNegotiationWindow: '''FeatureNegotiotionWindow class''' def __init__(self, account, jid, session, form):

1 0

[commit-gajim] r8358 - in trunk: . src src/common
by asterix＠gajim.org 04 Jul '07

04 Jul '07

Author: asterix Date: 2007-07-04 18:50:54 +0200 (Wed, 04 Jul 2007) New Revision: 8358 Modified: trunk/configure.ac trunk/src/common/config.py trunk/src/common/defs.py trunk/src/common/optparser.py trunk/src/gajim.py Log: rename gt+ theme to default. fixes #2794 Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2007-07-04 16:33:40 UTC (rev 8357) +++ trunk/configure.ac 2007-07-04 16:50:54 UTC (rev 8358) @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.11.1.1],[http://trac.gajim.org/],[gajim]) + [0.11.1.2],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AM_INIT_AUTOMAKE([1.8]) AC_CONFIG_HEADER(config.h) Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2007-07-04 16:33:40 UTC (rev 8357) +++ trunk/src/common/config.py 2007-07-04 16:50:54 UTC (rev 8358) @@ -81,7 +81,7 @@ 'markedmsgcolor': [ opt_color, '#ff8080', '', True ], 'urlmsgcolor': [ opt_color, '#0000ff', '', True ], 'collapsed_rows': [ opt_str, '', _('List (space separated) of rows (accounts and groups) that are collapsed.'), True ], - 'roster_theme': [ opt_str, 'gtk+', '', True ], + 'roster_theme': [ opt_str, _('default'), '', True ], 'saveposition': [ opt_bool, True ], 'mergeaccounts': [ opt_bool, False, '', True ], 'sort_by_show': [ opt_bool, True, '', True ], @@ -386,8 +386,8 @@ themes_default = { # sorted alphanum - 'gtk+': [ '', '', '', 'B', '', '','', 'I', '', '', '', '', '','', '', - 'B' ], + _('default'): [ '', '', '', 'B', '', '','', 'I', '', '', '', '', '','', + '', 'B' ], _('green'): [ '', '#94aa8c', '', 'B', '#0000ff', '#eff3e7', '', 'I', '#000000', '', '', '', '', Modified: trunk/src/common/defs.py =================================================================== --- trunk/src/common/defs.py 2007-07-04 16:33:40 UTC (rev 8357) +++ trunk/src/common/defs.py 2007-07-04 16:50:54 UTC (rev 8358) @@ -2,7 +2,7 @@ datadir = '../' -version = '0.11.1.1' +version = '0.11.1.2' import sys, os.path for base in ('.', 'common'): Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2007-07-04 16:33:40 UTC (rev 8357) +++ trunk/src/common/optparser.py 2007-07-04 16:50:54 UTC (rev 8358) @@ -155,6 +155,8 @@ self.update_config_to_01102() if old < [0, 11, 1, 1] and new >= [0, 11, 1, 1]: self.update_config_to_01111() + if old < [0, 11, 1, 2] and new >= [0, 11, 1, 2]: + self.update_config_to_01112() gajim.logger.init_vars() gajim.config.set('version', new_version) @@ -180,7 +182,7 @@ 'groupfontattrs', 'contacttextcolor', 'contactbgcolor', 'contactfont', 'contactfontattrs', 'bannertextcolor', 'bannerbgcolor', 'bannerfont', 'bannerfontattrs'] - for theme_name in (_('grocery'), _('gtk+')): + for theme_name in (_('grocery'), _('default')): if theme_name not in gajim.config.get_per('themes'): gajim.config.add_per('themes', theme_name) theme = gajim.config.themes_default[theme_name] @@ -211,7 +213,6 @@ def assert_unread_msgs_table_exists(self): '''create table unread_messages if there is no such table''' - #FIXME see #2812 back = os.getcwd() os.chdir(logger.LOG_DB_FOLDER) con = sqlite.connect(logger.LOG_DB_FILE) @@ -395,3 +396,9 @@ self.old_values['always_hide_chat_buttons']) gajim.config.set('version', '0.11.1.1') + def update_config_to_01112(self): + '''gtk+ theme is renamed to default''' + if self.old_values.has_key('roster_theme') and \ + self.old_values['roster_theme'] == 'gtk+': + gajim.config.set('roster_theme', _('default')) + gajim.config.set('version', '0.11.1.2') Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-07-04 16:33:40 UTC (rev 8357) +++ trunk/src/gajim.py 2007-07-04 16:50:54 UTC (rev 8358) @@ -2288,7 +2288,7 @@ #add default themes if there is not in the config file theme = gajim.config.get('roster_theme') if not theme in gajim.config.get_per('themes'): - gajim.config.set('roster_theme', 'gtk+') + gajim.config.set('roster_theme', _('default')) if len(gajim.config.get_per('themes')) == 0: d = ['accounttextcolor', 'accountbgcolor', 'accountfont', 'accountfontattrs', 'grouptextcolor', 'groupbgcolor', 'groupfont',

1 0

[commit-gajim] r8357 - in trunk/src: . common
by asterix＠gajim.org 04 Jul '07

04 Jul '07

Author: asterix Date: 2007-07-04 18:33:40 +0200 (Wed, 04 Jul 2007) New Revision: 8357 Modified: trunk/src/common/contacts.py trunk/src/gajim.py Log: use get_contact() when we give the resource. see #3275 Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2007-07-04 13:29:06 UTC (rev 8356) +++ trunk/src/common/contacts.py 2007-07-04 16:33:40 UTC (rev 8357) @@ -218,10 +218,12 @@ else: return [] - def get_contact(self, account, jid, resource): - '''Returns the contact instance for the given resource if it's given - or None if there is not''' + def get_contact(self, account, jid, resource = None): + '''Returns the contact instance for the given resource if it's given else + the first contact is no resource is given or None if there is not''' if jid in self._contacts[account]: + if not resource: + return self._contacts[account][jid][0] for c in self._contacts[account][jid]: if c.resource == resource: return c Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-07-04 13:29:06 UTC (rev 8356) +++ trunk/src/gajim.py 2007-07-04 16:33:40 UTC (rev 8357) @@ -727,9 +727,7 @@ chat_control = self.msg_win_mgr.get_control(jid, account) # Handle chat states - contact = gajim.contacts.get_contacts(account, jid, resource) - if contact and isinstance(contact, list): - contact = contact[0] + contact = gajim.contacts.get_contact(account, jid, resource) if contact: if contact.composing_xep != 'XEP-0085': # We cache xep85 support contact.composing_xep = composing_xep @@ -1053,11 +1051,7 @@ elif self.instances[account]['infos'].has_key(array[0] + '/' + array[1]): win = self.instances[account]['infos'][array[0] + '/' + array[1]] if win: - c = gajim.contacts.get_contacts(account, array[0], array[1]) - # c is a list when no resource is given. it probably means that contact - # is offline, so only on Contact instance - if isinstance(c, list) and len(c): - c = c[0] + c = gajim.contacts.get_contact(account, array[0], array[1]) if c: # c can be none if it's a gc contact c.last_status_time = time.localtime(time.time() - array[2]) if array[3]: @@ -2190,8 +2184,10 @@ gajim.events.change_jid(account, fjid, jid) resource = None fjid = jid - contact = gajim.contacts.get_contacts(account, jid, resource) - if not contact or isinstance(contact, list): + contact = None + if resource: + contact = gajim.contacts.get_contact(account, jid, resource) + if not contact: contact = highest_contact self.roster.new_chat(contact, account, resource = resource) w = self.msg_win_mgr.get_window(fjid, account)

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2007