Commits

commits@gajim.org

17632 discussions

gajim: Sort emoticons packs list in the preferences window.
by Gajim 18 Apr '16

18 Apr '16

changeset 2ead9c515fb6 in /home/hg/repos/gajim author: Anaël Verrier <elghinn(a)free.fr> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2ead9c515fb6 description: Sort emoticons packs list in the preferences window. diffstat: src/config.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (25 lines): diff -r 72f8389c90f2 -r 2ead9c515fb6 src/config.py --- a/src/config.py Sun Mar 27 18:09:21 2016 +0200 +++ b/src/config.py Sun Mar 27 18:09:58 2016 +0200 @@ -153,19 +153,19 @@ # user themes if os.path.isdir(gajim.MY_EMOTS_PATH): emoticons_list += os.listdir(gajim.MY_EMOTS_PATH) + emoticons_list.sort() renderer_text = Gtk.CellRendererText() emoticons_combobox.pack_start(renderer_text, True) emoticons_combobox.add_attribute(renderer_text, 'text', 0) model = Gtk.ListStore(str) emoticons_combobox.set_model(model) - l = [] + l = [_('Disabled')] for dir_ in emoticons_list: if not os.path.isdir(os.path.join(gajim.DATA_DIR, 'emoticons', dir_)) \ and not os.path.isdir(os.path.join(gajim.MY_EMOTS_PATH, dir_)) : continue if dir_ != '.svn': l.append(dir_) - l.append(_('Disabled')) for i in range(len(l)): model.append([l[i]]) if gajim.config.get('emoticons_theme') == l[i]:

1 0

gajim: [ralf] correctly store roster window size in one window m...
by Gajim 18 Apr '16

18 Apr '16

changeset 4c8fcf026ff1 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4c8fcf026ff1 description: [ralf] correctly store roster window size in one window mode. Fixes #8314 diffstat: src/roster_window.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diffs (13 lines): diff -r 2ead9c515fb6 -r 4c8fcf026ff1 src/roster_window.py --- a/src/roster_window.py Sun Mar 27 18:09:58 2016 +0200 +++ b/src/roster_window.py Sun Apr 03 16:42:21 2016 +0200 @@ -2473,9 +2473,6 @@ gajim.config.set('roster_x-position', x) gajim.config.set('roster_y-position', y) width, height = self.window.get_size() - # For the width use the size of the vbox containing the tree and - # status combo, this will cancel out any hpaned width - width = self.xml.get_object('roster_vbox2').get_allocation().width gajim.config.set('roster_width', width) gajim.config.set('roster_height', height) if not self.xml.get_object('roster_vbox2').get_property('visible'):

1 0

gajim: call gpg with LANG=C to prevent decoding issues
by Gajim 18 Apr '16

18 Apr '16

changeset 00fb9f8cfb30 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=00fb9f8cfb30 description: call gpg with LANG=C to prevent decoding issues diffstat: src/common/gnupg.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (15 lines): diff -r d02b76c94c5e -r 00fb9f8cfb30 src/common/gnupg.py --- a/src/common/gnupg.py Sun Apr 17 20:31:19 2016 +0200 +++ b/src/common/gnupg.py Mon Apr 18 22:38:17 2016 +0200 @@ -741,8 +741,10 @@ si = STARTUPINFO() si.dwFlags = STARTF_USESHOWWINDOW si.wShowWindow = SW_HIDE + env = os.environ + env['LANG'] = 'C' return Popen(cmd, shell=False, stdin=PIPE, stdout=PIPE, stderr=PIPE, - startupinfo=si) + env=env, startupinfo=si) def _read_response(self, stream, result): # Internal method: reads all the stderr output from GPG, taking notice

1 0

gajim-plugins: Better handling of thumbnail creation and some pr...
by Gajim Plugins 18 Apr '16

18 Apr '16

changeset f0d3759795e1 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=f0d3759795e1 description: Better handling of thumbnail creation and some preparations for py3... diffstat: httpupload/httpupload.py | 23 +++++++++++++---------- httpupload/manifest.ini | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diffs (75 lines): diff -r d815964e2845 -r f0d3759795e1 httpupload/httpupload.py --- a/httpupload/httpupload.py Sun Mar 06 16:06:29 2016 +0100 +++ b/httpupload/httpupload.py Mon Apr 18 03:03:38 2016 +0200 @@ -20,7 +20,7 @@ pil_available = True except: pil_available = False -import StringIO +from io import BytesIO import base64 from common import gajim @@ -330,17 +330,19 @@ for quality in quality_steps: thumb = Image.open(path_to_file) thumb.thumbnail((max_thumbnail_dimension, max_thumbnail_dimension), Image.ANTIALIAS) - output = StringIO.StringIO() + output = BytesIO() thumb.save(output, format='JPEG', quality=quality, optimize=True) thumb = output.getvalue() output.close() thumb = urllib2.quote(base64.standard_b64encode(thumb), '') - log.debug("thumbnail jpeg quality %d produces an image of size %d..." % (quality, len(thumb))) + log.debug("pil thumbnail jpeg quality %d produces an image of size %d..." % (quality, len(thumb))) if len(thumb) < max_thumbnail_size: break except: thumb = None else: + thumb = None + if not thumb: log.info("PIL not available, using GTK for image downsampling") temp_file = None try: @@ -359,7 +361,7 @@ with open(temp_file, 'rb') as content_file: thumb = content_file.read() thumb = urllib2.quote(base64.standard_b64encode(thumb), '') - log.debug("thumbnail jpeg quality %d produces an image of size %d..." % (quality, len(thumb))) + log.debug("gtk thumbnail jpeg quality %d produces an image of size %d..." % (quality, len(thumb))) if len(thumb) < max_thumbnail_size: break except: @@ -367,12 +369,13 @@ finally: if temp_file: os.unlink(temp_file) - if thumb and len(thumb) > max_thumbnail_size: - log.info("Couldn't compress image enough, not sending any thumbnail") - else: - log.info("Using thumbnail jpeg quality %d (image size: %d bytes)" % (quality, len(thumb))) - xhtml = '<body><br/><a href="%s"> <img alt="%s" src="data:image/png;base64,%s"/> </a></body>' % \ - (get.getData(), get.getData(), thumb) + if thumb: + if len(thumb) > max_thumbnail_size: + log.info("Couldn't compress image enough, not sending any thumbnail") + else: + log.info("Using thumbnail jpeg quality %d (image size: %d bytes)" % (quality, len(thumb))) + xhtml = '<body><br/><a href="%s"> <img alt="%s" src="data:image/png;base64,%s"/> </a></body>' % \ + (get.getData(), get.getData(), thumb) progress_window.close_dialog() id_ = gajim.get_an_id() def add_oob_tag(): diff -r d815964e2845 -r f0d3759795e1 httpupload/manifest.ini --- a/httpupload/manifest.ini Sun Mar 06 16:06:29 2016 +0100 +++ b/httpupload/manifest.ini Mon Apr 18 03:03:38 2016 +0200 @@ -1,7 +1,7 @@ [info] name: HttpUpload short_name: httpupload -version: 0.3.3 +version: 0.3.4 description: This plugin is designed to send a file to a contact or muc by using httpupload.<br/> Your server must support <a href="http://xmpp.org/extensions/xep-0363.html">XEP-0363: HTTP Upload</a>.<br/> Conversations supported this.<br/>

1 0

gajim: Use the timestamp of the forwarded message in mam process...
by Gajim 17 Apr '16

17 Apr '16

changeset b19bd9be4a87 in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b19bd9be4a87 description: Use the timestamp of the forwarded message in mam processing if possible. Fixes #8277 diffstat: src/common/connection_handlers_events.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (16 lines): diff -r 2f36b249c7af -r b19bd9be4a87 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Apr 15 02:37:58 2016 +0200 +++ b/src/common/connection_handlers_events.py Mon Apr 18 01:59:20 2016 +0200 @@ -1036,6 +1036,12 @@ tim = helpers.datetime_tuple(tim) self.tim = localtime(timegm(tim)) self.msg_ = self.stanza.getTag('message') + # use delay of archived message, if possible + delay = self.msg_.getTag('delay', namespace=nbxmpp.NS_DELAY2) + if delay: + tim = delay.getAttr('stamp') + tim = helpers.datetime_tuple(tim) + self.tim = localtime(timegm(tim)) to_ = self.msg_.getAttr('to') if to_: to_ = gajim.get_jid_without_resource(to_)

1 0

gajim: print timestamp as invisible in history window when we do...
by Gajim 17 Apr '16

17 Apr '16

changeset d02b76c94c5e 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=d02b76c94c5e description: print timestamp as invisible in history window when we don't want to see it so we can search for it. See #3939 diffstat: src/history_window.py | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diffs (33 lines): diff -r 7eb2b43c233d -r d02b76c94c5e src/history_window.py --- a/src/history_window.py Sun Apr 03 21:32:53 2016 +0200 +++ b/src/history_window.py Sun Apr 17 20:31:19 2016 +0200 @@ -73,6 +73,7 @@ scrolledwindow.add(self.history_textview.tv) self.history_buffer = self.history_textview.tv.get_buffer() self.history_buffer.create_tag('highlight', background = 'yellow') + self.history_buffer.create_tag('invisible', invisible=True) self.checkbutton = xml.get_object('log_history_checkbutton') self.checkbutton.connect('toggled', self.on_log_history_checkbutton_toggled) @@ -421,6 +422,12 @@ tim = time.strftime('%X ', time.localtime(float(tim))) buf.insert_with_tags_by_name(end_iter, tim + '\n', 'time_sometimes') + else: # don't print time. So we print it as invisible to be able to + # search for it + timestamp_str = gajim.config.get('time_stamp') + timestamp_str = helpers.from_one_line(timestamp_str) + tim = time.strftime(timestamp_str, time.localtime(float(tim))) + buf.insert_with_tags_by_name(end_iter, tim, 'invisible') tag_name = '' tag_msg = '' @@ -618,7 +625,7 @@ timestamp_str = gajim.config.get('time_stamp') timestamp_str = helpers.from_one_line(timestamp_str) tim = time.strftime(timestamp_str, local_time) - result = start_iter.forward_search(tim, gtk.TEXT_SEARCH_VISIBLE_ONLY, + result = start_iter.forward_search(tim, gtk.TEXT_SEARCH_TEXT_ONLY, None) if result is not None: match_start_iter, match_end_iter = result

1 0

gajim-website: fix typos
by Gajim Website 15 Apr '16

15 Apr '16

changeset 21dac983644e in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=21dac983644e description: fix typos diffstat: Design.php | 1 - dev.php | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diffs (23 lines): diff -r f16f06a4cd24 -r 21dac983644e Design.php --- a/Design.php Sat Apr 16 00:00:53 2016 +0200 +++ b/Design.php Sat Apr 16 00:09:47 2016 +0200 @@ -110,7 +110,6 @@ if ($language == "he" or $language == "ar") echo " <link rel=\"stylesheet\" href=\"css/main-rtl.css\" type=\"text/css\" />\n"; echo " <link rel=\"shortcut icon\" href=\"/favicon.ico\" />\n"; - if ($page == "dev.php") echo " </head>\n <body>\n"; echo "<div id=\"logo\">"; echo "<a href=\"index.php\" ><img id=\"logo_img\" src=\"imgs/up_logo.jpg\" alt=\"Gajim !\" title=\"Home\"/></a>\n"; diff -r f16f06a4cd24 -r 21dac983644e dev.php --- a/dev.php Sat Apr 16 00:00:53 2016 +0200 +++ b/dev.php Sat Apr 16 00:09:47 2016 +0200 @@ -54,7 +54,7 @@ <img alt="" style="border:0;" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" width="1" height="1"/> </fieldset> </form>' . "\n"); -print ("<script id='fbfzz19'>(function(i){var f,s=document.getElementById(i);f=document.createElement('iframe');f.src='//button.flattr.com/view/?fid=8wl31k&url=https%3A%2F%2Fgajim.org';f.title='Flattr';f.height=67;f.width=70;f.style.borderWidth=0;s.parentNode.insertBefore(f,s);})('fbfzz19');</script>"); +print ('<script id=\'fbfzz19\'>(function(i){var f,s=document.getElementById(i);f=document.createElement(\'iframe\');f.src=\'//button.flattr.com/view/?fid=8wl31k&url=https://gajim.org\';f.title=\'Flattr\';f.height=67;f.width=70;f.style.borderWidth=0;s.parentNode.insertBefore(f,s);})(\'fbfzz19\');</script>'); print (" </li>\n"); print (" </ul>\n");

1 0

gajim-website: re-add the flattr button
by Gajim Website 15 Apr '16

15 Apr '16

changeset f16f06a4cd24 in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=f16f06a4cd24 description: re-add the flattr button diffstat: Design.php | 12 ------------ dev.php | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) diffs (36 lines): diff -r 4a828d65565c -r f16f06a4cd24 Design.php --- a/Design.php Mon Jan 25 22:05:44 2016 +0100 +++ b/Design.php Sat Apr 16 00:00:53 2016 +0200 @@ -111,18 +111,6 @@ echo " <link rel=\"stylesheet\" href=\"css/main-rtl.css\" type=\"text/css\" />\n"; echo " <link rel=\"shortcut icon\" href=\"/favicon.ico\" />\n"; if ($page == "dev.php") - echo " <script type=\"text/javascript\"> - <![CDATA[//><!]]> - </script>\n"; echo " </head>\n <body>\n"; echo "<div id=\"logo\">"; echo "<a href=\"index.php\" ><img id=\"logo_img\" src=\"imgs/up_logo.jpg\" alt=\"Gajim !\" title=\"Home\"/></a>\n"; diff -r 4a828d65565c -r f16f06a4cd24 dev.php --- a/dev.php Mon Jan 25 22:05:44 2016 +0100 +++ b/dev.php Sat Apr 16 00:00:53 2016 +0200 @@ -53,8 +53,8 @@ <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" style="border:0;" name="submit" alt="PayPal - The safer, easier way to pay online!"/> <img alt="" style="border:0;" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" width="1" height="1"/> </fieldset> - </form>'); -print ('<a class="FlattrButton" style="display:none;" href="http://gajim.org"></a>'); + </form>' . "\n"); +print ("<script id='fbfzz19'>(function(i){var f,s=document.getElementById(i);f=document.createElement('iframe');f.src='//button.flattr.com/view/?fid=8wl31k&url=https%3A%2F%2Fgajim.org';f.title='Flattr';f.height=67;f.width=70;f.style.borderWidth=0;s.parentNode.insertBefore(f,s);})('fbfzz19');</script>"); print (" </li>\n"); print (" </ul>\n");

1 0

gajim: small bugfix
by Gajim 15 Apr '16

15 Apr '16

changeset 2f36b249c7af in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2f36b249c7af description: small bugfix diffstat: src/notify.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 3b1a0fa58aec -r 2f36b249c7af src/notify.py --- a/src/notify.py Fri Apr 15 01:37:08 2016 +0200 +++ b/src/notify.py Fri Apr 15 02:37:58 2016 +0200 @@ -120,6 +120,7 @@ notification.set_timeout(timeout*1000) notification.set_category(event_type) + notification._data = {} notification._data.event_type = event_type notification._data.jid = jid notification._data.account = account

1 0

gajim: use pixbuf.new_from_bytes() instead of broken pixbuf.new_...
by Gajim 14 Apr '16

14 Apr '16

changeset 3b1a0fa58aec in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3b1a0fa58aec description: use pixbuf.new_from_bytes() instead of broken pixbuf.new_from_data() diffstat: src/gtkgui_helpers.py | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diffs (35 lines): diff -r 54b0608a5886 -r 3b1a0fa58aec src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Tue Apr 12 22:53:41 2016 +0200 +++ b/src/gtkgui_helpers.py Fri Apr 15 01:37:08 2016 +0200 @@ -436,17 +436,12 @@ pixbufloader.close() # try to open and convert this image to png using pillow (if available) - log.debug("loading avatar using pixbufloader directly failed, trying to convert avatar image using pillow (if available)") - pixbufloader = GdkPixbuf.PixbufLoader() + log.debug("loading avatar using pixbufloader failed, trying to convert avatar image using pillow (if available)") try: - avatar = Image.open(BytesIO(file_data)) - output = BytesIO() - avatar.save(output, format='PNG') - file_data = output.getvalue() - output.close() - pixbufloader.write(file_data) - pixbufloader.close() - pixbuf = pixbufloader.get_pixbuf() + avatar = Image.open(BytesIO(file_data)).convert("RGBA") + arr = GLib.Bytes.new(avatar.tobytes()) + width, height = avatar.size + pixbuf = GdkPixbuf.Pixbuf.new_from_bytes(arr, GdkPixbuf.Colorspace.RGB, True, 8, width, height, width * 4) except: log.info("Could not use pillow to convert avatar image, image cannot be displayed") if want_type: @@ -455,7 +450,7 @@ return None if want_type: - typ = pixbufloader.get_format().get_name() + typ = pixbufloader.get_format() and pixbufloader.get_format().get_name() or None return pixbuf, typ else: return pixbuf

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