Commits August 2012

commits@gajim.org

3 participants
152 discussions

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

14 Aug '12

changeset f2b9adc8be9d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f2b9adc8be9d 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 b949134e01ac -r f2b9adc8be9d 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 preferences window ...
by Fomin Denis 14 Aug '12

14 Aug '12

changeset a960791e8c1f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a960791e8c1f 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 f2b9adc8be9d -r a960791e8c1f 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 f2b9adc8be9d -r a960791e8c1f 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 close button when switch vcard page.
by Fomin Denis 14 Aug '12

14 Aug '12

changeset b949134e01ac in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b949134e01ac 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 090d769eb568 -r b949134e01ac 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: Select root iter in the AccountsWindow treeview.
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 090d769eb568 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=090d769eb568 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 0e2cb8d5ec7d -r 090d769eb568 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 @@ -1559,7 +1559,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 @@ -1576,6 +1575,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() @@ -1604,6 +1605,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: Do not highlight(mark) contact name in VcardWindow.
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 81476f72b194 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=81476f72b194 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 37be0bb91ad9 -r 81476f72b194 src/vcard.py --- a/src/vcard.py Sun Apr 01 19:49:52 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: Set focus on close button in the AccountsWindow.
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 0e2cb8d5ec7d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0e2cb8d5ec7d 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 81476f72b194 -r 0e2cb8d5ec7d 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 @@ -1559,6 +1559,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: [Olivier Crete] port Gajim to use Farstream instead of Fa...
by Yann Leboulanger 14 Aug '12

14 Aug '12

changeset 37be0bb91ad9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=37be0bb91ad9 description: [Olivier Crete] port Gajim to use Farstream instead of Farsight2. Fixes #7113 diffstat: debian/README.Debian | 2 +- debian/control | 2 +- src/chat_control.py | 10 ++-- src/common/gajim.py | 10 ++-- src/common/helpers.py | 2 +- src/common/jingle.py | 2 +- src/common/jingle_rtp.py | 79 ++++++++++++++++++++--------------------- src/common/jingle_transport.py | 32 ++++++++-------- src/features_window.py | 8 ++-- 9 files changed, 72 insertions(+), 75 deletions(-) diffs (truncated from 427 to 300 lines): diff -r 41acee25913c -r 37be0bb91ad9 debian/README.Debian --- a/debian/README.Debian Tue Jun 19 22:45:19 2012 +0400 +++ b/debian/README.Debian Sun Apr 01 19:49:52 2012 +0200 @@ -1,7 +1,7 @@ gajim for Debian ---------------- -For video chat support, you have to install python-farsight. +For video chat support, you have to install python-farstream. -- Yann Le Boulanger <asterix(a)lagaule.org>, Mon, 20 Jun 2005 12:02:31 +0200 -- Julien Valroff <julien(a)debian.org> Sat, 07 May 2011 13:50:27 +0200 diff -r 41acee25913c -r 37be0bb91ad9 debian/control --- a/debian/control Tue Jun 19 22:45:19 2012 +0400 +++ b/debian/control Sun Apr 01 19:49:52 2012 +0200 @@ -12,7 +12,7 @@ Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.22.0), dnsutils Recommends: dbus, python-dbus, notification-daemon, python-openssl (>= 0.12), python-crypto, python-pyasn1 -Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farsight, gstreamer0.10-plugins-ugly, python-pycurl, python-gupnp-igd +Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farstream, gstreamer0.10-plugins-ugly, python-pycurl, python-gupnp-igd Description: Jabber client written in PyGTK Gajim is a Jabber client. It has a tabbed user interface with normal chats, group chats, and has many features such as, TLS, GPG, SSL, multiple accounts, diff -r 41acee25913c -r 37be0bb91ad9 src/chat_control.py --- a/src/chat_control.py Tue Jun 19 22:45:19 2012 +0400 +++ b/src/chat_control.py Sun Apr 01 19:49:52 2012 +0200 @@ -1648,15 +1648,15 @@ self.restore_conversation() self.msg_textview.grab_focus() - # change tooltip text for audio and video buttons if python-farsight is + # change tooltip text for audio and video buttons if python-farstream is # not installed - if not gajim.HAVE_FARSIGHT: + if not gajim.HAVE_FARSTREAM: tooltip_text = self._audio_button.get_tooltip_text() self._audio_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) tooltip_text = self._video_button.get_tooltip_text() self._video_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) gajim.ged.register_event_handler('pep-received', ged.GUI1, self._nec_pep_received) @@ -1704,7 +1704,7 @@ # Jingle detection if self.contact.supports(NS_JINGLE_ICE_UDP) and \ - gajim.HAVE_FARSIGHT and self.contact.resource: + gajim.HAVE_FARSTREAM and self.contact.resource: self.audio_available = self.contact.supports(NS_JINGLE_RTP_AUDIO) self.video_available = self.contact.supports(NS_JINGLE_RTP_VIDEO) else: diff -r 41acee25913c -r 37be0bb91ad9 src/common/gajim.py --- a/src/common/gajim.py Tue Jun 19 22:45:19 2012 +0400 +++ b/src/common/gajim.py Sun Apr 01 19:49:52 2012 +0200 @@ -169,21 +169,21 @@ # read. HAVE_LATEX = False -HAVE_FARSIGHT = True +HAVE_FARSTREAM = True try: - farsight = __import__('farsight') + farstream = __import__('farstream') import gst import glib try: conference = gst.element_factory_make('fsrtpconference') - session = conference.new_session(farsight.MEDIA_TYPE_AUDIO) + session = conference.new_session(farstream.MEDIA_TYPE_AUDIO) del session del conference except glib.GError: - HAVE_FARSIGHT = False + HAVE_FARSTREAM = False except ImportError: - HAVE_FARSIGHT = False + HAVE_FARSTREAM = False HAVE_UPNP_IGD = True try: diff -r 41acee25913c -r 37be0bb91ad9 src/common/helpers.py --- a/src/common/helpers.py Tue Jun 19 22:45:19 2012 +0400 +++ b/src/common/helpers.py Sun Apr 01 19:49:52 2012 +0200 @@ -1330,7 +1330,7 @@ gajim.gajim_optional_features[a].append(xmpp.NS_ESESSION) if gajim.config.get_per('accounts', a, 'answer_receipts'): gajim.gajim_optional_features[a].append(xmpp.NS_RECEIPTS) - if gajim.HAVE_FARSIGHT: + if gajim.HAVE_FARSTREAM: gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE) gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP) gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP_AUDIO) diff -r 41acee25913c -r 37be0bb91ad9 src/common/jingle.py --- a/src/common/jingle.py Tue Jun 19 22:45:19 2012 +0400 +++ b/src/common/jingle.py Sun Apr 01 19:49:52 2012 +0200 @@ -35,7 +35,7 @@ import gajim from jingle_session import JingleSession, JingleStates -if gajim.HAVE_FARSIGHT: +if gajim.HAVE_FARSTREAM: from jingle_rtp import JingleAudio, JingleVideo diff -r 41acee25913c -r 37be0bb91ad9 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Tue Jun 19 22:45:19 2012 +0400 +++ b/src/common/jingle_rtp.py Sun Apr 01 19:49:52 2012 +0200 @@ -21,7 +21,7 @@ import socket import xmpp -import farsight, gst +import farstream, gst from glib import GError import gajim @@ -42,8 +42,8 @@ JingleContent.__init__(self, session, transport) self.media = media self._dtmf_running = False - self.farsight_media = {'audio': farsight.MEDIA_TYPE_AUDIO, - 'video': farsight.MEDIA_TYPE_VIDEO}[media] + self.farstream_media = {'audio': farstream.MEDIA_TYPE_AUDIO, + 'video': farstream.MEDIA_TYPE_VIDEO}[media] self.pipeline = None self.src_bin = None @@ -59,7 +59,7 @@ self.callbacks['session-terminate'] += [self.__stop] self.callbacks['session-terminate-sent'] += [self.__stop] - def setup_stream(self): + def setup_stream(self, on_src_pad_added): # pipeline and bus self.pipeline = gst.Pipeline() bus = self.pipeline.get_bus() @@ -68,13 +68,12 @@ # conference self.conference = gst.element_factory_make('fsrtpconference') - self.conference.set_property('sdes-cname', self.session.ourjid) self.pipeline.add(self.conference) self.funnel = None - self.p2psession = self.conference.new_session(self.farsight_media) + self.p2psession = self.conference.new_session(self.farstream_media) - participant = self.conference.new_participant(self.session.peerjid) + participant = self.conference.new_participant() # FIXME: Consider a workaround, here... # pidgin and telepathy-gabble don't follow the XEP, and it won't work # due to bad controlling-mode @@ -93,7 +92,9 @@ params['stun-ip'] = ip self.p2pstream = self.p2psession.new_stream(participant, - farsight.DIRECTION_RECV, 'nice', params) + farstream.DIRECTION_RECV) + self.p2pstream.connect('src-pad-added', on_src_pad_added) + self.p2pstream.set_transmitter('nice', params) def is_ready(self): return (JingleContent.is_ready(self) and self.candidates_ready) @@ -117,7 +118,7 @@ # FIXME: connectivity should not be etablished yet # Instead, it should be etablished after session-accept! if self.sent: - self.p2pstream.set_remote_candidates(candidates) + self.p2pstream.add_remote_candidates(candidates) def batch_dtmf(self, events): """ @@ -140,15 +141,14 @@ def _start_dtmf(self, event): if event in ('*', '#'): - event = {'*': farsight.DTMF_EVENT_STAR, - '#': farsight.DTMF_EVENT_POUND}[event] + event = {'*': farstream.DTMF_EVENT_STAR, + '#': farstream.DTMF_EVENT_POUND}[event] else: event = int(event) - self.p2psession.start_telephony_event(event, 2, - farsight.DTMF_METHOD_RTP_RFC4733) + self.p2psession.start_telephony_event(event, 2) def _stop_dtmf(self): - self.p2psession.stop_telephony_event(farsight.DTMF_METHOD_RTP_RFC4733) + self.p2psession.stop_telephony_event() def _fill_content(self, content): content.addChild(xmpp.NS_JINGLE_RTP + ' description', @@ -170,34 +170,33 @@ if message.type == gst.MESSAGE_ELEMENT: name = message.structure.get_name() log.debug('gst element message: %s: %s' % (name, message)) - if name == 'farsight-new-active-candidate-pair': + if name == 'farstream-new-active-candidate-pair': pass - elif name == 'farsight-recv-codecs-changed': + elif name == 'farstream-recv-codecs-changed': pass - elif name == 'farsight-codecs-changed': - if self.sent and self.p2psession.get_property('codecs-ready'): + elif name == 'farstream-codecs-changed': + if self.sent and self.p2psession.get_property('codecs'): self.send_description_info() - elif name == 'farsight-local-candidates-prepared': + elif name == 'farstream-local-candidates-prepared': self.candidates_ready = True if self.is_ready(): self.session.on_session_state_changed(self) - elif name == 'farsight-new-local-candidate': + elif name == 'farstream-new-local-candidate': candidate = message.structure['candidate'] self.transport.candidates.append(candidate) if self.sent: # FIXME: Is this case even possible? self.send_candidate(candidate) - elif name == 'farsight-component-state-changed': + elif name == 'farstream-component-state-changed': state = message.structure['state'] - if state == farsight.STREAM_STATE_FAILED: + if state == farstream.STREAM_STATE_FAILED: reason = xmpp.Node('reason') reason.setTag('failed-transport') self.session.remove_content(self.creator, self.name, reason) - elif name == 'farsight-error': - log.error('Farsight error #%d!\nMessage: %s\nDebug: %s' % ( + elif name == 'farstream-error': + log.error('Farstream error #%d!\nMessage: %s' % ( message.structure['error-no'], - message.structure['error-msg'], - message.structure['debug-msg'])) + message.structure['error-msg'])) elif message.type == gst.MESSAGE_ERROR: # TODO: Fix it to fallback to videotestsrc anytime an error occur, # or raise an error, Jingle way @@ -236,10 +235,10 @@ def on_negotiated(self): if self.accepted: if self.transport.remote_candidates: - self.p2pstream.set_remote_candidates(self.transport.remote_candidates) + self.p2pstream.add_remote_candidates(self.transport.remote_candidates) self.transport.remote_candidates = [] - # TODO: farsight.DIRECTION_BOTH only if senders='both' - self.p2pstream.set_property('direction', farsight.DIRECTION_BOTH) + # TODO: farstream.DIRECTION_BOTH only if senders='both' + self.p2pstream.set_property('direction', farstream.DIRECTION_BOTH) JingleContent.on_negotiated(self) def __on_remote_codecs(self, stanza, content, error, action): @@ -252,8 +251,8 @@ if not codec['id'] or not codec['name'] or not codec['clockrate']: # ignore invalid payload-types continue - c = farsight.Codec(int(codec['id']), codec['name'], - self.farsight_media, int(codec['clockrate'])) + c = farstream.Codec(int(codec['id']), codec['name'], + self.farstream_media, int(codec['clockrate'])) if 'channels' in codec: c.channels = int(codec['channels']) else: @@ -318,7 +317,7 @@ self.out_volume.set_property('volume', vol) def setup_stream(self): - JingleRTPContent.setup_stream(self) + JingleRTPContent.setup_stream(self, self._on_src_pad_added) # Configure SPEEX # Workaround for psi (not needed since rev @@ -326,10 +325,10 @@ # place 16kHz before 8kHz, as buggy psi versions will take in # account only the first codec - codecs = [farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX', - farsight.MEDIA_TYPE_AUDIO, 16000), - farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX', - farsight.MEDIA_TYPE_AUDIO, 8000)] + codecs = [farstream.Codec(farstream.CODEC_ID_ANY, 'SPEEX', + farstream.MEDIA_TYPE_AUDIO, 16000), + farstream.Codec(farstream.CODEC_ID_ANY, 'SPEEX', + farstream.MEDIA_TYPE_AUDIO, 8000)] self.p2psession.set_codec_preferences(codecs) # the local parts @@ -348,9 +347,8 @@ self.src_bin.get_pad('src').link(self.p2psession.get_property( 'sink-pad')) - self.p2pstream.connect('src-pad-added', self._on_src_pad_added) - # The following is needed for farsight to process ICE requests:

1 0

gajim: Fix russian translation
by Fomin Denis 12 Aug '12

12 Aug '12

changeset d0cfa7938e57 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d0cfa7938e57 description: Fix russian translation diffstat: po/ru.po | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diffs (32 lines): diff -r cc2dc83d1597 -r d0cfa7938e57 po/ru.po --- a/po/ru.po Sun Aug 12 11:24:22 2012 +0400 +++ b/po/ru.po Sun Aug 12 22:04:20 2012 +0400 @@ -13,7 +13,7 @@ "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-03-01 11:01+0400\n" -"PO-Revision-Date: 2012-03-01 11:08+0300\n" +"PO-Revision-Date: 2012-08-12 21:54+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Linux Support LLC\n" "Language: ru\n" @@ -3430,9 +3430,8 @@ #: ../src/command_system/implementation/standard.py:184 #: ../src/command_system/implementation/standard.py:261 -#, fuzzy msgid "Clear the text window" -msgstr "Использование: /%s, очищает текстовое окно." +msgstr "Очистить текстовое окно" #: ../src/command_system/implementation/standard.py:189 #, fuzzy @@ -9602,7 +9601,7 @@ #: ../src/plugins/gui.py:162 msgid "Plugin failed" -msgstr "Неудачный модуль" +msgstr "Ошибка в модуле" #: ../src/plugins/gui.py:206 msgid "Unable to properly remove the plugin"

1 0

gajim: remove command_system modules from demandimport.ignore
by Fomin Denis 12 Aug '12

12 Aug '12

changeset cc2dc83d1597 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cc2dc83d1597 description: remove command_system modules from demandimport.ignore diffstat: src/chat_control.py | 19 ++++++++++++++----- src/gajim.py | 4 +--- 2 files changed, 15 insertions(+), 8 deletions(-) diffs (64 lines): diff -r 7c10c9d09d85 -r cc2dc83d1597 src/chat_control.py --- a/src/chat_control.py Sun Aug 12 10:33:41 2012 +0400 +++ b/src/chat_control.py Sun Aug 12 11:24:22 2012 +0400 @@ -64,8 +64,8 @@ # Here we load the module with the standard commands, so they are being detected # and dispatched. -import command_system.implementation.standard -import command_system.implementation.execute +from command_system.implementation.standard import StandardChatCommands +from command_system.implementation.execute import Execute, Show try: import gtkspell @@ -83,7 +83,15 @@ ##!/bin/sh #LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done) #echo "{_('en'):'en'",$LANG"}" -langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg', _('Breton'): 'br', _('Czech'): 'cs', _('German'): 'de', _('Greek'): 'el', _('British'): 'en_GB', _('Esperanto'): 'eo', _('Spanish'): 'es', _('Basque'): 'eu', _('French'): 'fr', _('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian (b)'): 'nb', _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl', _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', _('Russian'): 'ru', _('Serbian'): 'sr', _('Slovak'): 'sk', _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'} +langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg', + _('Breton'): 'br', _('Czech'): 'cs', _('German'): 'de', + _('Greek'): 'el', _('British'): 'en_GB', _('Esperanto'): 'eo', + _('Spanish'): 'es', _('Basque'): 'eu', _('French'): 'fr', + _('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian (b)'): 'nb', + _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl', + _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', + _('Russian'): 'ru', _('Serbian'): 'sr', _('Slovak'): 'sk', + _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'} if gajim.config.get('use_speller') and HAS_GTK_SPELL: # loop removing non-existent dictionaries @@ -2293,7 +2301,7 @@ else: displaymarking = None self.print_conversation(message, self.contact.jid, encrypted=encrypted, - xep0184_id=xep0184_id, xhtml=xhtml, displaymarking=displaymarking) + xep0184_id=xep0184_id, xhtml=xhtml, displaymarking=displaymarking) ChatControlBase.send_message(self, message, keyID, type_='chat', chatstate=chatstate_to_send, xhtml=xhtml, callback=_on_sent, @@ -2886,7 +2894,8 @@ except exceptions.DatabaseMalformed: import common.logger dialogs.ErrorDialog(_('Database Error'), - _('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH) + _('The database file (%s) cannot be read. Try to repair it or \ + remove it (all history will be lost).') % common.logger.LOG_DB_PATH) rows = [] local_old_kind = None for row in rows: # row[0] time, row[1] has kind, row[2] the message diff -r 7c10c9d09d85 -r cc2dc83d1597 src/gajim.py --- a/src/gajim.py Sun Aug 12 10:33:41 2012 +0400 +++ b/src/gajim.py Sun Aug 12 11:24:22 2012 +0400 @@ -65,9 +65,7 @@ from common import demandimport demandimport.enable() demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', - 'logging.NullHandler', 'dbus.service', - 'command_system.implementation.standard', - 'command_system.implementation.execute', 'OpenSSL.SSL', 'OpenSSL.crypto', + 'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', 'Crypto.PublicKey']

1 0

gajim: remove dbus.glib from demandimport.ignore
by Fomin Denis 12 Aug '12

12 Aug '12

changeset 7c10c9d09d85 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7c10c9d09d85 description: remove dbus.glib from demandimport.ignore diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 10a73406c098 -r 7c10c9d09d85 src/gajim.py --- a/src/gajim.py Sat Aug 11 22:46:39 2012 +0200 +++ b/src/gajim.py Sun Aug 12 10:33:41 2012 +0400 @@ -65,7 +65,7 @@ from common import demandimport demandimport.enable() demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', - 'logging.NullHandler', 'dbus.glib', 'dbus.service', + 'logging.NullHandler', 'dbus.service', 'command_system.implementation.standard', 'command_system.implementation.execute', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic',

1 0

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 August 2012