Commits June 2012

commits@gajim.org

4 participants
49 discussions

gajim: Select root iter in the PluginsWindow treeview. set focus...
by Fomin Denis 28 Jun '12

28 Jun '12

changeset 0f66fb0158c1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0f66fb0158c1 description: Select root iter in the PluginsWindow treeview. set focus on close button when switch page. diffstat: data/gui/plugins_window.ui | 1 + src/plugins/gui.py | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diffs (34 lines): diff -r 39d1781d54e5 -r 0f66fb0158c1 data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Thu Jun 28 13:15:52 2012 +0400 +++ b/data/gui/plugins_window.ui Thu Jun 28 13:37:55 2012 +0400 @@ -20,6 +20,7 @@ <object class="GtkNotebook" id="plugins_notebook"> <property name="visible">True</property> <property name="can_focus">True</property> + <signal name="switch_page" handler="on_plugins_notebook_switch_page"/> <child> <object class="GtkHPaned" id="hpaned1"> <property name="visible">True</property> diff -r 39d1781d54e5 -r 0f66fb0158c1 src/plugins/gui.py --- a/src/plugins/gui.py Thu Jun 28 13:15:52 2012 +0400 +++ b/src/plugins/gui.py Thu Jun 28 13:37:55 2012 +0400 @@ -82,14 +82,19 @@ self._clear_installed_plugin_info() self.fill_installed_plugins_model() + selection.select_iter(self.installed_plugins_model.get_iter_root()) self.xml.connect_signals(self) self.plugins_notebook.set_current_page(0) + self.xml.get_object('close_button').grab_focus() self.window.show_all() gtkgui_helpers.possibly_move_window_in_current_desktop(self.window) + def on_plugins_notebook_switch_page(self, widget, page, page_num): + gobject.idle_add(self.xml.get_object('close_button').grab_focus) + @log_calls('PluginsWindow') def installed_plugins_treeview_selection_changed(self, treeview_selection): model, iter = treeview_selection.get_selected()

1 0

gajim: Don't ellipsize Family Name label in the profile window.
by Fomin Denis 28 Jun '12

28 Jun '12

changeset 39d1781d54e5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=39d1781d54e5 description: Don't ellipsize Family Name label in the profile window. diffstat: data/gui/profile_window.ui | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r c1374c9127fc -r 39d1781d54e5 data/gui/profile_window.ui --- a/data/gui/profile_window.ui Thu Jun 28 13:03:56 2012 +0400 +++ b/data/gui/profile_window.ui Thu Jun 28 13:15:52 2012 +0400 @@ -128,7 +128,6 @@ <property name="yalign">0</property> <property name="label" translatable="yes" comments="Family Name"><b>Family:</b></property> <property name="use_markup">True</property> - <property name="ellipsize">middle</property> </object> <packing> <property name="x_options">GTK_FILL</property>

1 0

gajim: Set focus on close button when switch preferences window ...
by Fomin Denis 28 Jun '12

28 Jun '12

changeset c1374c9127fc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c1374c9127fc description: Set focus on close button when switch preferences window page. diffstat: data/gui/preferences_window.ui | 53 +++++++++++++++++++++-------------------- src/config.py | 4 +++ 2 files changed, 31 insertions(+), 26 deletions(-) diffs (249 lines): diff -r ca5c75aa8433 -r c1374c9127fc data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Thu Jun 28 12:49:54 2012 +0400 +++ b/data/gui/preferences_window.ui Thu Jun 28 13:03:56 2012 +0400 @@ -166,6 +166,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="show_border">False</property> + <signal name="switch_page" handler="on_preferences_notebook_switch_page"/> <child> <object class="GtkVBox" id="vbox41"> <property name="visible">True</property> @@ -1059,7 +1060,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1077,7 +1078,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1090,7 +1091,7 @@ <property name="left_attach">2</property> <property name="right_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1105,7 +1106,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1168,7 +1169,7 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1185,7 +1186,7 @@ <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> </object> @@ -1698,7 +1699,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1713,7 +1714,7 @@ <property name="left_attach">2</property> <property name="right_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1728,7 +1729,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1744,7 +1745,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1827,7 +1828,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1842,7 +1843,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1881,8 +1882,8 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -1921,8 +1922,8 @@ <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -1951,7 +1952,7 @@ <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -1982,7 +1983,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -2011,7 +2012,7 @@ <property name="left_attach">3</property> <property name="right_attach">4</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -2042,7 +2043,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> </object> @@ -2447,7 +2448,7 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -2462,7 +2463,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -2474,7 +2475,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -2488,7 +2489,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -2503,7 +2504,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -2516,7 +2517,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> </object> diff -r ca5c75aa8433 -r c1374c9127fc src/config.py --- a/src/config.py Thu Jun 28 12:49:54 2012 +0400 +++ b/src/config.py Thu Jun 28 13:03:56 2012 +0400 @@ -582,10 +582,14 @@ self.sounds_preferences = None self.notebook.set_current_page(0) + self.xml.get_object('close_button').grab_focus() self.window.show_all() gtkgui_helpers.possibly_move_window_in_current_desktop(self.window) + def on_preferences_notebook_switch_page(self, widget, page, page_num): + gobject.idle_add(self.xml.get_object('close_button').grab_focus) + def on_preferences_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: self.window.hide()

1 0

gajim: Set focus on ok button when switch profile window page.
by Fomin Denis 28 Jun '12

28 Jun '12

changeset ca5c75aa8433 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ca5c75aa8433 description: Set focus on ok button when switch profile window page. diffstat: data/gui/profile_window.ui | 127 ++++++++++++++++++++++---------------------- src/profile_window.py | 4 + 2 files changed, 68 insertions(+), 63 deletions(-) diffs (truncated from 585 to 300 lines): diff -r 95b6bf380532 -r ca5c75aa8433 data/gui/profile_window.ui --- a/data/gui/profile_window.ui Thu Jun 28 12:38:43 2012 +0400 +++ b/data/gui/profile_window.ui Thu Jun 28 12:49:54 2012 +0400 @@ -15,6 +15,7 @@ <object class="GtkNotebook" id="information_notebook"> <property name="visible">True</property> <property name="border_width">6</property> + <signal name="switch_page" handler="on_information_notebook_switch_page"/> <child> <object class="GtkTable" id="table2"> <property name="visible">True</property> @@ -31,7 +32,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -44,7 +45,7 @@ <property name="right_attach">4</property> <property name="top_attach">4</property> <property name="bottom_attach">5</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -67,7 +68,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -78,7 +79,7 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -91,7 +92,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -104,7 +105,7 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -117,7 +118,7 @@ <property name="right_attach">4</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -131,7 +132,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -146,7 +147,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -161,7 +162,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -176,7 +177,7 @@ <property name="left_attach">2</property> <property name="right_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -193,7 +194,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -218,7 +219,7 @@ <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -229,7 +230,7 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -252,7 +253,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -263,7 +264,7 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -276,7 +277,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -289,7 +290,7 @@ <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -302,7 +303,7 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -315,7 +316,7 @@ <property name="right_attach">4</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -328,7 +329,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -343,7 +344,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -358,7 +359,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -373,7 +374,7 @@ <property name="left_attach">2</property> <property name="right_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -390,7 +391,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -407,7 +408,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> </object> @@ -426,7 +427,7 @@ <property name="right_attach">4</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -440,7 +441,7 @@ <property name="right_attach">4</property> <property name="top_attach">5</property> <property name="bottom_attach">6</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -454,8 +455,8 @@ <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="x_options"/> + <property name="y_options"/> </packing> </child> <child> @@ -468,7 +469,7 @@ <property name="right_attach">4</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -481,7 +482,7 @@ <property name="right_attach">2</property> <property name="top_attach">5</property> <property name="bottom_attach">6</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -494,7 +495,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child>

1 0

gajim: Set focus on close button when switch vcard page.
by Fomin Denis 28 Jun '12

28 Jun '12

changeset 95b6bf380532 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=95b6bf380532 description: Set focus on close button when switch vcard page. diffstat: data/gui/vcard_information_window.ui | 157 +++++++++++++++++----------------- src/vcard.py | 3 + 2 files changed, 80 insertions(+), 80 deletions(-) diffs (truncated from 727 to 300 lines): diff -r dcfcc68ab956 -r 95b6bf380532 data/gui/vcard_information_window.ui --- a/data/gui/vcard_information_window.ui Tue Jun 26 00:25:19 2012 +0400 +++ b/data/gui/vcard_information_window.ui Thu Jun 28 12:38:43 2012 +0400 @@ -29,6 +29,7 @@ <child> <object class="GtkNotebook" id="information_notebook"> <property name="visible">True</property> + <signal name="switch_page" handler="on_information_notebook_switch_page"/> <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> @@ -56,7 +57,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -71,7 +72,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -86,7 +87,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -101,7 +102,7 @@ <property name="top_attach">3</property> <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -116,13 +117,12 @@ <property name="top_attach">4</property> <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="jid_label"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="xpad">5</property> @@ -132,7 +132,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -156,7 +156,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -175,7 +175,7 @@ <property name="right_attach">2</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -195,7 +195,7 @@ <property name="right_attach">2</property> <property name="top_attach">4</property> <property name="bottom_attach">5</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -235,7 +235,7 @@ <property name="top_attach">5</property> <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -254,7 +254,7 @@ <property name="right_attach">2</property> <property name="top_attach">5</property> <property name="bottom_attach">6</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> </object> @@ -366,7 +366,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -386,7 +386,7 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -399,7 +399,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -414,7 +414,7 @@ <property name="left_attach">2</property> <property name="right_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> </object> @@ -480,7 +480,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -496,7 +496,7 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -514,7 +514,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -532,7 +532,7 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -550,7 +550,7 @@ <property name="right_attach">4</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -563,7 +563,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -578,7 +578,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -593,7 +593,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -608,7 +608,7 @@ <property name="left_attach">2</property> <property name="right_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -625,7 +625,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -650,7 +650,7 @@ <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -678,7 +678,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -694,7 +694,7 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -712,7 +712,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -730,7 +730,7 @@ <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -748,7 +748,7 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -766,7 +766,7 @@ <property name="right_attach">4</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property>

1 0

gajim: replace Socks5Receiver with Socks5ReceiverClient
by Jefry Lagrange 26 Jun '12

26 Jun '12

changeset 0dd103537abc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0dd103537abc description: replace Socks5Receiver with Socks5ReceiverClient diffstat: src/common/protocol/bytestream.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diffs (23 lines): diff -r f4f9fd08efff -r 0dd103537abc src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Thu Jun 21 13:56:15 2012 -0400 +++ b/src/common/protocol/bytestream.py Tue Jun 26 17:20:24 2012 -0400 @@ -41,7 +41,7 @@ from common import ged from common import jingle_xtls from common.file_props import FilesProp -from common.socks5 import Socks5Receiver +from common.socks5 import Socks5ReceiverClient import logging log = logging.getLogger('gajim.c.p.bytestream') @@ -730,9 +730,8 @@ file_props.streamhost_used = True file_props.streamhosts.append(proxy) file_props.is_a_proxy = True - receiver = Socks5Receiver(gajim.idlequeue, proxy, + receiver = Socks5ReceiverClient(gajim.idlequeue, proxy, file_props.sid, file_props) - gajim.socks5queue.add_receiver(self.name, receiver) proxy['idx'] = receiver.queue_idx gajim.socks5queue.on_success = self._proxy_auth_ok raise xmpp.NodeProcessed

1 0

gajim: Select root iter in the AccountsWindow treeview.
by Fomin Denis 25 Jun '12

25 Jun '12

changeset dcfcc68ab956 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dcfcc68ab956 description: Select root iter in the AccountsWindow treeview. diffstat: src/config.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (30 lines): diff -r 4b5b53d48a6c -r dcfcc68ab956 src/config.py --- a/src/config.py Mon Jun 25 23:49:20 2012 +0400 +++ b/src/config.py Tue Jun 26 00:25:19 2012 +0400 @@ -1558,7 +1558,6 @@ self.update_proxy_list() self.xml.connect_signals(self) self.init_accounts() - self.xml.get_object('close_button').grab_focus() self.window.show_all() # Merge accounts @@ -1575,6 +1574,8 @@ except ImportError: self.avahi_available = False + self.xml.get_object('close_button').grab_focus() + def on_accounts_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: self.check_resend_relog() @@ -1603,6 +1604,9 @@ iter_ = model.append() model.set(iter_, 0, account) + self.selection = self.accounts_treeview.get_selection() + self.selection.select_iter(model.get_iter_root()) + def resend(self, account): if not account in gajim.connections: return

1 0

gajim: Set focus on close button in the AccountsWindow.
by Fomin Denis 25 Jun '12

25 Jun '12

changeset 4b5b53d48a6c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4b5b53d48a6c description: Set focus on close button in the AccountsWindow. diffstat: src/config.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r aaca933b6584 -r 4b5b53d48a6c src/config.py --- a/src/config.py Mon Jun 25 23:27:23 2012 +0400 +++ b/src/config.py Mon Jun 25 23:49:20 2012 +0400 @@ -1558,6 +1558,7 @@ self.update_proxy_list() self.xml.connect_signals(self) self.init_accounts() + self.xml.get_object('close_button').grab_focus() self.window.show_all() # Merge accounts

1 0

gajim: Do not highlight(mark) contact name in VcardWindow.
by Fomin Denis 25 Jun '12

25 Jun '12

changeset aaca933b6584 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=aaca933b6584 description: Do not highlight(mark) contact name in VcardWindow. diffstat: src/vcard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (13 lines): diff -r e5d66fcb024f -r aaca933b6584 src/vcard.py --- a/src/vcard.py Thu Jun 21 14:10:01 2012 +0200 +++ b/src/vcard.py Mon Jun 25 23:27:23 2012 +0400 @@ -142,8 +142,8 @@ buffer_.set_text(annotations[self.contact.jid]) self.xml.connect_signals(self) + self.xml.get_object('close_button').grab_focus() self.window.show_all() - self.xml.get_object('close_button').grab_focus() def update_progressbar(self): self.progressbar.pulse()

1 0

gajim: fix connect error
by Jefry Lagrange 21 Jun '12

21 Jun '12

changeset f4f9fd08efff in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f4f9fd08efff description: fix connect error diffstat: src/common/protocol/bytestream.py | 26 ++++++++++++++++---------- src/filetransfers_window.py | 2 ++ 2 files changed, 18 insertions(+), 10 deletions(-) diffs (66 lines): diff -r 2657d405cfe0 -r f4f9fd08efff src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Wed Jun 20 23:58:23 2012 +0200 +++ b/src/common/protocol/bytestream.py Thu Jun 21 13:56:15 2012 -0400 @@ -549,34 +549,40 @@ file_props.hash_ = hash_id return - def _connect_error(self, to, _id, sid, code=404): + def _connect_error(self,sid, code=404): """ Called when there is an error establishing BS connection, or when connection is rejected """ if not self.connection or self.connected < 2: return + file_props = FilesProp.getFileProp(self.name, sid) + if file_props is None: + log.error('can not send iq error on failed transfer') + return msg_dict = { 404: 'Could not connect to given hosts', 405: 'Cancel', 406: 'Not acceptable', } msg = msg_dict[code] + if file_props.type_ == 's': + to = file_props.receiver + else: + to = file_props.sender iq = xmpp.Iq(to=to, typ='error') - iq.setAttr('id', _id) + iq.setAttr('id', file_props.session_sid) err = iq.setTag('error') err.setAttr('code', unicode(code)) err.setData(msg) self.connection.send(iq) if code == 404: - file_props = FilesProp.getFileProp(self.name, sid) - if file_props is not None: - self.disconnect_transfer(file_props) - file_props.error = -3 - from common.connection_handlers_events import \ - FileRequestErrorEvent - gajim.nec.push_incoming_event(FileRequestErrorEvent(None, - conn=self, jid=to, file_props=file_props, error_msg=msg)) + self.disconnect_transfer(file_props) + file_props.error = -3 + from common.connection_handlers_events import \ + FileRequestErrorEvent + gajim.nec.push_incoming_event(FileRequestErrorEvent(None, + conn=self, jid=to, file_props=file_props, error_msg=msg)) def _proxy_auth_ok(self, proxy): """ diff -r 2657d405cfe0 -r f4f9fd08efff src/filetransfers_window.py --- a/src/filetransfers_window.py Wed Jun 20 23:58:23 2012 +0200 +++ b/src/filetransfers_window.py Thu Jun 21 13:56:15 2012 -0400 @@ -553,6 +553,8 @@ def _remove_transfer(self, iter_, sid, file_props): self.model.remove(iter_) + if not file_props: + return if file_props.tt_account: # file transfer is set account = file_props.tt_account

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2012