Commits

commits@gajim.org

17632 discussions

gajim: fix banner context menu
by Denis Fomin 06 Jan '13

06 Jan '13

changeset 77bddf457c8e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=77bddf457c8e description: fix banner context menu diffstat: src/message_window.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 7c041f024c86 -r 77bddf457c8e src/message_window.py --- a/src/message_window.py Sun Jan 06 22:07:16 2013 +0400 +++ b/src/message_window.py Mon Jan 07 00:20:18 2013 +0400 @@ -789,8 +789,9 @@ def popup_menu(self, event): menu = self.get_active_control().prepare_context_menu() # show the menu + menu.attach_to_widget(gajim.interface.roster.window, None) + menu.show_all() menu.popup(None, None, None, None, event.button, event.time) - menu.show_all() def _on_notebook_switch_page(self, notebook, page, page_num): old_no = notebook.get_current_page()

1 0

gajim: fix gajim version
by Denis Fomin 06 Jan '13

06 Jan '13

changeset 7c041f024c86 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7c041f024c86 description: fix gajim version diffstat: src/common/defs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5bbc88f23675 -r 7c041f024c86 src/common/defs.py --- a/src/common/defs.py Sun Jan 06 18:50:10 2013 +0400 +++ b/src/common/defs.py Sun Jan 06 22:07:16 2013 +0400 @@ -33,7 +33,7 @@ node = subprocess.Popen('hg tip --template "{node|short}"', shell=True, stdout=subprocess.PIPE).communicate()[0] if node: - version += '-' + node + version += '-' + node.decode('utf-8') except Exception: pass

1 0

gajim: fix submenu in roster and in statusicon
by Denis Fomin 06 Jan '13

06 Jan '13

changeset 5bbc88f23675 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5bbc88f23675 description: fix submenu in roster and in statusicon diffstat: data/gui/systray_context_menu.ui | 91 +++++++++++++++++++++++++-------------- src/roster_window.py | 59 +++++++++++++++---------- src/statusicon.py | 10 ++-- 3 files changed, 99 insertions(+), 61 deletions(-) diffs (truncated from 458 to 300 lines): diff -r 8752749e6b2f -r 5bbc88f23675 data/gui/systray_context_menu.ui --- a/data/gui/systray_context_menu.ui Sun Jan 06 15:10:35 2013 +0100 +++ b/data/gui/systray_context_menu.ui Sun Jan 06 18:50:10 2013 +0400 @@ -1,12 +1,45 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  +  + <object class="GtkAccelGroup" id="accelgroup1"/> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-network</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-jump-to</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-connect</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-new</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-home</property> + <property name="icon-size">1</property> + </object> <object class="GtkMenu" id="systray_context_menu"> + <property name="can_focus">False</property> <child> <object class="GtkImageMenuItem" id="status_menu"> <property name="label" translatable="yes">Sta_tus</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="image">image1</property> <property name="use_stock">False</property> @@ -16,7 +49,9 @@ <child> <object class="GtkImageMenuItem" id="chat_with_menuitem"> <property name="label" translatable="yes">_Start Chat</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="image">image2</property> <property name="use_stock">False</property> @@ -26,7 +61,9 @@ <child> <object class="GtkImageMenuItem" id="join_gc_menuitem"> <property name="label" translatable="yes">_Group Chat</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="image">image3</property> <property name="use_stock">False</property> @@ -36,7 +73,9 @@ <child> <object class="GtkImageMenuItem" id="single_message_menuitem"> <property name="label" translatable="yes">Send Single _Message</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="image">image4</property> <property name="use_stock">False</property> @@ -46,27 +85,34 @@ <child> <object class="GtkSeparatorMenuItem" id="separator12"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> </child> <child> <object class="GtkMenuItem" id="show_all_events_menuitem"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Show All Pending _Events</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_show_all_events_menuitem_activate"/> + <signal name="activate" handler="on_show_all_events_menuitem_activate" swapped="no"/> </object> </child> <child> <object class="GtkCheckMenuItem" id="sounds_mute_menuitem"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Mute Sounds</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_sounds_mute_menuitem_activate"/> + <signal name="activate" handler="on_sounds_mute_menuitem_activate" swapped="no"/> </object> </child> <child> <object class="GtkImageMenuItem" id="show_roster_menuitem"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="image">image5</property> <property name="use_stock">False</property> @@ -76,53 +122,32 @@ <child> <object class="GtkImageMenuItem" id="preferences_menuitem"> <property name="label">gtk-preferences</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <property name="accel_group">accelgroup1</property> - <signal name="activate" handler="on_preferences_menuitem_activate"/> + <signal name="activate" handler="on_preferences_menuitem_activate" swapped="no"/> </object> </child> <child> <object class="GtkSeparatorMenuItem" id="separator"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> </child> <child> <object class="GtkImageMenuItem" id="quit_menuitem"> <property name="label">gtk-quit</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <property name="accel_group">accelgroup1</property> - <signal name="activate" handler="on_quit_menuitem_activate"/> + <signal name="activate" handler="on_quit_menuitem_activate" swapped="no"/> </object> </child> </object> - <object class="GtkAccelGroup" id="accelgroup1"/> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-network</property> - <property name="icon-size">1</property> - </object> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-jump-to</property> - <property name="icon-size">1</property> - </object> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="stock">gtk-connect</property> - <property name="icon-size">1</property> - </object> - <object class="GtkImage" id="image4"> - <property name="visible">True</property> - <property name="stock">gtk-new</property> - <property name="icon-size">1</property> - </object> - <object class="GtkImage" id="image5"> - <property name="visible">True</property> - <property name="stock">gtk-home</property> - <property name="icon-size">1</property> - </object> </interface> diff -r 8752749e6b2f -r 5bbc88f23675 src/roster_window.py --- a/src/roster_window.py Sun Jan 06 15:10:35 2013 +0100 +++ b/src/roster_window.py Sun Jan 06 18:50:10 2013 +0400 @@ -293,8 +293,8 @@ # Draw all known groups for group in gajim.groups[account]: - self.draw_group(group, account) - self.draw_account(account) + self._really_draw_group(group, account) + self._really_draw_account(account) self.starting = False @@ -897,7 +897,7 @@ # update all contacts in the given group if self.regroup: - accounts = gajim.connections.keys() + accounts = list(gajim.connections.keys()) else: accounts = [account, ] @@ -1122,7 +1122,7 @@ self.model[child_iter][C_NAME] = text def _really_draw_groups(self): - for ag in self.groups_to_draw.values(): + for ag in list(self.groups_to_draw.values()): acct = ag['account'] grp = ag['group'] self._really_draw_group(grp, acct) @@ -1135,7 +1135,7 @@ return self.groups_to_draw[ag] = {'group': group, 'account': account} if len(self.groups_to_draw) == 1: - GObject.timeout_add(200, self._really_draw_groups) + GObject.idle_add(self._really_draw_groups) def draw_parent_contact(self, jid, account): child_iters = self._get_contact_iter(jid, account, model=self.model) @@ -1150,7 +1150,13 @@ self.draw_contact(parent_jid, parent_account) return False - def draw_contact(self, jid, account, selected=False, focus=False, contact_instances=None, contact=None): + def draw_contact(self, jid, account, selected=False, focus=False, + contact_instances=None, contact=None): + GObject.idle_add(self._really_draw_contact, jid, account, selected, + focus, contact_instances, contact) + + def _really_draw_contact(self, jid, account, selected=False, focus=False, + contact_instances=None, contact=None): """ Draw the correct state image, name BUT not avatar """ @@ -1329,6 +1335,10 @@ self.draw_pep(jid, account, pep_type, contact=contact) def draw_pep(self, jid, account, pep_type, contact=None): + GObject.idle_add(self._really_draw_pep, jid, account, pep_type, + contact) + + def _really_draw_pep(self, jid, account, pep_type, contact=None): if pep_type not in self._pep_type_to_model_column: return if not self._is_pep_shown_in_roster(pep_type): @@ -1348,6 +1358,9 @@ self.model[child_iter][model_column] = pixbuf def draw_avatar(self, jid, account): + GObject.idle_add(self._really_draw_avatar, jid, account) + + def _really_draw_avatar(self, jid, account): iters = self._get_contact_iter(jid, account, model=self.model) if not iters or not gajim.config.get('show_avatars_in_roster'): return @@ -1871,7 +1884,7 @@ 'groups': ['self_contact'], 'subscription': 'both', 'ask': 'none'} # .keys() is needed - for jid in array.keys(): + for jid in list(array.keys()): # Remove the contact in roster. It might has changed self.remove_contact(jid, account, force=True) # Remove old Contact instances @@ -1929,7 +1942,7 @@ chat_control.contact = contact1 def connected_rooms(self, account): - if account in gajim.gc_connected[account].values(): + if account in list(gajim.gc_connected[account].values()): return True return False @@ -1959,7 +1972,7 @@ self.draw_contact(jid, account) # Remove contacts in roster if removal was requested key = (jid, account) - if key in self.contacts_to_be_removed.keys(): + if key in list(self.contacts_to_be_removed.keys()): backend = self.contacts_to_be_removed[key]['backend'] del self.contacts_to_be_removed[key] # Remove contact will delay removal if there are more events @@ -2486,7 +2499,7 @@ Terminate all sessions and send offline to all connected account. We do NOT really quit gajim here """ - accounts = gajim.connections.keys() + accounts = list(gajim.connections.keys()) get_msg = False for acct in accounts: if gajim.connections[acct].connected: @@ -3569,7 +3582,7 @@ if modifier & Gdk.ModifierType.CONTROL_MASK: if keyval == Gdk.KEY_s: # CTRL + s model = self.status_combobox.get_model() - accounts = gajim.connections.keys() + accounts = list(gajim.connections.keys()) status = model[self.previous_status_combobox_active][2].decode(

1 0

gajim: fix registering new account
by Yann Leboulanger 06 Jan '13

06 Jan '13

changeset df25d88761a8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=df25d88761a8 description: fix registering new account diffstat: src/common/connection_handlers_events.py | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diffs (29 lines): diff -r 7ac7e47a48d4 -r df25d88761a8 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Jan 06 15:41:26 2013 +0400 +++ b/src/common/connection_handlers_events.py Sun Jan 06 15:11:34 2013 +0100 @@ -1562,17 +1562,18 @@ try: self.errnum = self.conn.connection.Connection.ssl_errnum except AttributeError: - self.errnum = -1 # we don't have an errnum + self.errnum = [] # we don't have an errnum self.ssl_msg = '' - if self.errnum > 0: - from common.connection import ssl_error - self.ssl_msg = ssl_error.get(self.errnum, _( - 'Unknown SSL error: %d') % self.errnum) + for er in self.errnum: + if er > 0: + from common.connection import ssl_error + self.ssl_msg = ssl_error.get(er, _('Unknown SSL error: %d') % \ + er) self.ssl_cert = '' - if hasattr(self.conn.connection.Connection, 'ssl_cert_pem'): + if len(self.conn.connection.Connection.ssl_cert_pem): self.ssl_cert = self.conn.connection.Connection.ssl_cert_pem self.ssl_fingerprint = '' - if hasattr(self.conn.connection.Connection, 'ssl_fingerprint_sha1'): + if len(self.conn.connection.Connection.ssl_fingerprint_sha1): self.ssl_fingerprint = \ self.conn.connection.Connection.ssl_fingerprint_sha1 return True

1 0

gajim: fix encoding problems
by Yann Leboulanger 06 Jan '13

06 Jan '13

changeset 8752749e6b2f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8752749e6b2f description: fix encoding problems diffstat: src/config.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 2688b908138c -r 8752749e6b2f src/config.py --- a/src/config.py Sun Jan 06 13:47:23 2013 +0100 +++ b/src/config.py Sun Jan 06 15:10:35 2013 +0100 @@ -2218,8 +2218,7 @@ def on_password_entry1_changed(self, widget): if self.ignore_events: return - passwords.save_password(self.current_account, widget.get_text().decode( - 'utf-8')) + passwords.save_password(self.current_account, widget.get_text()) def on_save_password_checkbutton1_toggled(self, widget): if self.ignore_events:

1 0

python-nbxmpp: fix encoding problems with DIGEST-MD5 authentication
by Yann Leboulanger 06 Jan '13

06 Jan '13

changeset 4f57dc985c04 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=4f57dc985c04 description: fix encoding problems with DIGEST-MD5 authentication diffstat: nbxmpp/auth_nb.py | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diffs (48 lines): diff -r 42db91212734 -r 4f57dc985c04 nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Sun Jan 06 13:46:59 2013 +0100 +++ b/nbxmpp/auth_nb.py Sun Jan 06 15:10:26 2013 +0100 @@ -39,7 +39,7 @@ def HH(some): return hashlib.md5(some).hexdigest() def H(some): return hashlib.md5(some).digest() -def C(some): return ':'.join(some) +def C(some): return b':'.join(some) try: kerberos = __import__('kerberos') @@ -463,7 +463,7 @@ @staticmethod def _convert_to_iso88591(string): try: - string = string.decode('utf-8').encode('iso-8859-1') + string = string.encode('iso-8859-1') except UnicodeEncodeError: pass return string @@ -484,14 +484,18 @@ hash_realm = self._convert_to_iso88591(self.resp['realm']) hash_password = self._convert_to_iso88591(self.password) A1 = C([H(C([hash_username, hash_realm, hash_password])), - self.resp['nonce'], self.resp['cnonce']]) - A2 = C(['AUTHENTICATE', self.resp['digest-uri']]) - response = HH(C([HH(A1), self.resp['nonce'], self.resp['nc'], - self.resp['cnonce'], self.resp['qop'], HH(A2)])) - A2 = C(['', self.resp['digest-uri']]) - self.digest_rspauth = HH(C([HH(A1), self.resp['nonce'], - self.resp['nc'], self.resp['cnonce'], self.resp['qop'], - HH(A2)])) + self.resp['nonce'].encode('utf-8'), self.resp['cnonce'].encode( + 'utf-8')]) + A2 = C([b'AUTHENTICATE', self.resp['digest-uri'].encode('utf-8')]) + response = HH(C([HH(A1).encode('utf-8'), self.resp['nonce'].encode( + 'utf-8'), self.resp['nc'].encode('utf-8'), self.resp['cnonce'].\ + encode('utf-8'), self.resp['qop'].encode('utf-8'), HH(A2).\ + encode('utf-8')])) + A2 = C([b'', self.resp['digest-uri'].encode('utf-8')]) + self.digest_rspauth = HH(C([HH(A1).encode('utf-8'), self.resp[ + 'nonce'].encode('utf-8'), self.resp['nc'].encode('utf-8'), + self.resp['cnonce'].encode('utf-8'), self.resp['qop'].encode( + 'utf-8'), HH(A2).encode('utf-8')])) self.resp['response'] = response sasl_data = '' for key in ('charset', 'username', 'realm', 'nonce', 'nc', 'cnonce',

1 0

gajim: fix connecting with python3 internal ssl implementation
by Yann Leboulanger 06 Jan '13

06 Jan '13

changeset 2688b908138c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2688b908138c description: fix connecting with python3 internal ssl implementation diffstat: src/common/connection.py | 2 +- src/common/connection_handlers_events.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diffs (28 lines): diff -r 6ddfd952427e -r 2688b908138c src/common/connection.py --- a/src/common/connection.py Sun Jan 06 15:41:26 2013 +0400 +++ b/src/common/connection.py Sun Jan 06 13:47:23 2013 +0100 @@ -1326,7 +1326,7 @@ certificate=con.Connection.ssl_certificate[i])) return True i += 1 - if hasattr(con.Connection, 'ssl_fingerprint_sha1'): + if len(con.Connection.ssl_fingerprint_sha1): saved_fingerprint = gajim.config.get_per('accounts', self.name, 'ssl_fingerprint_sha1') if saved_fingerprint: diff -r 6ddfd952427e -r 2688b908138c src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Jan 06 15:41:26 2013 +0400 +++ b/src/common/connection_handlers_events.py Sun Jan 06 13:47:23 2013 +0100 @@ -1568,10 +1568,10 @@ self.ssl_msg = ssl_error.get(er, _('Unknown SSL error: %d') % \ er) self.ssl_cert = '' - if hasattr(self.conn.connection.Connection, 'ssl_cert_pem'): + if len(self.conn.connection.Connection.ssl_cert_pem): self.ssl_cert = self.conn.connection.Connection.ssl_cert_pem self.ssl_fingerprint = '' - if hasattr(self.conn.connection.Connection, 'ssl_fingerprint_sha1'): + if len(self.conn.connection.Connection.ssl_fingerprint_sha1): self.ssl_fingerprint = \ self.conn.connection.Connection.ssl_fingerprint_sha1 return True

1 0

python-nbxmpp: fix connecting with python3 internal ssl implemen...
by Yann Leboulanger 06 Jan '13

06 Jan '13

changeset 42db91212734 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=42db91212734 description: fix connecting with python3 internal ssl implementation diffstat: nbxmpp/tls_nb.py | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diffs (77 lines): diff -r d971d36bbdd3 -r 42db91212734 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Sat Jan 05 17:24:18 2013 +0100 +++ b/nbxmpp/tls_nb.py Sun Jan 06 13:46:59 2013 +0100 @@ -16,6 +16,7 @@ ## GNU General Public License for more details. import socket +import ssl from .plugin import PlugIn import sys @@ -222,9 +223,10 @@ # we simply ignore flags since ssl object doesn't support it try: return self.sslobj.read(bufsize) - except socket.sslerror as e: - log.debug("Recv: Caught socket.sslerror: " + repr(e), exc_info=True) - if e.args[0] not in (socket.SSL_ERROR_WANT_READ, socket.SSL_ERROR_WANT_WRITE): + except ssl.SSLError as e: + log.debug("Recv: Caught ssl.SSLError: " + repr(e), exc_info=True) + if e.args[0] not in (ssl.SSL_ERROR_WANT_READ, + ssl.SSL_ERROR_WANT_WRITE): raise SSLWrapper.Error(self.sock or self.sslobj, e) return None @@ -232,9 +234,10 @@ # we simply ignore flags since ssl object doesn't support it try: return self.sslobj.write(data) - except socket.sslerror as e: + except ssl.SSLError as e: log.debug("Send: Caught socket.sslerror:", exc_info=True) - if e.args[0] not in (socket.SSL_ERROR_WANT_READ, socket.SSL_ERROR_WANT_WRITE): + if e.args[0] not in (ssl.SSL_ERROR_WANT_READ, + ssl.SSL_ERROR_WANT_WRITE): raise SSLWrapper.Error(self.sock or self.sslobj, e) return 0 @@ -433,14 +436,24 @@ log.debug("_startSSL_stdlib called") tcpsock=self._owner try: - tcpsock._sock.setblocking(True) - tcpsock._sslObj = socket.ssl(tcpsock._sock, None, None) - tcpsock._sock.setblocking(False) - tcpsock._sslIssuer = tcpsock._sslObj.issuer() - tcpsock._sslServer = tcpsock._sslObj.server() + tcpsock._sslObj = ssl.wrap_socket(tcpsock._sock, + ssl_version=ssl.PROTOCOL_TLSv1, do_handshake_on_connect=False) wrapper = StdlibSSLWrapper(tcpsock._sslObj, tcpsock._sock) tcpsock._recv = wrapper.recv tcpsock._send = wrapper.send + log.debug("Initiating handshake...") + try: + tcpsock._sslObj.do_handshake() + except (ssl.SSLError) as e: + if e.args[0] in (ssl.SSL_ERROR_WANT_READ, + ssl.SSL_ERROR_WANT_WRITE): + pass + else: + log.error('Error while TLS handshake: ', exc_info=True) + return False + except: + log.error('Error while TLS handshake: ', exc_info=True) + return False except: log.error("Exception caught in _startSSL_stdlib:", exc_info=True) return False @@ -455,7 +468,7 @@ self._owner.ssl_certificate.append(cert) self._owner.ssl_errnum.append(errnum) self._owner.ssl_cert_pem.append(OpenSSL.crypto.dump_certificate( - OpenSSL.crypto.FILETYPE_PEM, cert).decode('utf-8')) + OpenSSL.crypto.FILETYPE_PEM, cert).decode('utf-8')) return True except: log.error("Exception caught in _ssl_info_callback:", exc_info=True)

1 0

gajim: Fix PEP
by Denis Fomin 06 Jan '13

06 Jan '13

changeset 7ac7e47a48d4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7ac7e47a48d4 description: Fix PEP diffstat: src/common/pep.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r b2c33dd5485f -r 7ac7e47a48d4 src/common/pep.py --- a/src/common/pep.py Sun Jan 06 15:21:23 2013 +0400 +++ b/src/common/pep.py Sun Jan 06 15:41:26 2013 +0400 @@ -157,7 +157,8 @@ 'sleeping': _('Sleeping'), 'thinking': _('Thinking')}, 'relaxing': {'category': _('Relaxing'), - 'fishing': _('Gaming'), + 'fishing': _('Fishing'), + 'gaming': _('Gaming'), 'going_out': _('Going out'), 'partying': _('Partying'), 'reading': _('Reading'),

1 0

gajim: Fix PEP
by Denis Fomin 06 Jan '13

06 Jan '13

changeset 6ddfd952427e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6ddfd952427e description: Fix PEP diffstat: src/common/pep.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 5e9496f6ab87 -r 6ddfd952427e src/common/pep.py --- a/src/common/pep.py Sun Jan 06 12:35:10 2013 +0400 +++ b/src/common/pep.py Sun Jan 06 15:41:26 2013 +0400 @@ -157,7 +157,8 @@ 'sleeping': _('Sleeping'), 'thinking': _('Thinking')}, 'relaxing': {'category': _('Relaxing'), - 'fishing': _('Gaming'), + 'fishing': _('Fishing'), + 'gaming': _('Gaming'), 'going_out': _('Going out'), 'partying': _('Partying'), 'reading': _('Reading'),

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