Commits July 2009

commits@gajim.org

5 participants
169 discussions

gajim: Fix traceback in MPRIS.
by Jonathan Schleifer 19 Jul '09

19 Jul '09

changeset fc18891cb167 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fc18891cb167 description: Fix traceback in MPRIS. diffstat: src/music_track_listener.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (17 lines): diff -r 86aa79ae4c64 -r fc18891cb167 src/music_track_listener.py --- a/src/music_track_listener.py Fri Jul 17 19:12:11 2009 +0200 +++ b/src/music_track_listener.py Sun Jul 19 22:09:09 2009 +0200 @@ -130,10 +130,10 @@ return info def _mpris_playing_changed_cb(self, playing): - if playing[0] == 0: + if playing: + self.emit('music-track-changed', None) + else: self.emit('music-track-changed', self._last_playing_music) - else: - self.emit('music-track-changed', None) def _mpris_music_track_change_cb(self, arg): self._last_playing_music = self._mpris_properties_extract(arg)

1 0

gajim: Merge default branch into osx_newbuildsys branch.
by Jonathan Schleifer 19 Jul '09

19 Jul '09

changeset b765732974a5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b765732974a5 description: Merge default branch into osx_newbuildsys branch. diffstat: configure.ac | 2 +- data/glade/input_dialog.glade | 269 +- data/glade/manage_proxies_window.glade | 137 +- po/ru.po | 3537 +++++++++++++++++--------------- po/uk.po | 2813 ++++++++++++++------------ src/common/check_paths.py | 16 + src/common/config.py | 3 +- src/common/connection.py | 11 +- src/common/connection_handlers.py | 121 +- src/common/contacts.py | 9 + src/common/defs.py | 2 +- src/common/gajim.py | 1 + src/common/kwalletbinding.py | 78 + src/common/logger.py | 137 + src/common/optparser.py | 37 + src/common/passwords.py | 66 +- src/common/xmpp/__init__.py | 2 +- src/common/xmpp/auth_nb.py | 11 +- src/common/xmpp/bosh.py | 5 +- src/common/xmpp/client_nb.py | 8 +- src/common/xmpp/roster_nb.py | 39 +- src/common/xmpp/tls_nb.py | 6 +- src/common/xmpp/transports_nb.py | 10 +- src/common/zeroconf/client_zeroconf.py | 3 + src/common/zeroconf/connection_zeroconf.py | 5 + src/config.py | 14 +- src/conversation_textview.py | 11 +- src/dialogs.py | 131 +- src/features_window.py | 9 +- src/gajim.py | 32 +- src/groupchat_control.py | 111 +- src/roster_window.py | 62 +- 32 files changed, 4304 insertions(+), 3394 deletions(-) diffs (truncated from 18487 to 300 lines): diff -r 693e4cdeb587 -r b765732974a5 configure.ac --- a/configure.ac Tue Jul 07 22:48:02 2009 +0200 +++ b/configure.ac Sun Jul 19 21:56:34 2009 +0200 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.12.1.5-dev],[http://trac.gajim.org/],[gajim]) + [0.12.3.1-dev],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_MACRO_DIR(m4) AC_CONFIG_SRCDIR(src) diff -r 693e4cdeb587 -r b765732974a5 data/glade/input_dialog.glade --- a/data/glade/input_dialog.glade Tue Jul 07 22:48:02 2009 +0200 +++ b/data/glade/input_dialog.glade Sun Jul 19 21:56:34 2009 +0200 @@ -1,160 +1,113 @@ -<?xml version="1.0" standalone="no"?>  -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - +<?xml version="1.0"?> <glade-interface> - -<widget class="GtkDialog" id="input_dialog"> - <property name="border_width">6</property> - <property name="title" translatable="yes"></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">True</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_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <property name="has_separator">False</property> - <signal name="destroy" handler="on_input_dialog_destroy" last_modification_time="Sat, 18 Nov 2006 20:23:21 GMT"/> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox10"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area9"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="cancelbutton"> - <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> - <property name="response_id">-6</property> - </widget> - </child> - - <child> - <widget class="GtkButton" id="okbutton"> - <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-ok</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-5</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox76"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkHBox" id="hbox2960"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkImage" id="image507"> - <property name="visible">True</property> - <property name="stock">gtk-dialog-question</property> - <property name="icon_size">6</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">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">True</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">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="input_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="activates_default">True</property> - </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> - </widget> - </child> -</widget> - +  +  + <widget class="GtkDialog" id="input_dialog"> + <property name="border_width">6</property> + <property name="type_hint">dialog</property> + <property name="has_separator">False</property> + <signal name="delete_event" handler="on_input_dialog_delete_event"/> + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox10"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <widget class="GtkVBox" id="vbox"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="spacing">6</property> + <child> + <widget class="GtkHBox" id="hbox2960"> + <property name="visible">True</property> + <property name="spacing">12</property> + <child> + <widget class="GtkImage" id="image507"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-question</property> + <property name="icon-size">6</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label"> + <property name="visible">True</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="input_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area9"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <widget class="GtkButton" id="cancelbutton"> + <property name="label">gtk-cancel</property> + <property name="response_id">-6</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="okbutton"> + <property name="label">gtk-ok</property> + <property name="response_id">-5</property> + <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="receives_default">False</property> + <property name="use_stock">True</property> + </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="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </widget> + </child> + </widget> </glade-interface> diff -r 693e4cdeb587 -r b765732974a5 data/glade/manage_proxies_window.glade --- a/data/glade/manage_proxies_window.glade Tue Jul 07 22:48:02 2009 +0200 +++ b/data/glade/manage_proxies_window.glade Sun Jul 19 21:56:34 2009 +0200 @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> - +<?xml version="1.0"?> <glade-interface> +  +  <widget class="GtkWindow" id="manage_proxies_window"> <property name="border_width">12</property> <property name="title" translatable="yes">Manage Proxy Profiles</property> @@ -22,9 +22,9 @@

1 0

gajim: * first draft of message archiving preferences window
by Anaël Verrier 19 Jul '09

19 Jul '09

changeset 149d15263aee in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=149d15263aee description: * first draft of message archiving preferences window * fixed a bug in ConnectionArchive.append_or_update_item prototype diffstat: data/glade/archiving_preferences_window.glade | 359 +++++++++++++++++++++++++++++ src/common/message_archiving.py | 2 +- src/dialogs.py | 88 +++++++ 3 files changed, 448 insertions(+), 1 deletions(-) diffs (truncated from 473 to 300 lines): diff -r 5abc3754d886 -r 149d15263aee data/glade/archiving_preferences_window.glade --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/glade/archiving_preferences_window.glade Sun Jul 19 16:39:07 2009 +0200 @@ -0,0 +1,359 @@ +<?xml version="1.0"?> +<glade-interface> +  +  + <widget class="GtkWindow" id="archiving_preferences_window"> + <property name="border_width">12</property> + <signal name="destroy" handler="on_archiving_preferences_window_destroy"/> + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <widget class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <child> + <widget class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Auto Save</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkRadioButton" id="auto_save_yes_radiobutton"> + <property name="label" translatable="yes">Yes</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkRadioButton" id="auto_save_no_radiobutton"> + <property name="label" translatable="yes">No</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">auto_save_yes_radiobutton</property> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkTable" id="table1"> + <property name="visible">True</property> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <child> + <widget class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes">Method Auto</property> + <property name="use_markup">True</property> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="label" translatable="yes">Method Local</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="label" translatable="yes">Method Manual</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="method_manual_combobox"> + <property name="visible">True</property> + <property name="items" translatable="yes">Prefer +Concede +Forbid</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> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="method_local_combobox"> + <property name="visible">True</property> + <property name="items" translatable="yes">Prefer +Concede +Forbid</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> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="method_auto_combobox"> + <property name="visible">True</property> + <property name="items" translatable="yes">Prefer +Concede +Forbid</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <child> + <widget class="GtkVBox" id="vbox2"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <widget class="GtkTreeView" id="item_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <signal name="cursor_changed" handler="on_item_treeview_cursor_changed"/> + </widget> + </child> + </widget> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkHButtonBox" id="hbuttonbox2"> + <property name="visible">True</property> + <property name="layout_style">spread</property> + <child> + <widget class="GtkButton" id="add_item_button"> + <property name="label" translatable="yes">gtk-add</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_add_item_button_clicked"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="remove_item_button"> + <property name="label" translatable="yes">gtk-remove</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_remove_item_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="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkNotebook" id="item_notebook"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="show_tabs">False</property> + <property name="show_border">False</property> + <child> + <widget class="GtkLabel" id="label11"> + <property name="visible">True</property> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="label" translatable="yes">page 1</property> + </widget> + <packing> + <property name="tab_fill">False</property> + <property name="type">tab</property> + </packing> + </child> + <child> + <widget class="GtkTable" id="table3"> + <property name="visible">True</property> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <child> + <widget class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="label" translatable="yes">expire</property> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label9"> + <property name="visible">True</property> + <property name="label" translatable="yes">otr</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="label" translatable="yes">save</property> + </widget> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="expire_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">•</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="otr_combobox"> + <property name="visible">True</property> + <property name="items" translatable="yes">approve +concede +forbid +oppose +prefer +require</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> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="save_combobox"> + <property name="visible">True</property> + <property name="items" translatable="yes">body +false +message +stream</property> + </widget>

1 0

gajim: handle reson when we ban a jid.
by Yann Leboulanger 17 Jul '09

17 Jul '09

changeset 86aa79ae4c64 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=86aa79ae4c64 description: handle reson when we ban a jid. diffstat: src/groupchat_control.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (16 lines): diff -r 9f64a0913b97 -r 86aa79ae4c64 src/groupchat_control.py --- a/src/groupchat_control.py Fri Jul 17 11:20:28 2009 +0200 +++ b/src/groupchat_control.py Fri Jul 17 19:12:11 2009 +0200 @@ -1606,6 +1606,12 @@ 'info') self.clear(self.msg_textview) elif message_array[0].split()[0].find('@') > 0: + message_splited = message_array[0].split(' ', 1) + jid = message_splited[0] + if len(message_splited) == 2: + reason = message_splited[1] + else: + reason = 'None' gajim.connections[self.account].gc_set_affiliation(self.room_jid, message_array[0].split()[0], 'outcast', reason) self.clear(self.msg_textview)

1 0

gajim: bosh port must now be included in bosh URI
by Yann Leboulanger 17 Jul '09

17 Jul '09

changeset 9f64a0913b97 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9f64a0913b97 description: bosh port must now be included in bosh URI diffstat: data/glade/manage_proxies_window.glade | 137 ++++++++++++++++----------------- src/common/config.py | 1 - src/common/connection.py | 2 +- src/common/xmpp/bosh.py | 5 +- src/common/xmpp/transports_nb.py | 8 +- src/config.py | 12 --- 6 files changed, 74 insertions(+), 91 deletions(-) diffs (truncated from 451 to 300 lines): diff -r e8a47f9aead6 -r 9f64a0913b97 data/glade/manage_proxies_window.glade --- a/data/glade/manage_proxies_window.glade Fri Jul 17 09:53:15 2009 +0200 +++ b/data/glade/manage_proxies_window.glade Fri Jul 17 11:20:28 2009 +0200 @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> - +<?xml version="1.0"?> <glade-interface> +  +  <widget class="GtkWindow" id="manage_proxies_window"> <property name="border_width">12</property> <property name="title" translatable="yes">Manage Proxy Profiles</property> @@ -22,9 +22,9 @@ <widget class="GtkScrolledWindow" id="scrolledwindow38"> <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_IN</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> <widget class="GtkTreeView" id="proxies_treeview"> <property name="visible">True</property> @@ -35,34 +35,44 @@ </widget> </child> </widget> + <packing> + <property name="position">0</property> + </packing> </child> <child> <widget class="GtkHButtonBox" id="hbuttonbox21"> <property name="visible">True</property> <property name="spacing">6</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property> <child> <widget class="GtkButton" id="add_proxy_button"> + <property name="label">gtk-add</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="label">gtk-add</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_add_proxy_button_clicked"/> </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> <child> <widget class="GtkButton" id="remove_proxy_button"> + <property name="label">gtk-remove</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="label">gtk-remove</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="on_remove_proxy_button_clicked"/> </widget> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -73,6 +83,9 @@ </packing> </child> </widget> + <packing> + <property name="position">0</property> + </packing> </child> <child> <widget class="GtkVBox" id="vbox90"> @@ -81,7 +94,7 @@ <widget class="GtkFrame" id="frame34"> <property name="visible">True</property> <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> + <property name="shadow_type">none</property> <child> <widget class="GtkAlignment" id="alignment72"> <property name="visible">True</property> @@ -165,13 +178,16 @@ </packing> </child> </widget> + <packing> + <property name="position">0</property> + </packing> </child> <child> <widget class="GtkFrame" id="frame23"> <property name="visible">True</property> <property name="border_width">6</property> <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> + <property name="shadow_type">none</property> <child> <widget class="GtkAlignment" id="alignment51"> <property name="visible">True</property> @@ -180,53 +196,24 @@ <widget class="GtkTable" id="proxy_table"> <property name="visible">True</property> <property name="sensitive">False</property> - <property name="n_rows">8</property> + <property name="n_rows">7</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEntry" id="boshport_entry"> + <widget class="GtkCheckButton" id="boshuseproxy_checkbutton"> + <property name="label" translatable="yes">Use HTTP prox_y</property> <property name="visible">True</property> <property name="can_focus">True</property> - <signal name="changed" handler="on_boshport_entry_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="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="boshport_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">B_OSH Port:</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">boshport_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="GtkCheckButton" id="boshuseproxy_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Use HTTP prox_y</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_boshuseproxy_checkbutton_toggled"/> </widget> <packing> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_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> @@ -258,18 +245,18 @@ </child> <child> <widget class="GtkCheckButton" id="useauth_checkbutton"> + <property name="label" translatable="yes">Use proxy auth_entication</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Use proxy auth_entication</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_useauth_checkbutton_toggled"/> </widget> <packing> <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <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> @@ -283,8 +270,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="y_options"></property> </packing> </child> @@ -298,8 +285,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">7</property> - <property name="bottom_attach">8</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="y_options"></property> </packing> </child> @@ -312,8 +299,8 @@ <property name="mnemonic_widget">proxyuser_entry</property> </widget> <packing> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> + <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> @@ -327,8 +314,8 @@ <property name="mnemonic_widget">proxypass_entry</property> </widget> <packing> - <property name="top_attach">7</property> - <property name="bottom_attach">8</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> @@ -342,8 +329,8 @@ <property name="mnemonic_widget">proxyhost_entry</property> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <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> @@ -357,8 +344,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="y_options"></property> </packing> </child> @@ -371,8 +358,8 @@ <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="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> @@ -385,8 +372,8 @@ <property name="mnemonic_widget">proxyport_entry</property> </widget> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</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> @@ -416,23 +403,31 @@ </packing> </child> </widget> + <packing> + <property name="position">0</property> + </packing> </child> <child> <widget class="GtkHButtonBox" id="hbuttonbox22"> <property name="visible">True</property> <property name="border_width">7</property> <property name="spacing">12</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="layout_style">end</property>

1 0

gajim: * ask only once at a time to change our nickname in a roo...
by Yann Leboulanger 17 Jul '09

17 Jul '09

changeset e8a47f9aead6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e8a47f9aead6 description: * ask only once at a time to change our nickname in a room in case of conflict * add a checkbutton to use the entered nickname by default without asking anymore. Fixes #5141 diffstat: data/glade/input_dialog.glade | 269 ++++++++++++++++++-------------------------- src/common/gajim.py | 1 + src/dialogs.py | 131 +++++++++++++++++++++- src/gajim.py | 15 +- src/groupchat_control.py | 34 ----- 5 files changed, 245 insertions(+), 205 deletions(-) diffs (truncated from 527 to 300 lines): diff -r 91e0be3dedf6 -r e8a47f9aead6 data/glade/input_dialog.glade --- a/data/glade/input_dialog.glade Thu Jul 16 17:54:43 2009 +0200 +++ b/data/glade/input_dialog.glade Fri Jul 17 09:53:15 2009 +0200 @@ -1,160 +1,113 @@ -<?xml version="1.0" standalone="no"?>  -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - +<?xml version="1.0"?> <glade-interface> - -<widget class="GtkDialog" id="input_dialog"> - <property name="border_width">6</property> - <property name="title" translatable="yes"></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">True</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_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <property name="has_separator">False</property> - <signal name="destroy" handler="on_input_dialog_destroy" last_modification_time="Sat, 18 Nov 2006 20:23:21 GMT"/> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox10"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area9"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="cancelbutton"> - <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> - <property name="response_id">-6</property> - </widget> - </child> - - <child> - <widget class="GtkButton" id="okbutton"> - <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-ok</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-5</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox76"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkHBox" id="hbox2960"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkImage" id="image507"> - <property name="visible">True</property> - <property name="stock">gtk-dialog-question</property> - <property name="icon_size">6</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">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">True</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">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="input_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="activates_default">True</property> - </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> - </widget> - </child> -</widget> - +  +  + <widget class="GtkDialog" id="input_dialog"> + <property name="border_width">6</property> + <property name="type_hint">dialog</property> + <property name="has_separator">False</property> + <signal name="delete_event" handler="on_input_dialog_delete_event"/> + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox10"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <widget class="GtkVBox" id="vbox"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="spacing">6</property> + <child> + <widget class="GtkHBox" id="hbox2960"> + <property name="visible">True</property> + <property name="spacing">12</property> + <child> + <widget class="GtkImage" id="image507"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-question</property> + <property name="icon-size">6</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label"> + <property name="visible">True</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="input_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area9"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <widget class="GtkButton" id="cancelbutton"> + <property name="label">gtk-cancel</property> + <property name="response_id">-6</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="okbutton"> + <property name="label">gtk-ok</property> + <property name="response_id">-5</property> + <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="receives_default">False</property> + <property name="use_stock">True</property> + </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="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </widget> + </child> + </widget> </glade-interface> diff -r 91e0be3dedf6 -r e8a47f9aead6 src/common/gajim.py --- a/src/common/gajim.py Thu Jul 16 17:54:43 2009 +0200 +++ b/src/common/gajim.py Fri Jul 17 09:53:15 2009 +0200 @@ -113,6 +113,7 @@ gc_connected = {} # tell if we are connected to the room or not {acct: {room_jid: True}} gc_passwords = {} # list of the pass required to enter a room {room_jid: password} automatic_rooms = {} # list of rooms that must be automaticaly configured and for which we have a list of invities {account: {room_jid: {'invities': []}}} +new_room_nick = None # if it's != None, use this nick instead of asking for a new nickname when there is a conflict. groups = {} # list of groups newly_added = {} # list of contacts that has just signed in diff -r 91e0be3dedf6 -r e8a47f9aead6 src/dialogs.py --- a/src/dialogs.py Thu Jul 16 17:54:43 2009 +0200 +++ b/src/dialogs.py Fri Jul 17 09:53:15 2009 +0200 @@ -1580,6 +1580,7 @@ self.dialog.set_title(title) label.set_markup(label_str) self.cancel_handler = cancel_handler + self.vbox = self.xml.get_widget('vbox') self.ok_handler = ok_handler okbutton = self.xml.get_widget('okbutton') @@ -1589,7 +1590,7 @@ self.xml.signal_autoconnect(self) self.dialog.show_all()

1 0

gajim: redraw correctly accountsWindow after we removed an account
by Yann Leboulanger 16 Jul '09

16 Jul '09

changeset 91e0be3dedf6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=91e0be3dedf6 description: redraw correctly accountsWindow after we removed an account diffstat: src/config.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 9d61f94f6965 -r 91e0be3dedf6 src/config.py --- a/src/config.py Thu Jul 16 17:44:45 2009 +0200 +++ b/src/config.py Thu Jul 16 17:54:43 2009 +0200 @@ -2644,6 +2644,7 @@ gajim.interface.roster.set_actions_menu_needs_rebuild() if 'accounts' in gajim.interface.instances: gajim.interface.instances['accounts'].init_accounts() + gajim.interface.instances['accounts'].init_account() self.window.destroy() #---------- ManageBookmarksWindow class -------------#

1 0

gajim: import things differently in xmpp so it works with python...
by Yann Leboulanger 16 Jul '09

16 Jul '09

changeset 9d61f94f6965 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9d61f94f6965 description: import things differently in xmpp so it works with python26. Fixes #5168 diffstat: src/common/xmpp/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (15 lines): diff -r cddd0dcc02e0 -r 9d61f94f6965 src/common/xmpp/__init__.py --- a/src/common/xmpp/__init__.py Thu Jul 16 17:25:47 2009 +0200 +++ b/src/common/xmpp/__init__.py Thu Jul 16 17:44:45 2009 +0200 @@ -10,10 +10,10 @@ Thanks and credits to the xmpppy developers. See: http://xmpppy.sourceforge.net/ """ +from protocol import * import simplexml, protocol, auth_nb, transports_nb, roster_nb import dispatcher_nb, features_nb, idlequeue, bosh, tls_nb, proxy_connectors from client_nb import NonBlockingClient from plugin import PlugIn -from protocol import * # vim: se ts=3:

1 0

gajim: prevent sending several times the same message in zeroconf.
by Yann Leboulanger 16 Jul '09

16 Jul '09

changeset cddd0dcc02e0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cddd0dcc02e0 description: prevent sending several times the same message in zeroconf. diffstat: src/common/zeroconf/client_zeroconf.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r e7917d6ecb43 -r cddd0dcc02e0 src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Thu Jul 16 17:23:05 2009 +0200 +++ b/src/common/zeroconf/client_zeroconf.py Thu Jul 16 17:25:47 2009 +0200 @@ -697,6 +697,7 @@ if conn.add_stanza(stanza, is_message): if on_ok: on_ok(id_) + return if item['address'] in self.ip_to_hash: hash_ = self.ip_to_hash[item['address']] @@ -708,6 +709,7 @@ if conn.add_stanza(stanza, is_message): if on_ok: on_ok(id_) + return # otherwise open new connection if not stanza.getID():

1 0

gajim: fix sending message to zeroconf from XML console. Fixes #...
by Yann Leboulanger 16 Jul '09

16 Jul '09

changeset e7917d6ecb43 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e7917d6ecb43 description: fix sending message to zeroconf from XML console. Fixes #5050 diffstat: src/common/zeroconf/connection_zeroconf.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r ab443200eabe -r e7917d6ecb43 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Thu Jul 16 17:22:34 2009 +0200 +++ b/src/common/zeroconf/connection_zeroconf.py Thu Jul 16 17:23:05 2009 +0200 @@ -495,6 +495,8 @@ # send a stanza untouched if not self.connection: return + if not isinstance(stanza, common.xmpp.Node): + stanza = common.xmpp.Protocol(node=stanza) self.connection.send(stanza) def ack_subscribed(self, jid):

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
17
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2009