Commits August 2015

commits@gajim.org

1 participants
40 discussions

gajim: show error message when we try to connect anonymously to ...
by Gajim 31 Aug '15

31 Aug '15

changeset 8bac9f87935e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=8bac9f87935e description: show error message when we try to connect anonymously to a server that doesn't support anonymous connection. Fixes #8138 diffstat: src/common/connection.py | 6 ++++++ src/common/connection_handlers_events.py | 4 ++++ src/gui_interface.py | 8 ++++++++ 3 files changed, 18 insertions(+), 0 deletions(-) diffs (55 lines): diff -r 4a5f5f99d5db -r 8bac9f87935e src/common/connection.py --- a/src/common/connection.py Thu Aug 27 14:53:18 2015 +0200 +++ b/src/common/connection.py Mon Aug 31 13:47:18 2015 +0200 @@ -2838,6 +2838,12 @@ self.connection.send(iq) def get_password(self, callback, type_): + if gajim.config.get_per('accounts', self.name, 'anonymous_auth') and \ + type_ != 'ANONYMOUS': + gajim.nec.push_incoming_event(NonAnonymousServerErrorEvent(None, + conn=self)) + self._on_disconnected() + return self.pasword_callback = (callback, type_) if type_ == 'X-MESSENGER-OAUTH2': client_id = gajim.config.get_per('accounts', self.name, diff -r 4a5f5f99d5db -r 8bac9f87935e src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Aug 27 14:53:18 2015 +0200 +++ b/src/common/connection_handlers_events.py Mon Aug 31 13:47:18 2015 +0200 @@ -1922,6 +1922,10 @@ name = 'privacy-list-active-default' base_network_events = [] +class NonAnonymousServerErrorEvent(nec.NetworkIncomingEvent): + name = 'non-anonymous-server-error' + base_network_events = [] + class VcardReceivedEvent(nec.NetworkIncomingEvent): name = 'vcard-received' base_network_events = [] diff -r 4a5f5f99d5db -r 8bac9f87935e src/gui_interface.py --- a/src/gui_interface.py Thu Aug 27 14:53:18 2015 +0200 +++ b/src/gui_interface.py Mon Aug 31 13:47:18 2015 +0200 @@ -1372,6 +1372,13 @@ self.instances[account]['online_dialog']['ssl_error'].set_title( _('SSL Certificate Verification for %s') % account) + def handle_event_non_anonymous_server(self, obj): + account = obj.conn.name + server = gajim.config.get_per('accounts', account, 'hostname') + dialogs.ErrorDialog(_('Non Anonymous Server'), sectext='Server "%s"' + 'does not support anonymous connection' % server, + transient_for=self.roster.window) + def handle_event_fingerprint_error(self, obj): # ('FINGERPRINT_ERROR', account, (new_fingerprint,)) account = obj.conn.name @@ -1568,6 +1575,7 @@ [self.handle_event_roster_item_exchange], 'signed-in': [self.handle_event_signed_in], 'ssl-error': [self.handle_event_ssl_error], + 'non-anonymous-server-error': [self.handle_event_non_anonymous_server], 'stream-conflict-received': [self.handle_event_resource_conflict], 'subscribe-presence-received': [ self.handle_event_subscribe_presence],

1 0

gajim: specify module version before importing
by Gajim 30 Aug '15

30 Aug '15

changeset 78bb694fa308 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=78bb694fa308 description: specify module version before importing diffstat: src/chat_control.py | 1 + src/gtkgui_helpers.py | 3 ++- src/gtkspell.py | 1 + src/gui_interface.py | 19 ++++++++++--------- 4 files changed, 14 insertions(+), 10 deletions(-) diffs (68 lines): diff -r 7ac4d602d73e -r 78bb694fa308 src/chat_control.py --- a/src/chat_control.py Sun Aug 30 23:22:42 2015 +0200 +++ b/src/chat_control.py Sun Aug 30 23:23:10 2015 +0200 @@ -29,6 +29,7 @@ import os import time +gi.require_version('GdkX11', '3.0') from gi.repository import GdkX11 from gi.repository import Gtk from gi.repository import Gdk diff -r 7ac4d602d73e -r 78bb694fa308 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Sun Aug 30 23:22:42 2015 +0200 +++ b/src/gtkgui_helpers.py Sun Aug 30 23:23:10 2015 +0200 @@ -177,11 +177,12 @@ Xfce and last KDE it returns None on failure or else a string 'Font Size' """ try: + gi.require_version('GConf', '2.0') from gi.repository import GConf client = GConf.Client.get_default() value = client.get_string("/desktop/gnome/interface/font_name") return value.decode("utf8") - except ImportError: + except ValueError: pass # try to get Xfce default font diff -r 7ac4d602d73e -r 78bb694fa308 src/gtkspell.py --- a/src/gtkspell.py Sun Aug 30 23:22:42 2015 +0200 +++ b/src/gtkspell.py Sun Aug 30 23:23:10 2015 +0200 @@ -18,6 +18,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. from gi.repository import Gtk +gi.require_version('GtkSpell', '3.0') from gi.repository import GtkSpell def ensure_attached(func): diff -r 7ac4d602d73e -r 78bb694fa308 src/gui_interface.py --- a/src/gui_interface.py Sun Aug 30 23:22:42 2015 +0200 +++ b/src/gui_interface.py Sun Aug 30 23:23:10 2015 +0200 @@ -2779,15 +2779,16 @@ gajim.ZEROCONF_ACC_NAME = account break # Is gnome configured to activate row on single click ? - try: - from gi.repository import GConf - client = GConf.Client.get_default() - click_policy = client.get_string( - '/apps/nautilus/preferences/click_policy') - if click_policy == 'single': - gajim.single_click = True - except Exception: - pass +# try: +# gi.require_version('GConf', '2.0') +# from gi.repository import GConf +# client = GConf.Client.get_default() +# click_policy = client.get_string( +# '/apps/nautilus/preferences/click_policy') +# if click_policy == 'single': +# gajim.single_click = True +# except Exception: +# pass # add default status messages if there is not in the config file if len(gajim.config.get_per('statusmsg')) == 0: default = gajim.config.statusmsg_default

1 0

gajim: finish update glade files for GTK3
by Gajim 30 Aug '15

30 Aug '15

changeset 7ac4d602d73e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7ac4d602d73e description: finish update glade files for GTK3 diffstat: data/gui/manage_bookmarks_window.ui | 373 ++-- data/gui/manage_pep_services_window.ui | 38 +- data/gui/manage_proxies_window.ui | 371 ++-- data/gui/manage_sounds_window.ui | 40 +- data/gui/message_window.ui | 8 +- data/gui/passphrase_dialog.ui | 125 +- data/gui/plugins_window.ui | 32 +- data/gui/popup_notification_window.ui | 33 +- data/gui/preferences_window.ui | 1713 +++++++++----------- data/gui/privacy_list_window.ui | 1246 ++++++++------- data/gui/privacy_lists_window.ui | 58 +- data/gui/profile_window.ui | 1220 +++++++-------- data/gui/progress_dialog.ui | 64 +- data/gui/remove_account_window.ui | 42 +- data/gui/roster_item_exchange_window.ui | 49 +- data/gui/roster_window.ui | 2 +- data/gui/search_window.ui | 62 +- data/gui/service_discovery_window.ui | 92 +- data/gui/service_registration_window.ui | 46 +- data/gui/single_message_window.ui | 161 +- data/gui/subscription_request_popup_menu.ui | 2 +- data/gui/subscription_request_window.ui | 55 +- data/gui/synchronise_select_account_dialog.ui | 104 +- data/gui/synchronise_select_contacts_dialog.ui | 84 +- data/gui/systray_context_menu.ui | 2 +- data/gui/vcard_information_window.ui | 1920 +++++++++++------------ data/gui/voip_call_received_dialog.ui | 20 +- data/gui/xml_console_window.ui | 20 +- data/gui/zeroconf_context_menu.ui | 2 +- data/gui/zeroconf_information_window.ui | 283 +- src/config.py | 8 +- src/vcard.py | 4 +- 32 files changed, 4107 insertions(+), 4172 deletions(-) diffs (truncated from 11957 to 300 lines): diff -r 74385f5bea1c -r 7ac4d602d73e data/gui/manage_bookmarks_window.ui --- a/data/gui/manage_bookmarks_window.ui Fri Aug 21 22:04:55 2015 +0200 +++ b/data/gui/manage_bookmarks_window.ui Sun Aug 30 23:22:42 2015 +0200 @@ -1,7 +1,7 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> + <interface> - <requires lib="gtk+" version="2.16"/> -  + <requires lib="gtk+" version="3.12"/> <object class="GtkListStore" id="liststore1"> <columns>  @@ -9,47 +9,55 @@ </columns> </object> <object class="GtkWindow" id="manage_bookmarks_window"> + <property name="can_focus">False</property> <property name="border_width">12</property> <property name="title" translatable="yes">Manage Bookmarks</property> <property name="default_width">550</property> <property name="default_height">300</property> <property name="type_hint">dialog</property> <child> - <object class="GtkVBox" id="vbox86"> + <object class="GtkBox" id="vbox86"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkHBox" id="hbox2965"> + <object class="GtkBox" id="hbox2965"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> - <object class="GtkVBox" id="vbox94"> + <object class="GtkBox" id="vbox94"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow37"> <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="GtkTreeView" id="bookmarks_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> </object> </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="hbuttonbox25"> + <object class="GtkButtonBox" id="hbuttonbox25"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <property name="layout_style">center</property> <child> @@ -60,7 +68,7 @@ <property name="can_default">True</property> <property name="receives_default">False</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_add_bookmark_button_clicked"/> + <signal name="clicked" handler="on_add_bookmark_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -76,7 +84,7 @@ <property name="can_default">True</property> <property name="receives_default">False</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_remove_bookmark_button_clicked"/> + <signal name="clicked" handler="on_remove_bookmark_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -87,197 +95,92 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkTable" id="table33"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> - <property name="n_rows">7</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> + <property name="can_focus">False</property> <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkLabel" id="label325"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Title:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label315"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Nickname:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label316"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Roo_m:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label317"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Server:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> <child> <object class="GtkLabel" id="label318"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Password:</property> <property name="use_underline">True</property> </object> <packing> + <property name="left_attach">0</property> <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> </packing> </child> <child> - <object class="GtkEntry" id="pass_entry"> + <object class="GtkBox" id="hbox1"> <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="visibility">False</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkEntry" id="server_entry"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label317"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Server:</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label316"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Roo_m:</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkEntry" id="room_entry"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkEntry" id="nick_entry"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label315"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Nickname:</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label325"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Title:</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> - </packing> - </child> - <child>

1 0

gajim: delete cache db when logs db doesn't exist. Anyway data w...
by Gajim 27 Aug '15

27 Aug '15

changeset 4a5f5f99d5db in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=4a5f5f99d5db description: delete cache db when logs db doesn't exist. Anyway data will be wrong inside. Fixes #8133 diffstat: src/common/check_paths.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (21 lines): diff -r fccc624c66cb -r 4a5f5f99d5db src/common/check_paths.py --- a/src/common/check_paths.py Wed Aug 26 22:01:35 2015 +0200 +++ b/src/common/check_paths.py Thu Aug 27 14:53:18 2015 +0200 @@ -330,6 +330,8 @@ check_and_possibly_move_config() if not os.path.exists(LOG_DB_PATH): + if os.path.exists(CACHE_DB_PATH): + os.remove(CACHE_DB_PATH) create_log_db() gajim.logger.init_vars() elif os.path.isdir(LOG_DB_PATH): @@ -344,7 +346,7 @@ print _('%s is a directory but should be a file') % CACHE_DB_PATH print _('Gajim will now exit') sys.exit() - + if not os.path.exists(XTLS_CERTS): create_path(XTLS_CERTS) if not os.path.exists(LOCAL_XTLS_CERTS):

1 0

gajim: update links and copyright in manpages. Fixes #8136, #7719
by Gajim 26 Aug '15

26 Aug '15

changeset fccc624c66cb in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=fccc624c66cb description: update links and copyright in manpages. Fixes #8136, #7719 diffstat: data/gajim-history-manager.1 | 16 ++++++++-------- data/gajim-remote.1 | 14 +++++++------- data/gajim.1 | 32 ++++++++++++++++---------------- 3 files changed, 31 insertions(+), 31 deletions(-) diffs (206 lines): diff -r 7781ffa75dea -r fccc624c66cb data/gajim-history-manager.1 --- a/data/gajim-history-manager.1 Thu Aug 20 21:53:59 2015 +0200 +++ b/data/gajim-history-manager.1 Wed Aug 26 22:01:35 2015 +0200 @@ -1,4 +1,4 @@ -.Dd August 11, 2013 +.Dd August 26, 2015 .Dt GAJIM-HISTORY-MANAGER 1 URM .Os UNIX .Sh NAME @@ -27,7 +27,7 @@ .El .Sh FILES .Bl -tag -width Ds -.It ~/.local/share/gajim/logs.db +.It $XDG_DATA_DIR/gajim/logs.db The history database log file used when .Op Fl c is not specified. @@ -46,7 +46,7 @@ .Pa THANKS , for a complete list. .Sh COPYRIGHT -Copyright (C) 2003-2013 Gajim Team +Copyright (C) 2003-2015 Gajim Team .Pp .Nm is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. @@ -56,7 +56,7 @@ .Pp You should have received a copy of the GNU General Public License along with .Nm . -If not, see <http://www.gnu.org/licenses/>. +If not, see <https://www.gnu.org/licenses/>. .Sh FEEDBACK You can report bugs or feature requests in our bug tracker at .Em trac.gajim.org @@ -65,19 +65,19 @@ mailing list; if you want to send us a patch, please do so in our bug tracker. You can also find us in our chat room. .Sh WWW -http://www.gajim.org/ +https://www.gajim.org/ .Sh XMPP You are welcome to join us at gajim(a)conference.gajim.org .Sh MAILING LIST Below are public mailing lists on lists.gajim.org .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo/gajim-devel -http://lists.gajim.org/cgi-bin/listinfo/translators +https://lists.gajim.org/cgi-bin/listinfo/gajim-devel +https://lists.gajim.org/cgi-bin/listinfo/translators .Ed .Pp More mailing lists at .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo +https://lists.gajim.org/cgi-bin/listinfo .Ed .Sh BUGS Please submit bugs at https://trac.gajim.org/ diff -r 7781ffa75dea -r fccc624c66cb data/gajim-remote.1 --- a/data/gajim-remote.1 Thu Aug 20 21:53:59 2015 +0200 +++ b/data/gajim-remote.1 Wed Aug 26 22:01:35 2015 +0200 @@ -1,4 +1,4 @@ -.Dd August 11, 2013 +.Dd August 26, 2015 .Dt GAJIM-REMOTE 1 URM .Os UNIX .Sh NAME @@ -99,7 +99,7 @@ .Pa THANKS , for a complete list. .Sh COPYRIGHT -Copyright (C) 2003-2013 Gajim Team +Copyright (C) 2003-2015 Gajim Team .Pp .Nm is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. @@ -109,7 +109,7 @@ .Pp You should have received a copy of the GNU General Public License along with .Nm . -If not, see <http://www.gnu.org/licenses/>. +If not, see <https://www.gnu.org/licenses/>. .Sh FEEDBACK You can report bugs or feature requests in our bug tracker at .Em trac.gajim.org @@ -118,19 +118,19 @@ mailing list; if you want to send us a patch, please do so in our bug tracker. You can also find us in our chat room. .Sh WWW -http://www.gajim.org/ +https://www.gajim.org/ .Sh XMPP You are welcome to join us at gajim(a)conference.gajim.org .Sh MAILING LIST Below are public mailing lists on lists.gajim.org .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo/gajim-devel -http://lists.gajim.org/cgi-bin/listinfo/translators +https://lists.gajim.org/cgi-bin/listinfo/gajim-devel +https://lists.gajim.org/cgi-bin/listinfo/translators .Ed .Pp More mailing lists at .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo +https://lists.gajim.org/cgi-bin/listinfo .Ed .Sh BUGS Please submit bugs at https://trac.gajim.org/ diff -r 7781ffa75dea -r fccc624c66cb data/gajim.1 --- a/data/gajim.1 Thu Aug 20 21:53:59 2015 +0200 +++ b/data/gajim.1 Wed Aug 26 22:01:35 2015 +0200 @@ -1,4 +1,4 @@ -.Dd August 11, 2013 +.Dd August 26, 2015 .Dt GAJIM 1 URM .Os UNIX .Sh NAME @@ -26,7 +26,7 @@ technologies for instant messaging, presence, multi-party chat, voice and video calls, collaboration, lightweight middleware, content syndication, and generalized routing of XML data. For more information -on the XMPP protocol see <http://xmpp.org/about-xmpp/>. +on the XMPP protocol see <https://xmpp.org/about-xmpp/>. .Sh OPTIONS .Bl -tag -width Ds .It Fl h Fl Fl help @@ -60,19 +60,19 @@ .El .Sh FILES .Bl -tag -width Ds -.It ~/.cache/gajim/cache.db +.It $XDG_CACHE_DIR/gajim/cache.db Cache database file of transports, caps, roster entry, and roster group. -.It ~/.cache/gajim/avatars/ +.It $XDG_CACHE_DIR/gajim/avatars/ Cache directory of avatars. -.It ~/.cache/gajim/vcards/ +.It $XDG_CACHE_DIR/gajim/vcards/ Cache directory of vCards (virtual cards). -.It ~/.config/gajim/ +.It $XDG_CONFIG_DIR/gajim/ The config-path used when .Op Fl c is not specified. -.It ~/.local/share/gajim/certs/ +.It $XDG_DATA_DIR/gajim/certs/ Directory where certificates are stored. -.It ~/.local/share/gajim/logs.db +.It $XDG_DATA_DIR/gajim/logs.db The history database log file. For more information on database logs see <https://trac.gajim.org/wiki/LogsDatabase>. .El @@ -90,7 +90,7 @@ .Pa THANKS , for a complete list. .Sh COPYRIGHT -Copyright (C) 2003-2013 Gajim Team +Copyright (C) 2003-2015 Gajim Team .Pp .Nm is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. @@ -100,7 +100,7 @@ .Pp You should have received a copy of the GNU General Public License along with .Nm . -If not, see <http://www.gnu.org/licenses/>. +If not, see <https://www.gnu.org/licenses/>. .Sh FEEDBACK You can report bugs or feature requests in our bug tracker at .Em trac.gajim.org @@ -109,26 +109,26 @@ mailing list; if you want to send us a patch, please do so in our bug tracker. You can also find us in our chat room. .Sh WWW -http://www.gajim.org/ +https://www.gajim.org/ .Sh XMPP You are welcome to join us at gajim(a)conference.gajim.org .Sh MAILING LIST Below are public mailing lists on lists.gajim.org .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo/gajim-devel -http://lists.gajim.org/cgi-bin/listinfo/translators +https://lists.gajim.org/cgi-bin/listinfo/gajim-devel +https://lists.gajim.org/cgi-bin/listinfo/translators .Ed .Pp More mailing lists at .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo +https://lists.gajim.org/cgi-bin/listinfo .Ed .Sh BUGS Please submit bugs at .Bd -literal -offset indent https://trac.gajim.org/ -http://trac-plugins.gajim.org/ -http://python-nbxmpp.gajim.org/ +https://trac-plugins.gajim.org/ +https://python-nbxmpp.gajim.org/ .Ed .Sh SEE ALSO .Xr gajim-remote 1

1 0

gajim: Start updating glade files for GTK3
by Gajim 21 Aug '15

21 Aug '15

changeset 5c8ba176fdfc in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=5c8ba176fdfc description: Start updating glade files for GTK3 diffstat: data/gui/account_context_menu.ui | 2 +- data/gui/account_creation_wizard_window.ui | 234 +++---- data/gui/accounts_window.ui | 734 ++++++++++++++----------- data/gui/add_new_contact_window.ui | 147 ++-- data/gui/adhoc_commands_window.ui | 87 ++- data/gui/advanced_configuration_window.ui | 2 +- data/gui/advanced_menuitem_menu.ui | 2 +- data/gui/archiving_preferences_window.ui | 293 +++++----- data/gui/atom_entry_window.ui | 215 +++--- data/gui/blocked_contacts_window.ui | 31 +- data/gui/change_activity_dialog.ui | 178 +++-- data/gui/change_mood_dialog.ui | 205 +++--- data/gui/change_password_dialog.ui | 188 +++--- data/gui/change_status_message_dialog.ui | 213 +++--- data/gui/chat_context_menu.ui | 2 +- data/gui/chat_control.ui | 54 +- data/gui/chat_to_muc_window.ui | 47 +- data/gui/choose_gpg_key_dialog.ui | 103 ++- data/gui/contact_context_menu.ui | 2 +- data/gui/data_form_window.ui | 347 ++++++----- data/gui/dubbleinput_dialog.ui | 12 +- data/gui/edit_groups_dialog.ui | 7 +- data/gui/esession_info_window.ui | 11 +- data/gui/features_window.ui | 83 +- data/gui/filetransfers.ui | 6 +- data/gui/gajim_themes_window.ui | 410 ++++++------- data/gui/gc_control_popup_menu.ui | 2 +- data/gui/gc_occupants_menu.ui | 2 +- data/gui/groupchat_control.ui | 53 +- data/gui/groups_post_window.ui | 50 +- data/gui/history_manager.ui | 19 +- data/gui/history_window.ui | 32 +- data/gui/input_dialog.ui | 14 +- data/gui/input_text_dialog.ui | 12 +- data/gui/item_archiving_preferences_window.ui | 376 ++++++------ data/gui/join_groupchat_window.ui | 2 +- 36 files changed, 2181 insertions(+), 1996 deletions(-) diffs (truncated from 7796 to 300 lines): diff -r 6614fa79b26c -r 5c8ba176fdfc data/gui/account_context_menu.ui --- a/data/gui/account_context_menu.ui Sun Aug 16 14:22:04 2015 +0200 +++ b/data/gui/account_context_menu.ui Fri Aug 21 22:02:30 2015 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.0"/> + <requires lib="gtk+" version="3.12"/> <object class="GtkMenu" id="account_context_menu"> <property name="can_focus">False</property> <child> diff -r 6614fa79b26c -r 5c8ba176fdfc data/gui/account_creation_wizard_window.ui --- a/data/gui/account_creation_wizard_window.ui Sun Aug 16 14:22:04 2015 +0200 +++ b/data/gui/account_creation_wizard_window.ui Fri Aug 21 22:02:30 2015 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.10"/> + <requires lib="gtk+" version="3.12"/> <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -57,9 +57,10 @@ <property name="show_tabs">False</property> <property name="show_border">False</property> <child> - <object class="GtkVBox" id="vbox78"> + <object class="GtkBox" id="vbox78"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label256"> @@ -88,10 +89,11 @@ <property name="top_padding">5</property> <property name="left_padding">12</property> <child> - <object class="GtkVBox" id="vbox83"> + <object class="GtkBox" id="vbox83"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="use_existing_account_radiobutton"> @@ -158,10 +160,11 @@ </packing> </child> <child> - <object class="GtkVBox" id="register_vbox"> + <object class="GtkBox" id="register_vbox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label270"> @@ -178,15 +181,24 @@ </packing> </child> <child> - <object class="GtkTable" id="table27"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">3</property> - <property name="n_columns">4</property> - <property name="column_spacing">12</property> <property name="row_spacing">6</property> + <property name="column_spacing">6</property> <child> - <placeholder/> + <object class="GtkLabel" id="label262"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Jabber ID:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">username_entry</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> <child> <object class="GtkEntry" id="username_entry"> @@ -196,8 +208,54 @@ </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"/> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label">@</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="server_comboboxtext"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry" id="server_comboboxtext_entry"> + <property name="can_focus">True</property> + <property name="completion">server_entrycompletion</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="anonymous_checkbutton1"> + <property name="label" translatable="yes">Anon_ymous authentication</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_anonymous_checkbutton1_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">3</property> </packing> </child> <child> @@ -207,13 +265,22 @@ <property name="xalign">0</property> <property name="label" translatable="yes">_Password:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">password_entry</property> </object> <packing> + <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkEntry" id="password_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> @@ -232,89 +299,12 @@ </object> <packing> <property name="left_attach">2</property> - <property name="right_attach">4</property> <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="width">2</property> </packing> </child> <child> - <object class="GtkEntry" id="password_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="visibility">False</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label262"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Jabber ID:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">username_entry</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label">@</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options"/> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="anonymous_checkbutton1"> - <property name="label" translatable="yes">Anon_ymous authentication</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_anonymous_checkbutton1_toggled" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="server_comboboxtext"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry" id="server_comboboxtext_entry"> - <property name="can_focus">True</property> - <property name="completion">server_entrycompletion</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - </packing> + <placeholder/> </child> </object> <packing> @@ -323,6 +313,9 @@ <property name="position">1</property> </packing> </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">1</property> @@ -339,10 +332,11 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox105"> + <object class="GtkBox" id="vbox105"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label368"> @@ -423,14 +417,11 @@ <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkTable" id="table32"> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property>

1 0

gajim: update source code for new glade file
by Gajim 21 Aug '15

21 Aug '15

changeset b578f71a4272 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b578f71a4272 description: update source code for new glade file diffstat: src/dialogs.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 5c8ba176fdfc -r b578f71a4272 src/dialogs.py --- a/src/dialogs.py Fri Aug 21 22:02:30 2015 +0200 +++ b/src/dialogs.py Fri Aug 21 22:03:24 2015 +0200 @@ -512,8 +512,8 @@ self.mood_buttons[mood].set_relief(Gtk.ReliefStyle.NONE) self.mood_buttons[mood].set_tooltip_text(pep.MOODS[mood]) self.mood_buttons[mood].connect('clicked', - self.on_mood_button_clicked, mood) - table.attach(self.mood_buttons[mood], x, x + 1, y, y + 1) + self.on_mood_button_clicked, mood) + table.attach(self.mood_buttons[mood], x, y, 1, 1) # Calculate the next position x += 1

1 0

gajim: create file directly with correct rights instead of using...
by Gajim 21 Aug '15

21 Aug '15

changeset c4b21516e1ea in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c4b21516e1ea description: create file directly with correct rights instead of using chmod later diffstat: src/common/optparser.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r b578f71a4272 -r c4b21516e1ea src/common/optparser.py --- a/src/common/optparser.py Fri Aug 21 22:03:24 2015 +0200 +++ b/src/common/optparser.py Fri Aug 21 22:04:14 2015 +0200 @@ -104,7 +104,8 @@ (base_dir, filename) = os.path.split(self.__filename) self.__tempfile = os.path.join(base_dir, '.' + filename) try: - f = open(self.__tempfile, 'w') + f = os.fdopen(os.open(self.__tempfile, + os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0o600), 'w') except IOError as e: return str(e) try: @@ -125,7 +126,6 @@ os.rename(self.__tempfile, self.__filename) except IOError as e: return str(e) - os.chmod(self.__filename, 0o600) def update_config(self, old_version, new_version): old_version_list = old_version.split('.') # convert '0.x.y' to (0, x, y)

1 0

gajim: start fixing Jingle Audio / Video
by Gajim 21 Aug '15

21 Aug '15

changeset 74385f5bea1c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=74385f5bea1c description: start fixing Jingle Audio / Video diffstat: src/chat_control.py | 13 ++++++++----- src/common/config.py | 2 +- src/common/jingle_rtp.py | 41 +++++++++++++++++++++++++++++++++++------ 3 files changed, 44 insertions(+), 12 deletions(-) diffs (140 lines): diff -r c4b21516e1ea -r 74385f5bea1c src/chat_control.py --- a/src/chat_control.py Fri Aug 21 22:04:14 2015 +0200 +++ b/src/chat_control.py Fri Aug 21 22:04:55 2015 +0200 @@ -29,6 +29,7 @@ import os import time +from gi.repository import GdkX11 from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf @@ -2147,16 +2148,18 @@ fixed = self.xml.get_object('outgoing_fixed') fixed.set_no_show_all(False) video_hbox.show_all() + out_da = self.xml.get_object('outgoing_drawingarea') + out_da.realize() if os.name == 'nt': - out_xid = self.xml.get_object( - 'outgoing_drawingarea').get_window().handle + out_xid = out_da.get_window().handle else: - out_xid = self.xml.get_object( - 'outgoing_drawingarea').get_window().xid + out_xid = out_da.get_window().get_xid() else: out_xid = None video_hbox.show_all() - in_xid = self.xml.get_object('incoming_drawingarea').get_window().xid + in_da = self.xml.get_object('incoming_drawingarea') + in_da.realize() + in_xid = in_da.get_window().get_xid() sid = gajim.connections[self.account].start_video( self.contact.get_full_jid(), in_xid, out_xid) else: diff -r c4b21516e1ea -r 74385f5bea1c src/common/config.py --- a/src/common/config.py Fri Aug 21 22:04:14 2015 +0200 +++ b/src/common/config.py Fri Aug 21 22:04:55 2015 +0200 @@ -301,7 +301,7 @@ 'show_self_contact': [opt_str, 'when_other_resource', _('When is self contact row displayed. Can be "always", "when_other_resource" or "never"'), True], 'audio_input_device': [opt_str, 'autoaudiosrc ! volume name=gajim_vol'], 'audio_output_device': [opt_str, 'autoaudiosink'], - 'video_input_device': [opt_str, 'autovideosrc ! videoscale ! ffmpegcolorspace'], + 'video_input_device': [opt_str, 'autovideosrc ! videoscale ! videoconvert'], 'video_output_device': [opt_str, 'autovideosink'], 'video_framerate': [opt_str, '', _('Optionally fix jingle output video framerate. Example: 10/1 or 25/2')], 'video_size': [opt_str, '', _('Optionally resize jingle output video. Example: 320x240')], diff -r c4b21516e1ea -r 74385f5bea1c src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Fri Aug 21 22:04:14 2015 +0200 +++ b/src/common/jingle_rtp.py Fri Aug 21 22:04:55 2015 +0200 @@ -197,8 +197,7 @@ if self.is_ready(): self.session.on_session_state_changed(self) elif name == 'farstream-new-local-candidate': - candidate = message.get_structure().get_value('candidate').copy( - ) + candidate = self.p2pstream.parse_new_local_candidate(message)[1] self.transport.candidates.append(candidate) if self.sent: # FIXME: Is this case even possible? @@ -374,8 +373,11 @@ class JingleVideo(JingleRTPContent): - def __init__(self, session, transport=None): + def __init__(self, session, transport=None, in_xid=0, out_xid=0): JingleRTPContent.__init__(self, session, 'video', transport) + self.in_xid = in_xid + self.out_xid = out_xid + self.out_xid_set = False self.setup_stream() def setup_stream(self): @@ -383,6 +385,8 @@ # sometimes, one window won't show up, # sometimes it'll freeze... JingleRTPContent.setup_stream(self, self._on_src_pad_added) + bus = self.pipeline.get_bus() + bus.connect('sync-message::element', self._on_sync_message) # the local parts if gajim.config.get('video_framerate'): @@ -398,17 +402,26 @@ video_size = 'video/x-raw,width=%s,height=%s ! ' % (w, h) else: video_size = '' + if gajim.config.get('video_see_self'): + tee = '! tee name=t ! queue ! videoscale ! ' + \ + 'video/x-raw,width=160,height=120 ! videoconvert ! ' + \ + '%s t. ! queue ' % gajim.config.get( + 'video_output_device') + else: + tee = '' + self.src_bin = self.make_bin_from_config('video_input_device', - '%%s ! %svideoscale ! %svideoconvert' % (framerate, video_size), - _("video input")) + '%%s %s! %svideoscale ! %svideoconvert' % (tee, framerate, + video_size), _("video input")) #caps = gst.element_factory_make('capsfilter') #caps.set_property('caps', gst.caps_from_string('video/x-raw-yuv, width=320, height=240')) self.pipeline.add(self.src_bin)#, caps) + self.pipeline.set_state(Gst.State.PLAYING) #src_bin.link(caps) self.sink = self.make_bin_from_config('video_output_device', - 'videoscale ! videoconvert ! %s force-aspect-ratio=True', + 'videoscale ! videoconvert ! %s', _("video output")) self.pipeline.add(self.sink) @@ -418,11 +431,27 @@ # The following is needed for farstream to process ICE requests: self.pipeline.set_state(Gst.State.PLAYING) + def _on_sync_message(self, bus, message): + if message.structure is None: + return False + if message.structure.get_name() == 'prepare-xwindow-id': + message.src.set_property('force-aspect-ratio', True) + imagesink = message.src + if gajim.config.get('video_see_self') and not self.out_xid_set: + imagesink.set_xwindow_id(self.out_xid) + self.out_xid_set = True + else: + imagesink.set_xwindow_id(self.in_xid) + def get_fallback_src(self): # TODO: Use avatar? pipeline = 'videotestsrc is-live=true ! video/x-raw,framerate=10/1 ! videoconvert' return Gst.parse_bin_from_description(pipeline, True) + def destroy(self): + JingleRTPContent.destroy(self) + self.pipeline.get_bus().disconnect_by_func(self._on_sync_message) + def get_content(desc): if desc['media'] == 'audio': return JingleAudio

1 0

gajim: [tmolitor] ability to download bigger files with higher t...
by Gajim 20 Aug '15

20 Aug '15

changeset 7781ffa75dea in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=7781ffa75dea description: [tmolitor] ability to download bigger files with higher timeouts. Fixes #8130 diffstat: src/common/helpers.py | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diffs (69 lines): diff -r d2c270eb2f7c -r 7781ffa75dea src/common/helpers.py --- a/src/common/helpers.py Thu Aug 20 15:08:53 2015 +0200 +++ b/src/common/helpers.py Thu Aug 20 21:53:59 2015 +0200 @@ -1459,9 +1459,11 @@ """ Download an image. This function should be launched in a separated thread. """ - mem, alt = '', '' - # Wait maximum 5s for connection - socket.setdefaulttimeout(5) + mem, alt, max_size = '', '', 2*1024*1024 + if 'max_size' in attrs: + max_size = attrs['max_size'] + # Wait maximum 10s for connection + socket.setdefaulttimeout(10) try: req = urllib2.Request(attrs['src']) req.add_header('User-Agent', 'Gajim ' + gajim.version) @@ -1471,13 +1473,13 @@ pixbuf = None alt = attrs.get('alt', 'Broken image') else: - # Wait 0.5s between each byte + # Wait 2s between each byte try: - f.fp._sock.fp._sock.settimeout(0.5) + f.fp._sock.fp._sock.settimeout(2) except Exception: pass - # Max image size = 2 MB (to try to prevent DoS) - deadline = time.time() + 3 + # On a slow internet connection with ~1000kbps you need ~10 seconds for 1 MB + deadline = time.time() + (10 * (max_size / 1048576)) while True: if time.time() > deadline: log.debug('Timeout loading image %s ' % attrs['src']) @@ -1500,7 +1502,7 @@ mem += temp else: break - if len(mem) > 2*1024*1024: + if len(mem) > max_size: alt = attrs.get('alt', '') if alt: alt += '\n' @@ -1515,15 +1517,19 @@ """ if not gajim.HAVE_PYCURL: return '', _('PyCURL is not installed') - mem, alt = '', '' + mem, alt, max_size = '', '', 2*1024*1024 + if 'max_size' in attrs: + max_size = attrs['max_size'] try: b = StringIO() c = pycurl.Curl() c.setopt(pycurl.URL, attrs['src'].encode('utf-8')) c.setopt(pycurl.FOLLOWLOCATION, 1) - c.setopt(pycurl.CONNECTTIMEOUT, 5) - c.setopt(pycurl.TIMEOUT, 10) - c.setopt(pycurl.MAXFILESIZE, 2000000) + # Wait maximum 10s for connection + c.setopt(pycurl.CONNECTTIMEOUT, 10) + # On a slow internet connection with ~1000kbps you need ~10 seconds for 1 MB + c.setopt(pycurl.TIMEOUT, 10 * (max_size / 1048576)) + c.setopt(pycurl.MAXFILESIZE, max_size) c.setopt(pycurl.WRITEFUNCTION, b.write) c.setopt(pycurl.USERAGENT, 'Gajim ' + gajim.version) # set proxy

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2015