Commits January 2013

commits@gajim.org

4 participants
198 discussions

gajim: fix XML window
by Yann Leboulanger 26 Jan '13

26 Jan '13

changeset f61b0d6163e0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f61b0d6163e0 description: fix XML window diffstat: data/gui/xml_console_window.ui | 113 +++++++++++++++++++++++++++++----------- 1 files changed, 81 insertions(+), 32 deletions(-) diffs (truncated from 375 to 300 lines): diff -r 2c3b3ecd0c18 -r f61b0d6163e0 data/gui/xml_console_window.ui --- a/data/gui/xml_console_window.ui Sat Jan 26 19:35:56 2013 +0100 +++ b/data/gui/xml_console_window.ui Sat Jan 26 19:40:59 2013 +0100 @@ -1,20 +1,21 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  +  <object class="GtkWindow" id="xml_console_window"> + <property name="can_focus">False</property> <property name="border_width">12</property> <property name="default_width">550</property> <property name="default_height">450</property> - <signal name="destroy" handler="on_xml_console_window_destroy"/> + <signal name="destroy" handler="on_xml_console_window_destroy" swapped="no"/> <child> <object class="GtkVBox" id="vbox"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label342"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Jabber Traffic</b></property> <property name="use_markup">True</property> @@ -29,8 +30,6 @@ <object class="GtkScrolledWindow" id="scrolledwindow43"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <object class="GtkTextView" id="stanzas_log_textview"> @@ -42,49 +41,49 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="hbox2988"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkCheckButton" id="enable_checkbutton"> <property name="label" translatable="yes" comments="XML Console enable checkbutton">_Enable</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_enable_checkbutton_toggled"/> + <signal name="toggled" handler="on_enable_checkbutton_toggled" swapped="no"/> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkLabel" id="label351"> - <property name="visible">True</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> <object class="GtkButton" id="clear_button"> <property name="label">gtk-clear</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_clear_button_clicked"/> + <signal name="clicked" handler="on_clear_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> @@ -102,84 +101,113 @@ <child> <object class="GtkVBox" id="input_vbox1"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkCheckButton" id="in_stanza_checkbutton"> <property name="label" translatable="yes">Hide IN stanzas</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_in_stanza_checkbutton_toggled"/> + <signal name="toggled" handler="on_in_stanza_checkbutton_toggled" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkCheckButton" id="out_stanza_checkbutton"> <property name="label" translatable="yes">Hide OUT stanzas</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_out_stanza_checkbutton_toggled"/> + <signal name="toggled" handler="on_out_stanza_checkbutton_toggled" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkCheckButton" id="presence_stanza_checkbutton"> <property name="label" translatable="yes">Hide Presence stanzas</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_presence_stanza_checkbutton_toggled"/> + <signal name="toggled" handler="on_presence_stanza_checkbutton_toggled" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkCheckButton" id="iq_stanza_checkbutton"> <property name="label" translatable="yes">Hide IQ stanzas</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_iq_stanza_checkbutton_toggled"/> + <signal name="toggled" handler="on_iq_stanza_checkbutton_toggled" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> <child> <object class="GtkCheckButton" id="message_stanza_checkbutton"> <property name="label" translatable="yes">Hide Message stanzas</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_message_stanza_checkbutton_toggled"/> + <signal name="toggled" handler="on_message_stanza_checkbutton_toggled" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">4</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <placeholder/> </child> @@ -188,6 +216,8 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -196,6 +226,7 @@ <child type="label"> <object class="GtkLabel" id="label2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Filter</b></property> <property name="use_markup">True</property> @@ -204,6 +235,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> @@ -212,11 +244,11 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="spacing">6</property> - <signal name="activate" handler="on_expander_activate"/> + <signal name="activate" handler="on_expander_activate" swapped="no"/> <child> <object class="GtkVBox" id="input_vbox"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow42"> @@ -234,23 +266,28 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHButtonBox" id="hbuttonbox31"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="iq_button"> <property name="label" translatable="yes" comments="Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))">_IQ</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Info/Query</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> - <signal name="clicked" handler="on_iq_button_clicked"/> + <signal name="clicked" handler="on_iq_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -261,11 +298,13 @@ <child> <object class="GtkButton" id="presence_button"> <property name="label" translatable="yes">_Presence</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property>

1 0

gajim: fix browsing muc components
by Yann Leboulanger 26 Jan '13

26 Jan '13

changeset 2c3b3ecd0c18 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2c3b3ecd0c18 description: fix browsing muc components diffstat: src/disco.py | 28 +++++----------------------- 1 files changed, 5 insertions(+), 23 deletions(-) diffs (44 lines): diff -r 35f14d8cf57f -r 2c3b3ecd0c18 src/disco.py --- a/src/disco.py Thu Jan 24 22:00:28 2013 +0100 +++ b/src/disco.py Sat Jan 26 19:35:56 2013 +0100 @@ -1906,35 +1906,17 @@ self._fetch_source = GObject.timeout_add(100, self._start_info_query) return # We have to do this in a pygtk <2.8 compatible way :/ - #start, end = self.window.services_treeview.get_visible_range() - rect = view.get_visible_rect() - iter_ = end = None - # Top row - try: - sx, sy = view.convert_tree_to_bin_window_coords(rect.x, rect.y) - spath = view.get_path_at_pos(sx, sy)[0] - iter_ = self.model.get_iter(spath) - except TypeError: - self._fetch_source = None - return - # Bottom row - # Iter compare is broke, use the path instead - try: - ex, ey = view.convert_tree_to_bin_window_coords(rect.x + \ - rect.height, rect.y + rect.height) - end = view.get_path_at_pos(ex, ey)[0] - # end is the last visible, we want to query that aswell - end = (end[0] + 1,) - except TypeError: - # We're at the end of the model, we can leave end=None though. - pass - while iter_ and self.model.get_path(iter_) != end: + start, end = view.get_visible_range() + iter_ = self.model.get_iter(start) + while iter_: if not self.model.get_value(iter_, 6): jid = self.model.get_value(iter_, 0) node = self.model.get_value(iter_, 1) self.cache.get_info(jid, node, self._agent_info) self._fetch_source = True return + if self.model.get_path(iter_) == end: + break iter_ = self.model.iter_next(iter_) self._fetch_source = None

1 0

gajim: start supporting animated images in treeview.
by Yann Leboulanger 24 Jan '13

24 Jan '13

changeset 35f14d8cf57f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=35f14d8cf57f description: start supporting animated images in treeview. diffstat: src/cell_renderer_image.py | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diffs (62 lines): diff -r 44e33b821a74 -r 35f14d8cf57f src/cell_renderer_image.py --- a/src/cell_renderer_image.py Tue Jan 22 00:32:09 2013 +0400 +++ b/src/cell_renderer_image.py Thu Jan 24 22:00:28 2013 +0100 @@ -21,7 +21,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## - +from gi.repository import GLib from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GObject @@ -62,21 +62,23 @@ col = tree.get_column(self.col_index) cell_area = tree.get_cell_area(path, col) - tree.queue_draw_area(cell_area.x, cell_area.y, - cell_area.width, cell_area.height) + tree.queue_draw_area(cell_area.x, cell_area.y, cell_area.width, + cell_area.height) def animation_timeout(self, tree, image): if image.get_storage_type() != Gtk.ImageType.ANIMATION: return self.redraw = 0 iter_ = self.iters[image] - iter_.advance() + timeval = GLib.TimeVal() + timeval.tv_sec = GLib.get_current_time() + iter_.advance(timeval) model = tree.get_model() if model: model.foreach(self.func, (image, tree)) if self.redraw: GObject.timeout_add(iter_.get_delay_time(), - self.animation_timeout, tree, image) + self.animation_timeout, tree, image) elif image in self.iters: del self.iters[image] @@ -89,7 +91,9 @@ if not isinstance(widget, Gtk.TreeView): return animation = self.image.get_animation() - iter_ = animation.get_iter() + timeval = GLib.TimeVal() + timeval.tv_sec = GLib.get_current_time() + iter_ = animation.get_iter(timeval) self.iters[self.image] = iter_ GObject.timeout_add(iter_.get_delay_time(), self.animation_timeout, widget, self.image) @@ -115,7 +119,9 @@ return 0, 0, 0, 0 if self.image.get_storage_type() == Gtk.ImageType.ANIMATION: animation = self.image.get_animation() - pix = animation.get_iter().get_pixbuf() + timeval = GLib.TimeVal() + timeval.tv_sec = GLib.get_current_time() + pix = animation.get_iter(timeval).get_pixbuf() elif self.image.get_storage_type() == Gtk.ImageType.PIXBUF: pix = self.image.get_pixbuf() else:

1 0

gajim: correctly close file when we cancel a transfer. Fixes #7281
by Yann Leboulanger 24 Jan '13

24 Jan '13

changeset 0ad7f7647d92 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0ad7f7647d92 description: correctly close file when we cancel a transfer. Fixes #7281 diffstat: src/common/protocol/bytestream.py | 7 +++++-- src/common/socks5.py | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diffs (55 lines): diff -r 4a3d180f6d68 -r 0ad7f7647d92 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Tue Jan 22 17:38:43 2013 +0100 +++ b/src/common/protocol/bytestream.py Thu Jan 24 21:23:57 2013 +0100 @@ -790,6 +790,7 @@ rep = nbxmpp.Protocol('iq', stanza.getFrom(), 'result', stanza.getTo(), {'id': stanza.getID()}) file_props.block_size = blocksize + file_props.direction = '<' file_props.seq = 0 file_props.received_len = 0 file_props.last_time = time.time() @@ -820,7 +821,6 @@ if session.weinitiate: session.cancel_session() - def OpenStream(self, sid, to, fp, blocksize=4096): """ Start new stream. You should provide stream id 'sid', the endpoind jid @@ -997,7 +997,10 @@ break else: if stanza.getTag('data'): - if self.IBBMessageHandler(conn, stanza): + sid = stanza.getTagAttr('data', 'sid') + file_props = FilesProp.getFileProp(self.name, sid) + if file_props.connected and self.IBBMessageHandler(conn, + stanza): reply = stanza.buildReply('result') reply.delChild('data') conn.send(reply) diff -r 4a3d180f6d68 -r 0ad7f7647d92 src/common/socks5.py --- a/src/common/socks5.py Tue Jan 22 17:38:43 2013 +0100 +++ b/src/common/socks5.py Thu Jan 24 21:23:57 2013 +0100 @@ -538,6 +538,7 @@ raise IOError, e def close_file(self): + # Close file we're sending from if self.file: if not self.file.closed: try: @@ -545,6 +546,12 @@ except Exception: pass self.file = None + # Close file we're receiving into + if self.file_props.fd: + try: + self.file_props.fd.close() + except Exception: + pass def get_fd(self): """

1 0

gajim: correctly close the file when we cancel a transfer. Fixes...
by Yann Leboulanger 24 Jan '13

24 Jan '13

changeset 1cf7d602453e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1cf7d602453e description: correctly close the file when we cancel a transfer. Fixes #7281 diffstat: src/common/jingle_session.py | 1 + src/common/protocol/bytestream.py | 19 ++++++++++++++----- src/common/socks5.py | 9 +++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) diffs (88 lines): diff -r 2771bf0bedd8 -r 1cf7d602453e src/common/jingle_session.py --- a/src/common/jingle_session.py Fri Jan 11 23:00:14 2013 +0400 +++ b/src/common/jingle_session.py Thu Jan 24 20:26:18 2013 +0100 @@ -311,6 +311,7 @@ Default callback for action stanzas -- simple ack and stop processing """ response = stanza.buildReply('result') + response.delChild(response.getQuery()) self.connection.connection.send(response) def __on_error(self, stanza, jingle, error, action): diff -r 2771bf0bedd8 -r 1cf7d602453e src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Fri Jan 11 23:00:14 2013 +0400 +++ b/src/common/protocol/bytestream.py Thu Jan 24 20:26:18 2013 +0100 @@ -314,9 +314,16 @@ if 'direction' in file_props: # it's a IBB - sid = file_props['sid'] - if sid in self.files_props: - del self.files_props[sid] + # Close file we're receiving into + if 'fp' in file_props: + fd = file_props['fp'] + try: + fd.close() + except Exception: + pass + if gajim.socks5queue.get_file_props(self.name, file_props['sid']): + gajim.socks5queue.remove_file_props(self.name, + file_props['sid']) def _send_socks5_info(self, file_props): """ @@ -741,9 +748,9 @@ elif typ == 'set' and stanza.getTag('close', namespace=xmpp.NS_IBB): self.StreamCloseHandler(conn, stanza) elif typ == 'result': - self.StreamCommitHandler(conn, stanza) + self.SendHandler() elif typ == 'error': - self.StreamOpenReplyHandler(conn, stanza) + gajim.socks5queue.error_cb(_('File transfer canceled'), _('An error occured while transfering file.')) else: conn.send(xmpp.Error(stanza, xmpp.ERR_BAD_REQUEST)) raise xmpp.NodeProcessed @@ -773,6 +780,7 @@ rep = xmpp.Protocol('iq', stanza.getFrom(), 'result', stanza.getTo(), {'id': stanza.getID()}) file_props['block-size'] = blocksize + file_props['direction'] = '<' file_props['seq'] = 0 file_props['received-len'] = 0 file_props['last-time'] = time.time() @@ -964,6 +972,7 @@ if stanza.getTag('data'): if self.IBBMessageHandler(conn, stanza): reply = stanza.buildReply('result') + reply.delChild(reply.getQuery()) conn.send(reply) raise xmpp.NodeProcessed elif syn_id == self.last_sent_ibb_id: diff -r 2771bf0bedd8 -r 1cf7d602453e src/common/socks5.py --- a/src/common/socks5.py Fri Jan 11 23:00:14 2013 +0400 +++ b/src/common/socks5.py Thu Jan 24 20:26:18 2013 +0100 @@ -397,6 +397,7 @@ raise IOError, e def close_file(self): + # Close file we're sending from if self.file: if not self.file.closed: try: @@ -404,6 +405,14 @@ except Exception: pass self.file = None + # Close file we're receiving into + if 'fd' in self.file_props: + fd = self.file_props['fd'] + del self.file_props['fd'] + try: + fd.close() + except Exception: + pass def get_fd(self): """

1 0

gajim-website: another way to get parenthesis correctly placed i...
by Yann Leboulanger 23 Jan '13

23 Jan '13

changeset 4552a24787cb in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=4552a24787cb description: another way to get parenthesis correctly placed in hebrew translation. Fixes #7291 diffstat: locale/he_IL/LC_MESSAGES/msg.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d74ed2c8d11b -r 4552a24787cb locale/he_IL/LC_MESSAGES/msg.po --- a/locale/he_IL/LC_MESSAGES/msg.po Sat Jan 19 23:46:07 2013 +0100 +++ b/locale/he_IL/LC_MESSAGES/msg.po Wed Jan 23 19:36:46 2013 +0100 @@ -278,7 +278,7 @@ #: dev.php:96 dev.php:99 #, c-format msgid "%s (%s)" -msgstr "%s (‏%s)" +msgstr "%s (%s‪)" #: dev.php:103 msgid " We also want to thank"

1 0

gajim: don't try to escape JID when we get a subscription reques...
by Yann Leboulanger 22 Jan '13

22 Jan '13

changeset 4a3d180f6d68 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4a3d180f6d68 description: don't try to escape JID when we get a subscription request from it, it's already escaped. Fixes #7277 diffstat: src/dialogs.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (28 lines): diff -r 00dd2310e886 -r 4a3d180f6d68 src/dialogs.py --- a/src/dialogs.py Sun Jan 20 19:56:18 2013 +0100 +++ b/src/dialogs.py Tue Jan 22 17:38:43 2013 +0100 @@ -947,6 +947,7 @@ liststore = gtk.ListStore(str) self.protocol_jid_combobox.set_model(liststore) if jid: + self.jid_escaped = True type_ = gajim.get_transport_name_from_jid(jid) if not type_: type_ = 'jabber' @@ -981,6 +982,7 @@ self.nickname_entry.set_text(user_nick) self.nickname_entry.grab_focus() else: + self.jid_escaped = False self.uid_entry.grab_focus() group_names = [] for acct in accounts: @@ -1055,7 +1057,7 @@ model = self.protocol_combobox.get_model() iter_ = self.protocol_combobox.get_active_iter() type_ = model[iter_][2] - if type_ != 'jabber': + if type_ != 'jabber' and not self.jid_escaped: transport = self.protocol_jid_combobox.get_active_text().decode( 'utf-8') if self.account:

1 0

gajim: fix last commit
by Denis Fomin 21 Jan '13

21 Jan '13

changeset 44e33b821a74 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=44e33b821a74 description: fix last commit diffstat: src/disco.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8ce849e99b47 -r 44e33b821a74 src/disco.py --- a/src/disco.py Mon Jan 21 23:50:52 2013 +0400 +++ b/src/disco.py Tue Jan 22 00:32:09 2013 +0400 @@ -869,7 +869,7 @@ """ Set the initial window title based on agent address """ - self.window.get_window().set_title(_('Browsing %(address)s using account ' + self.window.window.set_title(_('Browsing %(address)s using account ' '%(account)s') % {'address': self._get_agent_address(), 'account': self.account}) self.window._set_window_banner_text(self._get_agent_address())

1 0

gajim: use get_window()
by Denis Fomin 21 Jan '13

21 Jan '13

changeset 8ce849e99b47 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8ce849e99b47 description: use get_window() diffstat: src/dialogs.py | 2 +- src/disco.py | 2 +- src/message_window.py | 2 +- src/roster_window.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diffs (57 lines): diff -r 71d22ddb7168 -r 8ce849e99b47 src/dialogs.py --- a/src/dialogs.py Sun Jan 20 23:04:26 2013 +0100 +++ b/src/dialogs.py Mon Jan 21 23:50:52 2013 +0400 @@ -2325,7 +2325,7 @@ menu = self.prepare_popup_menu() menu.show_all() gtkgui_helpers.popup_emoticons_under_button(menu, widget, - self.window.window) + self.window.get_window()) class JoinGroupchatWindow: diff -r 71d22ddb7168 -r 8ce849e99b47 src/disco.py --- a/src/disco.py Sun Jan 20 23:04:26 2013 +0100 +++ b/src/disco.py Mon Jan 21 23:50:52 2013 +0400 @@ -869,7 +869,7 @@ """ Set the initial window title based on agent address """ - self.window.window.set_title(_('Browsing %(address)s using account ' + self.window.get_window().set_title(_('Browsing %(address)s using account ' '%(account)s') % {'address': self._get_agent_address(), 'account': self.account}) self.window._set_window_banner_text(self._get_agent_address()) diff -r 71d22ddb7168 -r 8ce849e99b47 src/message_window.py --- a/src/message_window.py Sun Jan 20 23:04:26 2013 +0100 +++ b/src/message_window.py Mon Jan 21 23:50:52 2013 +0400 @@ -396,7 +396,7 @@ # CTRL + PageUp | PageDown # Create event and send it to notebook event = Gdk.Event(Gdk.EventType.KEY_PRESS) - event.window = self.window.window + event.window = self.window.get_window() event.time = int(time.time()) event.state = Gdk.ModifierType.CONTROL_MASK event.keyval = int(keyval) diff -r 71d22ddb7168 -r 8ce849e99b47 src/roster_window.py --- a/src/roster_window.py Sun Jan 20 23:04:26 2013 +0100 +++ b/src/roster_window.py Mon Jan 21 23:50:52 2013 +0400 @@ -3420,7 +3420,7 @@ if gc_control: mw = gajim.interface.msg_win_mgr.get_window(jid, account) mw.set_active_tab(gc_control) - mw.window.window.focus(Gtk.get_current_event_time()) + mw.window.get_window().focus(Gtk.get_current_event_time()) return ctrl = gajim.interface.minimized_controls[account][jid] mw = gajim.interface.msg_win_mgr.get_window(jid, account) @@ -3430,7 +3430,7 @@ ctrl.parent_win = mw mw.new_tab(ctrl) mw.set_active_tab(ctrl) - mw.window.window.focus(Gtk.get_current_event_time()) + mw.window.get_window().focus(Gtk.get_current_event_time()) self.remove_groupchat(jid, account) def on_edit_account(self, widget, account):

1 0

gajim: launch.sh calls py3
by Yann Leboulanger 20 Jan '13

20 Jan '13

changeset 71d22ddb7168 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=71d22ddb7168 description: launch.sh calls py3 diffstat: launch.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 6650f3cbd846 -r 71d22ddb7168 launch.sh --- a/launch.sh Sun Jan 20 22:50:04 2013 +0100 +++ b/launch.sh Sun Jan 20 23:04:26 2013 +0100 @@ -1,6 +1,6 @@ #!/bin/sh if [ ! $PYTHON ]; then - PYTHON="python"; + PYTHON="python3"; fi cd "$(dirname $0)/src" exec $PYTHON -OOt gajim.py "$@"

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 January 2013