Commits September 2008

commits@gajim.org

4 participants
83 discussions

[commit-gajim] r10404 - trunk/src
by asterix＠gajim.org 09 Sep '08

09 Sep '08

Author: asterix Date: 2008-09-09 21:20:00 +0200 (Tue, 09 Sep 2008) New Revision: 10404 Modified: trunk/src/roster_window.py Log: correct dialog and stanza when removing a not in roster contact. Fixes #4303 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-09-09 17:34:31 UTC (rev 10403) +++ trunk/src/roster_window.py 2008-09-09 19:20:00 UTC (rev 10404) @@ -3091,7 +3091,8 @@ if contact.sub != 'to' and is_checked: remove_auth = False for (contact, account) in list_: - gajim.connections[account].unsubscribe(contact.jid, remove_auth) + if _('Not in Roster') not in contact.get_shown_groups(): + gajim.connections[account].unsubscribe(contact.jid, remove_auth) self.remove_contact(contact.jid, account, backend=True) if not remove_auth and contact.sub == 'both': contact.name = '' @@ -3114,6 +3115,10 @@ _('By removing this contact you also remove authorization ' 'resulting in him or her always seeing you as offline.'), on_response_ok = (on_ok2, list_)) + elif _('Not in Roster') in contact.get_shown_groups(): + # Contact is not in roster + dialogs.ConfirmationDialog(pritext, _('Do you want to continue?'), + on_response_ok = (on_ok2, list_)) else: dialogs.ConfirmationDialogCheck(pritext, _('By removing this contact you also by default remove '

1 0

[commit-gajim] r10403 - trunk/src
by asterix＠gajim.org 09 Sep '08

09 Sep '08

Author: asterix Date: 2008-09-09 19:34:31 +0200 (Tue, 09 Sep 2008) New Revision: 10403 Modified: trunk/src/systray.py Log: add Manage Bookmarks to systray popup menu Modified: trunk/src/systray.py =================================================================== --- trunk/src/systray.py 2008-09-09 17:28:32 UTC (rev 10402) +++ trunk/src/systray.py 2008-09-09 17:34:31 UTC (rev 10403) @@ -252,6 +252,15 @@ account) break # No other connected account + newitem = gtk.SeparatorMenuItem() # separator + gc_sub_menu.append(newitem) + newitem = gtk.ImageMenuItem(_('_Manage Bookmarks...')) + img = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES, gtk.ICON_SIZE_MENU) + newitem.set_image(img) + newitem.connect('activate', + gajim.interface.roster.on_manage_bookmarks_menuitem_activate) + gc_sub_menu.append(newitem) + sounds_mute_menuitem.set_active(not gajim.config.get('sounds_on')) if os.name == 'nt':

1 0

[commit-gajim] r10402 - www-website
by asterix＠gajim.org 09 Sep '08

09 Sep '08

Author: asterix Date: 2008-09-09 19:28:32 +0200 (Tue, 09 Sep 2008) New Revision: 10402 Modified: www-website/docs.php Log: use %s in website strings to make translation possible Modified: www-website/docs.php =================================================================== --- www-website/docs.php 2008-09-09 16:44:24 UTC (rev 10401) +++ www-website/docs.php 2008-09-09 17:28:32 UTC (rev 10402) @@ -16,7 +16,8 @@ print (" <h2>\n"); print _(" Tarball and Subversion\n"); print (" </h2>\n"); -print _(" To get one of these versions, go to the")." <a href=\"downloads.php?lang=".$_SESSION['lang']."\">"._("download")."</a> "._("page.\n"); +$link = "<a href=\"downloads.php?lang=".$_SESSION['lang']."\">"._("download")."</a>"; +printf(_(" To get one of these versions, go to the %s page.\n"), $link); print (" <h3>\n"); print _(" Under GNU/Linux\n"); print (" </h3>\n"); @@ -39,7 +40,11 @@ print (" <h3>\n"); print _(" Under Microsoft Windows\n"); print (" </h3>\n"); -print _(" In a first time, you have to install")." <a href=\"http://www.python.org\">python</a>, <a href=\"http://www.gtk.org\">GTK+</a>, <a href=\"http://www.pygtk.org\">pygtk</a> "._("and")." <a href=\"http://starship.python.net/crew/mhammond/win32/\">pywin32</a>.\n"; +$link1 = "<a href=\"http://www.python.org\">python</a>"; +$link2 = "<a href=\"http://www.gtk.org\">GTK+</a>"; +$link3 = "<a href=\"http://www.pygtk.org\">pygtk</a>"; +$link4 = "<a href=\"http://starship.python.net/crew/mhammond/win32/\">pywin32</a>"; +printf(_(" In a first time, you have to install %s, %s, %s and %s.\n"), $link1, $link2, $link3, $link4); print (" <br/>\n"); print (" <ul>\n"); print (" <li>\n"); @@ -56,7 +61,8 @@ print (" </li>\n"); print (" </ul>\n"); print (" <br/>\n"); -print _(" You can now")." <a href=\"downloads.php?lang=".$_SESSION['lang']."\">"._("download Gajim")."</a> "._("and double click on gajim.py in src folder.\n"); +$link = "<a href=\"downloads.php?lang=".$_SESSION['lang']."\">"._("download Gajim")."</a>"; +printf(_(" You can now %s and double click on gajim.py in src folder.\n"), $link); print (" <p>\n"); print ("<a name=\"jabber\"></a>"); @@ -71,7 +77,8 @@ print (" </h1>\n"); print _(" You can understand how Gajim works")." <a href=\"http://trac.gajim.org/wiki/DevInfos\">"._("here")."</a>.\n"; print (" <br/>"); -print _(" Gajim uses the")." <a href=\"http://xmpppy.sourceforge.net/\">xmpppy</a> "._("library to do the interface with Jabber network.\n"); +$link = "<a href=\"http://xmpppy.sourceforge.net/\">xmpppy</a>"; +printf(_(" Gajim uses the %s library to do the interface with Jabber network.\n"), $link); print (" </p>\n"); PiedDePage();

1 0

[commit-gajim] r10401 - trunk/src
by asterix＠gajim.org 09 Sep '08

09 Sep '08

Author: asterix Date: 2008-09-09 18:44:24 +0200 (Tue, 09 Sep 2008) New Revision: 10401 Modified: trunk/src/roster_window.py Log: don't depend on python2.5 for now. Fixes #4306 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-09-08 18:36:15 UTC (rev 10400) +++ trunk/src/roster_window.py 2008-09-09 16:44:24 UTC (rev 10401) @@ -2031,8 +2031,13 @@ del gajim.interface.status_sent_to_users[account][contact.jid] # Delete pep if needed - keep_pep = any(c.show not in ('error', 'offline') for c in - contact_instances) + #FIXME: py2.5only +# keep_pep = any(c.show not in ('error', 'offline') for c in +# contact_instances) + keep_pep = False + for c in contact_instances: + if c.show not in ('error', 'offline'): + keep_pep = True if not keep_pep and contact.jid != gajim.get_jid_from_account(account) \ and not contact.is_groupchat(): pep.delete_pep(contact.jid, account)

1 0

[commit-gajim] r10400 - trunk/src/common
by asterix＠gajim.org 08 Sep '08

08 Sep '08

Author: asterix Date: 2008-09-08 20:36:15 +0200 (Mon, 08 Sep 2008) New Revision: 10400 Modified: trunk/src/common/logger.py Log: decode string before splitting it. Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2008-09-08 17:37:44 UTC (rev 10399) +++ trunk/src/common/logger.py 2008-09-08 18:36:15 UTC (rev 10400) @@ -722,8 +722,7 @@ # ..., 'FEAT', feature1, feature2, ...).join(' ')) # NOTE: if there's a need to do more gzip, put that to a function try: - data = GzipFile(fileobj=StringIO(str(data))).read().split('\0') - data = data.decode('utf-8') + data = GzipFile(fileobj=StringIO(str(data))).read().decode('utf-8').split('\0') except IOError: # This data is corrupted. It probably contains non-ascii chars to_be_removed.append((hash_method, hash))

1 0

[commit-gajim] r10399 - trunk/src/common
by asterix＠gajim.org 08 Sep '08

08 Sep '08

Author: asterix Date: 2008-09-08 19:37:44 +0200 (Mon, 08 Sep 2008) New Revision: 10399 Modified: trunk/src/common/logger.py Log: [avm] always encode data in utf-8 in database. see #4254 Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2008-09-08 16:31:02 UTC (rev 10398) +++ trunk/src/common/logger.py 2008-09-08 17:37:44 UTC (rev 10399) @@ -723,6 +723,7 @@ # NOTE: if there's a need to do more gzip, put that to a function try: data = GzipFile(fileobj=StringIO(str(data))).read().split('\0') + data = data.decode('utf-8') except IOError: # This data is corrupted. It probably contains non-ascii chars to_be_removed.append((hash_method, hash)) @@ -763,7 +764,7 @@ # if there's a need to do more gzip, put that to a function string = StringIO() gzip = GzipFile(fileobj=string, mode='w') - data = str(data) # the gzip module can't handle unicode objects + data = data.encode('utf-8') # the gzip module can't handle unicode objects gzip.write(data) gzip.close() data = string.getvalue()

1 0

[commit-gajim] r10398 - trunk/src/common
by asterix＠gajim.org 08 Sep '08

08 Sep '08

Author: asterix Date: 2008-09-08 18:31:02 +0200 (Mon, 08 Sep 2008) New Revision: 10398 Modified: trunk/src/common/logger.py Log: [avm] Gzip don't support unicode strings. Fixes #4254 Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2008-09-08 15:51:13 UTC (rev 10397) +++ trunk/src/common/logger.py 2008-09-08 16:31:02 UTC (rev 10398) @@ -707,21 +707,26 @@ # get data from table # the data field contains binary object (gzipped data), this is a hack # to get that data without trying to convert it to unicode - #tmp, self.con.text_factory = self.con.text_factory, str try: self.cur.execute('SELECT hash_method, hash, data FROM caps_cache;'); except sqlite.OperationalError: # might happen when there's no caps_cache table yet # -- there's no data to read anyway then - #self.con.text_factory = tmp return - #self.con.text_factory = tmp + + # list of corrupted entries that will be removed + to_be_removed = [] for hash_method, hash, data in self.cur: # for each row: unpack the data field # (format: (category, type, name, category, type, name, ... # ..., 'FEAT', feature1, feature2, ...).join(' ')) # NOTE: if there's a need to do more gzip, put that to a function - data = GzipFile(fileobj=StringIO(str(data))).read().split('\0') + try: + data = GzipFile(fileobj=StringIO(str(data))).read().split('\0') + except IOError: + # This data is corrupted. It probably contains non-ascii chars + to_be_removed.append((hash_method, hash)) + continue i=0 identities = list() features = list() @@ -740,6 +745,9 @@ # yield the row yield hash_method, hash, identities, features + for hash_method, hash in to_be_removed: + sql = 'DELETE FROM caps_cache WHERE hash_method = "%s" AND hash = "%s"' % (hash_method, hash) + self.simple_commit(sql) def add_caps_entry(self, hash_method, hash, identities, features): data=[] @@ -755,6 +763,7 @@ # if there's a need to do more gzip, put that to a function string = StringIO() gzip = GzipFile(fileobj=string, mode='w') + data = str(data) # the gzip module can't handle unicode objects gzip.write(data) gzip.close() data = string.getvalue()

1 0

[commit-gajim] r10397 - trunk/src
by bct＠gajim.org 08 Sep '08

08 Sep '08

Author: bct Date: 2008-09-08 17:51:13 +0200 (Mon, 08 Sep 2008) New Revision: 10397 Modified: trunk/src/chat_control.py Log: consolidate e2e status messages Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-09-08 12:00:27 UTC (rev 10396) +++ trunk/src/chat_control.py 2008-09-08 15:51:13 UTC (rev 10397) @@ -1798,13 +1798,12 @@ '''print esession settings to textview''' e2e_is_active = bool(self.session) and self.session.enable_encryption if e2e_is_active: - msg = _('E2E encryption enabled') - ChatControlBase.print_conversation_line(self, msg, 'status', '', None) + msg = _('This session is encrypted') if self.session.is_loggable(): - msg = _('Session WILL be logged') + msg += _(' and WILL be logged') else: - msg = _('Session WILL NOT be logged') + msg += _(' and WILL NOT be logged') ChatControlBase.print_conversation_line(self, msg, 'status', '', None)

1 0

[commit-gajim] r10396 - trunk/src/common
by asterix＠gajim.org 08 Sep '08

08 Sep '08

Author: asterix Date: 2008-09-08 14:00:27 +0200 (Mon, 08 Sep 2008) New Revision: 10396 Modified: trunk/src/common/idle.c Log: [Alex V. Myltsev] idle.c: cleanup. Replace METH_VARARGS with METH_NOARGS, discard win32 ifdefs (it's no more compiled on win32 anyway). Modified: trunk/src/common/idle.c =================================================================== --- trunk/src/common/idle.c 2008-09-08 11:55:51 UTC (rev 10395) +++ trunk/src/common/idle.c 2008-09-08 12:00:27 UTC (rev 10396) @@ -23,36 +23,27 @@ * along with Gajim. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _WIN32 - #include <X11/Xlib.h> - #include <X11/Xutil.h> - #include <X11/extensions/scrnsaver.h> -#endif +#include <X11/Xlib.h> +#include <X11/Xutil.h> +#include <X11/extensions/scrnsaver.h> #include <Python.h> -#ifndef _WIN32 - Display *display; -#endif +Display *display; - static PyObject * idle_init(PyObject *self, PyObject *args) { -#ifndef _WIN32 display = XOpenDisplay(NULL); -#endif + Py_INCREF(Py_None); return Py_None; } static PyObject * idle_getIdleSec(PyObject *self, PyObject *args) { -#ifndef _WIN32 static XScreenSaverInfo *mit_info = NULL; int idle_time, event_base, error_base; -#endif -#ifndef _WIN32 if (XScreenSaverQueryExtension(display, &event_base, &error_base)) { if (mit_info == NULL) @@ -62,24 +53,23 @@ } else idle_time = 0; -#endif + return Py_BuildValue("i", idle_time); } static PyObject * idle_close(PyObject *self, PyObject *args) { -#ifndef _WIN32 XCloseDisplay(display); -#endif + Py_INCREF(Py_None); return Py_None; } static PyMethodDef idleMethods[] = { - {"init", idle_init, METH_VARARGS, "init idle"}, - {"getIdleSec", idle_getIdleSec, METH_VARARGS, "Give the idle time in secondes"}, - {"close", idle_close, METH_VARARGS, "close idle"}, + {"init", idle_init, METH_NOARGS, "init idle"}, + {"getIdleSec", idle_getIdleSec, METH_NOARGS, "Give the idle time in secondes"}, + {"close", idle_close, METH_NOARGS, "close idle"}, {NULL, NULL, 0, NULL} };

1 0

[commit-gajim] r10395 - trunk/src
by asterix＠gajim.org 08 Sep '08

08 Sep '08

Author: asterix Date: 2008-09-08 13:55:51 +0200 (Mon, 08 Sep 2008) New Revision: 10395 Modified: trunk/src/gajim.py Log: [Alex V. Myltsev] timeout_add -> timeout_add_seconds to forget GPG passphrase. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-09-08 11:54:52 UTC (rev 10394) +++ trunk/src/gajim.py 2008-09-08 11:55:51 UTC (rev 10395) @@ -473,7 +473,7 @@ self.passphrase = passphrase self.completed = True if passphrase is not None: - gobject.timeout_add(30000, gajim.interface.forget_gpg_passphrase, + gobject.timeout_add_seconds(30, gajim.interface.forget_gpg_passphrase, self.keyid) for (account, cb) in self.callbacks: self.run_callback(account, cb)

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2008