Commits February 2010

commits@gajim.org

4 participants
103 discussions

gajim-website: prepare website for 0.13.3 release
by Yann Leboulanger 23 Feb '10

23 Feb '10

changeset 1659ecb465c3 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=1659ecb465c3 description: prepare website for 0.13.3 release diffstat: downloads.php | 2 +- index.php | 75 +++++++++++++++++------------ locale/bg_BG/LC_MESSAGES/msg.po | 94 ++++++++++++++++++++++--------------- locale/de_DE/LC_MESSAGES/msg.po | 101 ++++++++++++++++++++++----------------- locale/eo/LC_MESSAGES/msg.po | 94 ++++++++++++++++++++++--------------- locale/es_ES/LC_MESSAGES/msg.po | 91 ++++++++++++++++++++++------------- locale/fr_FR/LC_MESSAGES/msg.po | 96 +++++++++++++++++++++---------------- locale/it_IT/LC_MESSAGES/msg.po | 94 ++++++++++++++++++++++--------------- locale/pl_PL/LC_MESSAGES/msg.po | 98 ++++++++++++++++++++++---------------- locale/pt_BR/LC_MESSAGES/msg.po | 98 ++++++++++++++++++++++---------------- locale/ru_RU/LC_MESSAGES/msg.po | 98 ++++++++++++++++++++++---------------- msg.pot | 90 +++++++++++++++++++++------------- 12 files changed, 607 insertions(+), 424 deletions(-) diffs (truncated from 2488 to 300 lines): diff -r a77f73f94f1b -r 1659ecb465c3 downloads.php --- a/downloads.php Thu Jan 14 21:17:44 2010 +0100 +++ b/downloads.php Tue Feb 23 20:00:54 2010 +0100 @@ -5,7 +5,7 @@ Entete (_("Gajim, a Jabber client"), "GAJIM"); $download_folder = "0.13"; -$last_version = "0.13.2"; +$last_version = "0.13.3"; print (" \n"); print _(" Latest version of Gajim is")." ".$last_version." \n"; #printf(_(" A %s version is in test"), "0.13-rc5"); diff -r a77f73f94f1b -r 1659ecb465c3 index.php --- a/index.php Thu Jan 14 21:17:44 2010 +0100 +++ b/index.php Tue Feb 23 20:00:54 2010 +0100 @@ -48,76 +48,87 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Gajim %s is here!"), "0.13.2"), - 1 => sprintf(_("Gajim %s is here!"), "0.13.1"), - 2 => sprintf(_("Gajim %s is here!"), "0.13"), - 3 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), - 4 => sprintf(_("Release candidate 4 of Gajim %s"), "0.13"), - 5 => sprintf(_("Release candidate 1 of Gajim %s"), "0.13"), - 6 => sprintf(_("Gajim %s is here!"), "0.12.5")); + 0 => sprintf(_("Gajim %s is here!"), "0.13.3"), + 1 => sprintf(_("Gajim %s is here!"), "0.13.2"), + 2 => sprintf(_("Gajim %s is here!"), "0.13.1"), + 3 => sprintf(_("Gajim %s is here!"), "0.13"), + 4 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), + 5 => sprintf(_("Release candidate 4 of Gajim %s"), "0.13"), + 6 => sprintf(_("Release candidate 1 of Gajim %s"), "0.13"), + 7 => sprintf(_("Gajim %s is here!"), "0.12.5")); // 6 => sprintf(_("Beta-release of Gajim %s"), "0.12"), // 7 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); // 3 => sprintf(_("New windows installer")), $array_news_date = array( - 0 => _("14 January 2010"), - 1 => _("28 November 2009"), - 2 => _("23 November 2009"), - 3 => _("7 November 2009"), - 4 => _("4 November 2009"), - 5 => _("3 November 2009"), - 6 => _("08 August 2009")); + 0 => _("23 February 2010"), + 1 => _("14 January 2010"), + 2 => _("28 November 2009"), + 3 => _("23 November 2009"), + 4 => _("7 November 2009"), + 5 => _("4 November 2009"), + 6 => _("3 November 2009"), + 7 => _("08 August 2009")); $array_news_desc = array( - 0 => sprintf(_("Version %s of Gajim has been released."), "0.13.2"), - 1 => sprintf(_("Version %s of Gajim has been released."), "0.13.1"), - 2 => sprintf(_("Version %s of Gajim has been released."), "0.13"), - 3 => sprintf(_("Version %s will arrive soon."), "0.13"), + 0 => sprintf(_("Version %s of Gajim has been released."), "0.13.3"), + 1 => sprintf(_("Version %s of Gajim has been released."), "0.13.2"), + 2 => sprintf(_("Version %s of Gajim has been released."), "0.13.1"), + 3 => sprintf(_("Version %s of Gajim has been released."), "0.13"), 4 => sprintf(_("Version %s will arrive soon."), "0.13"), 5 => sprintf(_("Version %s will arrive soon."), "0.13"), - 6 => sprintf(_("Version %s of Gajim has been released."), "0.12.5")); + 6 => sprintf(_("Version %s will arrive soon."), "0.13"), + 7 => sprintf(_("Version %s of Gajim has been released."), "0.12.5")); // 6 => sprintf(_("Version %s will arrive very soon."), "0.12"), // 7 => sprintf(_("Version %s will arrive soon."), "0.12")); // 3 => sprintf(_("New Windows Installer with GTK+ included.")), $array_news_whats_new = array( - 0 => sprintf(_("What's new since %s:"), "0.13.1"), - 1 => sprintf(_("What's new since %s:"), "0.13"), - 2 => sprintf(_("What's new since %s:"), "0.13-rc5"), - 3 => sprintf(_("What's new since %s:"), "0.13-rc4"), - 4 => sprintf(_("What's new since %s:"), "0.13-rc1"), - 5 => sprintf(_("What's new since %s:"), "0.12.5"), - 6 => sprintf(_("What's new since %s:"), "0.12.4")); + 0 => sprintf(_("What's new since %s:"), "0.13.2"), + 1 => sprintf(_("What's new since %s:"), "0.13.1"), + 2 => sprintf(_("What's new since %s:"), "0.13"), + 3 => sprintf(_("What's new since %s:"), "0.13-rc5"), + 4 => sprintf(_("What's new since %s:"), "0.13-rc4"), + 5 => sprintf(_("What's new since %s:"), "0.13-rc1"), + 6 => sprintf(_("What's new since %s:"), "0.12.5"), + 7 => sprintf(_("What's new since %s:"), "0.12.4")); // 3 => sprintf(_("What's new in it:")), $array_news_items[0] = array( + 0 => _("Fix facebook xmpp server connection"), + 1 => _("Fix copy / paste with Ctrl+C on non-latin keyboard"), + 2 => _("Fix sending PEP information when connecting"), + 3 => _("Fix parsing HTML messages that have ascii markup"), + ); + +$array_news_items[1] = array( 0 => _("Fix some translations"), 1 => _("Fix string comparison according to locales"), 2 => _("Fix some gnomekeyring glitches"), 3 => _("Copy emoticons when we copy / paste in conversations"), ); -$array_news_items[1] = array( +$array_news_items[2] = array( 0 => _("Fix a bug when no account exists and bonjour is not available"), 1 => _("Fix a bug when opening advanced option in MUC"), 2 => _("Fix a bug when using non-BOSH proxies"), ); -$array_news_items[2] = array( +$array_news_items[3] = array( 0 => _("Fix more BOSH bugs"), ); -$array_news_items[3] = array( +$array_news_items[4] = array( 0 => _("Fix BOSH connection with ejabberd server"), 1 => _("Fix self contact behaviour with anonymous connection"), 2 => _("Fix chatting with invisible contacts"), ); -$array_news_items[4] = array( +$array_news_items[5] = array( 0 => _("Fix BOSH URI parsing when port is not provided"), 1 => _("Fix windows version (we were using a function not available under PyGTK 2.12.1)"), ); -$array_news_items[5] = array( +$array_news_items[6] = array( 0 => _("BOSH connection support"), 1 => _("Roster versioning support"), 2 => _("Interface to send XHTML messages"), @@ -125,7 +136,7 @@ 4 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.13\">"._("List of fixed bugs")."</a>", ); -$array_news_items[6] = array( +$array_news_items[7] = array( 0 => _("Don't depend on GTK 2.14"), ); diff -r a77f73f94f1b -r 1659ecb465c3 locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Thu Jan 14 21:17:44 2010 +0100 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Tue Feb 23 20:00:54 2010 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-14 21:17+0100\n" +"POT-Creation-Date: 2010-02-23 19:54+0100\n" "PO-Revision-Date: 2007-03-14 17:52+0200\n" "Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" @@ -735,152 +735,173 @@ msgid "NEWS" msgstr "НОВИНИ" -#: index.php:51 index.php:52 index.php:53 index.php:57 +#: index.php:51 index.php:52 index.php:53 index.php:54 index.php:58 #, fuzzy, c-format msgid "Gajim %s is here!" msgstr "Излезе Gajim 0.11!" -#: index.php:54 +#: index.php:55 #, fuzzy, c-format msgid "Release candidate 5 of Gajim %s" msgstr "Предварително издание на Gajim 0.11.1" -#: index.php:55 +#: index.php:56 #, fuzzy, c-format msgid "Release candidate 4 of Gajim %s" msgstr "Предварително издание на Gajim 0.11.1" -#: index.php:56 +#: index.php:57 #, fuzzy, c-format msgid "Release candidate 1 of Gajim %s" msgstr "Предварително издание на Gajim 0.11.1" -#: index.php:62 +#: index.php:63 +#, fuzzy +msgid "23 February 2010" +msgstr "7 февруари 2007 г." + +#: index.php:64 #, fuzzy msgid "14 January 2010" msgstr "18 февруари 2007 г." -#: index.php:63 +#: index.php:65 #, fuzzy msgid "28 November 2009" msgstr "19 декември 2006 г." -#: index.php:64 +#: index.php:66 #, fuzzy msgid "23 November 2009" msgstr "19 декември 2006 г." -#: index.php:65 +#: index.php:67 #, fuzzy msgid "7 November 2009" msgstr "19 декември 2006 г." -#: index.php:66 +#: index.php:68 #, fuzzy msgid "4 November 2009" msgstr "19 декември 2006 г." -#: index.php:67 +#: index.php:69 #, fuzzy msgid "3 November 2009" msgstr "19 декември 2006 г." -#: index.php:68 +#: index.php:70 msgid "08 August 2009" msgstr "" -#: index.php:71 index.php:72 index.php:73 index.php:77 +#: index.php:73 index.php:74 index.php:75 index.php:76 index.php:80 #, fuzzy, c-format msgid "Version %s of Gajim has been released." msgstr "Издадена е версия 0.11 на Gajim." -#: index.php:74 index.php:75 index.php:76 +#: index.php:77 index.php:78 index.php:79 #, fuzzy, c-format msgid "Version %s will arrive soon." msgstr "Скоро ще излезе версия 0.11.1." -#: index.php:83 index.php:84 index.php:85 index.php:86 index.php:87 -#: index.php:88 index.php:89 +#: index.php:86 index.php:87 index.php:88 index.php:89 index.php:90 +#: index.php:91 index.php:92 index.php:93 #, fuzzy, c-format msgid "What's new since %s:" msgstr "Какво е новото спрямо " -#: index.php:93 +#: index.php:97 +msgid "Fix facebook xmpp server connection" +msgstr "" + +#: index.php:98 +msgid "Fix copy / paste with Ctrl+C on non-latin keyboard" +msgstr "" + +#: index.php:99 +msgid "Fix sending PEP information when connecting" +msgstr "" + +#: index.php:100 +msgid "Fix parsing HTML messages that have ascii markup" +msgstr "" + +#: index.php:104 msgid "Fix some translations" msgstr "" -#: index.php:94 +#: index.php:105 msgid "Fix string comparison according to locales" msgstr "" -#: index.php:95 +#: index.php:106 msgid "Fix some gnomekeyring glitches" msgstr "" -#: index.php:96 +#: index.php:107 msgid "Copy emoticons when we copy / paste in conversations" msgstr "" -#: index.php:100 +#: index.php:111 msgid "Fix a bug when no account exists and bonjour is not available" msgstr "" -#: index.php:101 +#: index.php:112 msgid "Fix a bug when opening advanced option in MUC" msgstr "" -#: index.php:102 +#: index.php:113 msgid "Fix a bug when using non-BOSH proxies" msgstr ""

1 0

gajim: fix upgrading from 0.12.5. Fixes #5619
by Yann Leboulanger 23 Feb '10

23 Feb '10

changeset 56f481025ef8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=56f481025ef8 description: fix upgrading from 0.12.5. Fixes #5619 diffstat: src/common/optparser.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r faa456de56c0 -r 56f481025ef8 src/common/optparser.py --- a/src/common/optparser.py Tue Feb 23 19:10:51 2010 +0100 +++ b/src/common/optparser.py Tue Feb 23 19:47:14 2010 +0100 @@ -704,7 +704,9 @@ """ Remove hardcoded ../data/sounds from config """ - dirs = ('../data', gajim.gajimpaths.root, gajim.DATA_DIR) + dirs = ('../data', gajim.gajimpaths.data_root, gajim.DATA_DIR) + if os.name != 'nt': + dirs += (os.path.expanduser(u'~/.gajim')) for evt in gajim.config.get_per('soundevents'): path = gajim.config.get_per('soundevents', evt, 'path') # absolute and relative passes are necessary

1 0

gajim: fix bad class name in zeroconf
by Yann Leboulanger 23 Feb '10

23 Feb '10

changeset faa456de56c0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=faa456de56c0 description: fix bad class name in zeroconf diffstat: src/common/zeroconf/connection_handlers_zeroconf.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3e3399954e07 -r faa456de56c0 src/common/zeroconf/connection_handlers_zeroconf.py --- a/src/common/zeroconf/connection_handlers_zeroconf.py Mon Feb 22 16:29:01 2010 +0100 +++ b/src/common/zeroconf/connection_handlers_zeroconf.py Tue Feb 23 19:10:51 2010 +0100 @@ -75,7 +75,7 @@ connection_handlers.ConnectionHandlersBase): def __init__(self): ConnectionVcard.__init__(self) - ConnectionBytestreamZeroconf.__init__(self) + ConnectionSocks5BytestreamZeroconf.__init__(self) ConnectionCommands.__init__(self) connection_handlers.ConnectionHandlersBase.__init__(self)

1 0

gajim: prepare 0.13.3 release
by Yann Leboulanger 23 Feb '10

23 Feb '10

changeset 1c69ab30824d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1c69ab30824d description: prepare 0.13.3 release diffstat: ChangeLog | 11 +++++++++-- configure.ac | 2 +- gajim.nsi | 2 +- setup_win32.py | 2 +- src/common/defs.py | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diffs (71 lines): diff -r 7f279a70ec92 -r 1c69ab30824d ChangeLog --- a/ChangeLog Tue Feb 23 12:25:12 2010 +0100 +++ b/ChangeLog Tue Feb 23 13:02:09 2010 +0100 @@ -1,4 +1,11 @@ -Gajim 0.13.2 ((14 January 2010) +Gajim 0.13.3 (23 February 2010) + + * Fix facebook xmpp server connection + * Fix copy / paste with Ctrl+C on non-latin keyboard + * Fix sending PEP information when connecting + * Fix parsing HTML messages that have ascii markup + +Gajim 0.13.2 (14 January 2010) * Fix some translations * Fix string comparison according to locales @@ -7,7 +14,7 @@ * better SRV usage with libasyncns * copy emoticons when we copy / paste in conversations -Gajim 0.13.1 ((28 November 2009) +Gajim 0.13.1 (28 November 2009) * Fix a bug when no account exists and bonjour is not available * Fix a bug when opening advanced option in MUC diff -r 7f279a70ec92 -r 1c69ab30824d configure.ac --- a/configure.ac Tue Feb 23 12:25:12 2010 +0100 +++ b/configure.ac Tue Feb 23 13:02:09 2010 +0100 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.13.2],[http://trac.gajim.org/],[gajim]) + [0.13.3],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) diff -r 7f279a70ec92 -r 1c69ab30824d gajim.nsi --- a/gajim.nsi Tue Feb 23 12:25:12 2010 +0100 +++ b/gajim.nsi Tue Feb 23 13:02:09 2010 +0100 @@ -189,7 +189,7 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.13.1" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.13.3" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff -r 7f279a70ec92 -r 1c69ab30824d setup_win32.py --- a/setup_win32.py Tue Feb 23 12:25:12 2010 +0100 +++ b/setup_win32.py Tue Feb 23 13:02:09 2010 +0100 @@ -72,7 +72,7 @@ setup( name = 'Gajim', - version = '0.13.2', + version = '0.13.3', description = 'A full featured Jabber client', author = 'Gajim Development Team', url = 'http://www.gajim.org/', diff -r 7f279a70ec92 -r 1c69ab30824d src/common/defs.py --- a/src/common/defs.py Tue Feb 23 12:25:12 2010 +0100 +++ b/src/common/defs.py Tue Feb 23 13:02:09 2010 +0100 @@ -27,7 +27,7 @@ datadir = '../' localedir = '../po' -version = '0.13.2' +version = '0.13.3' import sys, os.path for base in ('.', 'common'):

1 0

gajim: fix history window
by Yann Leboulanger 23 Feb '10

23 Feb '10

changeset 7f279a70ec92 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7f279a70ec92 description: fix history window diffstat: src/history_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 91d506e37d0d -r 7f279a70ec92 src/history_window.py --- a/src/history_window.py Fri Feb 19 13:43:11 2010 +0100 +++ b/src/history_window.py Tue Feb 23 12:25:12 2010 +0100 @@ -158,7 +158,7 @@ muc_active_pix = muc_active_img.get_pixbuf() contact_pix = contact_img.get_pixbuf() - keys = self.completion_dict.keys() + keys = completion_dict.keys() # Move the actual jid at first so we load history faster actual_jid = self.jid_entry.get_text().decode('utf-8') if actual_jid in keys: @@ -243,7 +243,7 @@ self.results_window.set_property('visible', False) def on_jid_entry_focus(self, widget, event): - widget.select_region(0, -1) # select text + widget.select_region(0, -1) # select text def _load_history(self, jid_or_name, account = None): '''Load history for the given jid/name and show it'''

1 0

gajim: fix Ctrl+C handling. Fixes #1503
by Yann Leboulanger 23 Feb '10

23 Feb '10

changeset 91d506e37d0d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=91d506e37d0d description: fix Ctrl+C handling. Fixes #1503 diffstat: src/chat_control.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diffs (19 lines): diff -r dafdbbb3bb90 -r 91d506e37d0d src/chat_control.py --- a/src/chat_control.py Fri Feb 19 09:48:22 2010 +0100 +++ b/src/chat_control.py Fri Feb 19 13:43:11 2010 +0100 @@ -527,10 +527,11 @@ def _conv_textview_key_press_event(self, widget, event): # translate any layout to latin_layout keymap = gtk.gdk.keymap_get_default() - keycode, group, level = keymap.get_entries_for_keyval(event.keyval)[0] - keycodec, group, level = keymap.get_entries_for_keyval(gtk.keysyms.c)[0] - if (event.state & gtk.gdk.CONTROL_MASK and event.keyval in (keycodec, - gtk.keysyms.Insert)) or (event.state & gtk.gdk.SHIFT_MASK and \ + keycode = keymap.get_entries_for_keyval(event.keyval)[0][0] + keycode_c = keymap.get_entries_for_keyval(gtk.keysyms.c)[0][0] + keycode_ins = keymap.get_entries_for_keyval(gtk.keysyms.Insert)[0][0] + if (event.state & gtk.gdk.CONTROL_MASK and keycode in (keycode_c, + keycode_ins)) or (event.state & gtk.gdk.SHIFT_MASK and \ event.keyval in (gtk.keysyms.Page_Down, gtk.keysyms.Page_Up)): return False self.parent_win.notebook.emit('key_press_event', event)

1 0

gajim: save and restore roster position when we click on systray...
by Yann Leboulanger 23 Feb '10

23 Feb '10

changeset dafdbbb3bb90 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dafdbbb3bb90 description: save and restore roster position when we click on systray icon. Fixes #5196 diffstat: src/systray.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diffs (20 lines): diff -r 2e755978ad69 -r dafdbbb3bb90 src/systray.py --- a/src/systray.py Thu Feb 18 22:05:07 2010 +0100 +++ b/src/systray.py Fri Feb 19 09:48:22 2010 +0100 @@ -333,9 +333,15 @@ # we could be in another VD right now. eg vd2 # and we want to show it in vd2 if not gtkgui_helpers.possibly_move_window_in_current_desktop(win): + x, y = win.get_position() + gajim.config.set('roster_x-position', x) + gajim.config.set('roster_y-position', y) win.hide() # else we hide it from VD that was visible in else: - win.show_all() + if not win.get_property('visible'): + win.show_all() + win.move(gajim.config.get('roster_x-position'), + gajim.config.get('roster_y-position')) if not gajim.config.get('roster_window_skip_taskbar'): win.set_property('skip-taskbar-hint', False) win.present_with_time(gtk.get_current_event_time())

1 0

gajim: fix CTRL+C with non-latin keyboard. Fixes #1503
by Yann Leboulanger 23 Feb '10

23 Feb '10

changeset 2e755978ad69 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2e755978ad69 description: fix CTRL+C with non-latin keyboard. Fixes #1503 diffstat: src/chat_control.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r 89ee1d10d853 -r 2e755978ad69 src/chat_control.py --- a/src/chat_control.py Tue Feb 16 10:41:16 2010 +0100 +++ b/src/chat_control.py Thu Feb 18 22:05:07 2010 +0100 @@ -525,7 +525,11 @@ self.connect_style_event(widget, opts[0], opts[1]) def _conv_textview_key_press_event(self, widget, event): - if (event.state & gtk.gdk.CONTROL_MASK and event.keyval in (gtk.keysyms.c, + # translate any layout to latin_layout + keymap = gtk.gdk.keymap_get_default() + keycode, group, level = keymap.get_entries_for_keyval(event.keyval)[0] + keycodec, group, level = keymap.get_entries_for_keyval(gtk.keysyms.c)[0] + if (event.state & gtk.gdk.CONTROL_MASK and event.keyval in (keycodec, gtk.keysyms.Insert)) or (event.state & gtk.gdk.SHIFT_MASK and \ event.keyval in (gtk.keysyms.Page_Down, gtk.keysyms.Page_Up)): return False

1 0

gajim: prevent traceback when destroy handler already clean self...
by Yann Leboulanger 23 Feb '10

23 Feb '10

changeset 89ee1d10d853 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=89ee1d10d853 description: prevent traceback when destroy handler already clean self.instances[account]['online_dialog'] dict. Fixes #5604 diffstat: src/gajim.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 05c45bb18950 -r 89ee1d10d853 src/gajim.py --- a/src/gajim.py Tue Feb 16 09:44:23 2010 +0100 +++ b/src/gajim.py Tue Feb 16 10:41:16 2010 +0100 @@ -612,7 +612,9 @@ # .keys() is needed to not have a dictionary length changed during # iteration error self.instances[account]['online_dialog'][name].destroy() - del self.instances[account]['online_dialog'][name] + if name in self.instances[account]['online_dialog']: + # destroy handler may have already removed it + del self.instances[account]['online_dialog'][name] for request in self.gpg_passphrase.values(): if request: request.interrupt()

1 0

gajim: move some error/warning to info so it's not printed in st...
by Yann Leboulanger 23 Feb '10

23 Feb '10

changeset 05c45bb18950 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=05c45bb18950 description: move some error/warning to info so it's not printed in stderr by default. Fixes #5609 diffstat: src/common/xmpp/auth_nb.py | 20 ++++++++++---------- src/common/xmpp/client_nb.py | 4 ++-- src/common/xmpp/transports_nb.py | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diffs (130 lines): diff -r a4de7f9e6aff -r 05c45bb18950 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Tue Feb 16 09:27:19 2010 +0100 +++ b/src/common/xmpp/auth_nb.py Tue Feb 16 09:44:23 2010 +0100 @@ -179,7 +179,7 @@ ''' Used to determine if server supports SASL auth. Used internally. ''' if not feats.getTag('mechanisms', namespace=NS_SASL): self.startsasl='not-supported' - log.error('SASL not supported by server') + log.info('SASL not supported by server') return self.mecs = [] for mec in feats.getTag('mechanisms', namespace=NS_SASL).getTags( @@ -229,7 +229,7 @@ self.startsasl = SASL_IN_PROCESS raise NodeProcessed self.startsasl = SASL_FAILURE - log.error('I can only use DIGEST-MD5, GSSAPI and PLAIN mecanisms.') + log.info('I can only use DIGEST-MD5, GSSAPI and PLAIN mecanisms.') if self.on_sasl: self.on_sasl() return @@ -245,7 +245,7 @@ reason = challenge.getChildren()[0] except Exception: reason = challenge - log.error('Failed SASL authentification: %s' % reason) + log.info('Failed SASL authentification: %s' % reason) if len(self.mecs) > 0: # There are other mechanisms to test self.MechanismHandler() @@ -321,7 +321,7 @@ self._owner.send(str(Node('response', attrs={'xmlns':NS_SASL}))) else: self.startsasl = SASL_FAILURE - log.error('Failed SASL authentification: unknown challenge') + log.info('Failed SASL authentification: unknown challenge') if self.on_sasl: self.on_sasl() raise NodeProcessed @@ -397,7 +397,7 @@ def _on_username(self, resp): if not isResultNode(resp): - log.error('No result node arrived! Aborting...') + log.info('No result node arrived! Aborting...') return self.on_auth(None) iq=Iq(typ='set',node=resp) @@ -428,7 +428,7 @@ query.setTagData('hash', hash_) self._method='0k' else: - log.warn("Sequre methods unsupported, performing plain text \ + log.info("Sequre methods unsupported, performing plain text \ authentication") query.setTagData('password', self.password) self._method = 'plain' @@ -442,7 +442,7 @@ self.owner._registered_name = self.owner.User+'@'+self.owner.Server+\ '/'+self.owner.Resource return self.on_auth(self._method) - log.error('Authentication failed!') + log.info('Authentication failed!') return self.on_auth(None) @@ -473,7 +473,7 @@ attributes accordingly. ''' if not feats.getTag('bind', namespace=NS_BIND): - log.error('Server does not requested binding.') + log.info('Server does not requested binding.') # we try to bind resource anyway #self.bound='failure' self.bound = [] @@ -523,10 +523,10 @@ func=self._on_session) return if resp: - log.error('Binding failed: %s.' % resp.getTag('error')) + log.info('Binding failed: %s.' % resp.getTag('info')) self.on_bound(None) else: - log.error('Binding failed: timeout expired.') + log.info('Binding failed: timeout expired.') self.on_bound(None) def _on_session(self, resp): diff -r a4de7f9e6aff -r 05c45bb18950 src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Tue Feb 16 09:27:19 2010 +0100 +++ b/src/common/xmpp/client_nb.py Tue Feb 16 09:44:23 2010 +0100 @@ -361,7 +361,7 @@ # try to negotiate TLS if self.incoming_stream_version() != '1.0': # if stream version is less than 1.0, we can't do more - log.warn('While connecting with type = "tls": stream version ' + + log.info('While connecting with type = "tls": stream version ' + 'is less than 1.0') self._on_connect() return @@ -371,7 +371,7 @@ log.info('TLS supported by remote server. Requesting TLS start.') self._tls_negotiation_handler() else: - log.warn('While connecting with type = "tls": TLS unsupported ' + + log.info('While connecting with type = "tls": TLS unsupported ' + 'by remote server') self._on_connect() diff -r a4de7f9e6aff -r 05c45bb18950 src/common/xmpp/transports_nb.py --- a/src/common/xmpp/transports_nb.py Tue Feb 16 09:27:19 2010 +0100 +++ b/src/common/xmpp/transports_nb.py Tue Feb 16 09:44:23 2010 +0100 @@ -221,7 +221,7 @@ if hasattr(self, '_owner') and hasattr(self._owner, 'Dispatcher'): self.on_receive = self._owner.Dispatcher.ProcessNonBlocking else: - log.warning('No Dispatcher plugged. Received data will not be processed') + log.info('No Dispatcher plugged. Received data will not be processed') self.on_receive = None return self.on_receive = recv_handler @@ -441,7 +441,7 @@ self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() except socket.error, (errnum, errstr): - log.error('Error while disconnecting socket: %s' % errstr) + log.info('Error while disconnecting socket: %s' % errstr) self.fd = -1 NonBlockingTransport.disconnect(self, do_callback)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2010