Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: Add old id to appdata file
by Yann Leboulanger 05 Jul '17

05 Jul '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: b80f21c1 by André Apitzsch at 2017-07-05T22:25:31+02:00 Add old id to appdata file - - - - - 016acef2 by Yann Leboulanger at 2017-07-05T22:43:10+02:00 Merge branch 'appdata' into 'master' Add old id to appdata file See merge request !104 - - - - - 1 changed file: - data/org.gajim.Gajim.appdata.xml.in Changes: ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== --- a/data/org.gajim.Gajim.appdata.xml.in +++ b/data/org.gajim.Gajim.appdata.xml.in @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <component type="desktop-application"> <id>org.gajim.Gajim.desktop</id> + <provides> + <id>gajim.desktop</id> + </provides> <metadata_license>CC-BY-SA-3.0</metadata_license> <project_license>GPL-3.0</project_license> <name>Gajim</name> View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ab85729fe54e4f427a7dbaf3f7e2a83b6…

1 0

[Git][gajim/gajim][master] Fix displaying links in textview
by Philipp Hörist 04 Jul '17

04 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: ab85729f by Philipp Hörist at 2017-07-04T12:26:05+02:00 Fix displaying links in textview Regression from https://dev.gajim.org/gajim/gajim/commit/79716f421f0a153588fc7bcc6505d1ab0d… - - - - - 1 changed file: - gajim/conversation_textview.py Changes: ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -953,17 +953,17 @@ class ConversationTextview(GObject.GObject): end_iter = iter_ else: end_iter = buffer_.get_end_iter() - if gajim.config.get('emoticons_theme') and graphics: - pixbuf = emoticons.get_pixbuf(possible_emot_ascii_caps) - if pixbuf: - # it's an emoticon - anchor = buffer_.create_child_anchor(end_iter) - img = TextViewImage(anchor, - GLib.markup_escape_text(special_text)) - img.set_from_pixbuf(pixbuf) - img.show() - self.images.append(img) - self.tv.add_child_at_anchor(img, anchor) + + pixbuf = emoticons.get_pixbuf(possible_emot_ascii_caps) + if gajim.config.get('emoticons_theme') and pixbuf and graphics: + # it's an emoticon + anchor = buffer_.create_child_anchor(end_iter) + img = TextViewImage(anchor, + GLib.markup_escape_text(special_text)) + img.set_from_pixbuf(pixbuf) + img.show() + self.images.append(img) + self.tv.add_child_at_anchor(img, anchor) elif special_text.startswith('www.') or \ special_text.startswith('ftp.') or \ text_is_valid_uri and not is_xhtml_link: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ab85729fe54e4f427a7dbaf3f7e2a83b69…

1 0

[Git][gajim/gajim][master] Fix emoticons module import on windows
by Philipp Hörist 03 Jul '17

03 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3d8be9eb by Philipp Hörist at 2017-07-03T11:32:47+02:00 Fix emoticons module import on windows - - - - - 1 changed file: - gajim/emoticons.py Changes: ===================================== gajim/emoticons.py ===================================== --- a/gajim/emoticons.py +++ b/gajim/emoticons.py @@ -16,6 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import os +import sys import logging import importlib.util as imp from collections import OrderedDict @@ -58,8 +59,13 @@ class SubPixbuf: return subpixbuf def load(path): - theme_path = os.path.join(path, 'emoticons_theme.py') - spec = imp.spec_from_file_location("emoticons_theme.py", theme_path) + module_name = 'emoticons_theme.py' + theme_path = os.path.join(path, module_name) + if sys.platform == 'win32' and not os.path.exists(theme_path): + module_name = 'emoticons_theme.pyc' + theme_path = os.path.join(path, module_name) + + spec = imp.spec_from_file_location(module_name, theme_path) try: theme = imp.module_from_spec(spec) spec.loader.exec_module(theme) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3d8be9ebe2055ea1ef4d66504cf5cca377…

1 0

[Git][gajim/gajim][master] Update README.md
by Philipp Hörist 02 Jul '17

02 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 288b2a3b by Philipp Hörist at 2017-07-03T00:36:58+02:00 Update README.md - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -16,9 +16,9 @@ The goal of Gajim is to provide a full featured and easy to use Jabber/XMPP clie * How to contribute * The Gajim team - Latest release: - * [Gajim 0.16.7 (.tar.gz)](https://www.gajim.org/downloads/0.16/gajim-0.16.7.tar.gz) - * [Gajim 0.16.7-1 (.exe)](https://www.gajim.org/downloads/0.16/gajim-0.16.7-1.exe) - * [Gajim 0.16.7-1 portable (.exe)](https://www.gajim.org/downloads/0.16/gajim-portable-0.16.7-1.exe) + * [Gajim 0.16.8 (.tar.gz)](https://gajim.org/downloads/0.16/gajim-0.16.8.tar.gz) + * [Gajim 0.16.8-2 (.exe)](https://gajim.org/downloads/0.16/gajim-0.16.8-2.exe) + * [Gajim 0.16.8-2 portable (.exe)](https://gajim.org/downloads/0.16/gajim-portable-0.16.8-2.exe) * [Daily snapshot](https://www.gajim.org/downloads/snap/?M=D) - [Bug reports and Feature requests](https://dev.gajim.org/gajim/gajim/issues) \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/288b2a3bcec89c2a6db2c34d0652ab3c51…

1 0

[Git][gajim/gajim][master] 7 commits: Remove old emoticon themes
by Philipp Hörist 02 Jul '17

02 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0d067137 by Philipp Hörist at 2017-07-02T19:28:00+02:00 Remove old emoticon themes - - - - - 79716f42 by Philipp Hörist at 2017-07-02T21:27:44+02:00 Rework emoticon menu - - - - - d387cf1d by Philipp Hörist at 2017-07-02T21:29:57+02:00 Add noto-emoticons theme - - - - - 89e4a006 by Philipp Hörist at 2017-07-02T21:29:57+02:00 Add font-emoticons theme - - - - - 635b05c1 by Philipp Hörist at 2017-07-02T21:30:21+02:00 Make noto-emoticons the default theme - - - - - 5dd4ac1c by Philipp Hörist at 2017-07-02T21:30:21+02:00 Update windows build to include emoticons - - - - - d19f9e11 by Philipp Hörist at 2017-07-02T22:54:14+02:00 Merge branch 'popover' into 'master' New Emoticons Menu See merge request !102 - - - - - 30 changed files: - data/emoticons/Makefile.am - − data/emoticons/animated/angry.png - − data/emoticons/animated/bat.gif - − data/emoticons/animated/beer.png - − data/emoticons/animated/biggrin.png - − data/emoticons/animated/blush.png - − data/emoticons/animated/boy.png - − data/emoticons/animated/brflower.png - − data/emoticons/animated/brheart.png - − data/emoticons/animated/cake.gif - − data/emoticons/animated/cigarette.gif - − data/emoticons/animated/coffee.png - − data/emoticons/animated/coolglasses.png - − data/emoticons/animated/cry.gif - − data/emoticons/animated/cuffs.png - − data/emoticons/animated/devil.png - − data/emoticons/animated/dontknow.gif - − data/emoticons/animated/drink.png - − data/emoticons/animated/emoticons.py - − data/emoticons/animated/eyeroll.gif - − data/emoticons/animated/flower.png - − data/emoticons/animated/frowning.png - − data/emoticons/animated/girl.png - − data/emoticons/animated/heart.png - − data/emoticons/animated/hugleft.png - − data/emoticons/animated/hugright.png - − data/emoticons/animated/kiss.png - − data/emoticons/animated/lamp.png - − data/emoticons/animated/lightning.gif - − data/emoticons/animated/mail.png The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fe750600985f4883ea7eb0204879612e6…

1 0

[Git][gajim/gajim][master] 3 commits: Replace src by gajim
by Yann Leboulanger 02 Jul '17

02 Jul '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 68a57e7c by André Apitzsch at 2017-07-02T17:25:46+02:00 Replace src by gajim - - - - - 125ce523 by André Apitzsch at 2017-07-02T17:25:47+02:00 Rename src directory - - - - - fe750600 by Yann Leboulanger at 2017-07-02T18:57:06+02:00 Merge branch 'rename_src_gajim' into 'master' Move src/ to gajim/ See merge request !103 - - - - - 30 changed files: - Makefile.am - autogen.sh - configure.ac - doc/epydoc.conf - src/Makefile.am → gajim/Makefile.am - src/adhoc_commands.py → gajim/adhoc_commands.py - src/advanced_configuration_window.py → gajim/advanced_configuration_window.py - src/app_actions.py → gajim/app_actions.py - src/atom_window.py → gajim/atom_window.py - src/cell_renderer_image.py → gajim/cell_renderer_image.py - src/chat_control.py → gajim/chat_control.py - src/chat_control_base.py → gajim/chat_control_base.py - src/command_system/__init__.py → gajim/command_system/__init__.py - src/command_system/dispatcher.py → gajim/command_system/dispatcher.py - src/command_system/errors.py → gajim/command_system/errors.py - src/command_system/framework.py → gajim/command_system/framework.py - src/command_system/implementation/__init__.py → gajim/command_system/implementation/__init__.py - src/command_system/implementation/custom.py → gajim/command_system/implementation/custom.py - src/command_system/implementation/execute.py → gajim/command_system/implementation/execute.py - src/command_system/implementation/hosts.py → gajim/command_system/implementation/hosts.py - src/command_system/implementation/middleware.py → gajim/command_system/implementation/middleware.py - src/command_system/implementation/standard.py → gajim/command_system/implementation/standard.py - src/command_system/mapping.py → gajim/command_system/mapping.py - src/command_system/tools.py → gajim/command_system/tools.py - src/common/__init__.py → gajim/common/__init__.py - src/common/account.py → gajim/common/account.py - src/common/atom.py → gajim/common/atom.py - src/common/caps_cache.py → gajim/common/caps_cache.py - src/common/check_X509.py → gajim/common/check_X509.py - src/common/check_paths.py → gajim/common/check_paths.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6880fba3b4e3603de31f38a24c2fdf247…

1 0

[Git][gajim/gajim][master] Raise exception for missing icons
by Philipp Hörist 02 Jul '17

02 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6880fba3 by Philipp Hörist at 2017-07-02T15:13:53+02:00 Raise exception for missing icons This is a regression from https://dev.gajim.org/gajim/gajim/commit/9dc389cc32f8bc8f51c694f54b5a4785c0… previously we used load_icon() which raises an exception for missing icons now we use lookup_icon() which does not, and iconinfo can be None now - - - - - 1 changed file: - src/gtkgui_helpers.py Changes: ===================================== src/gtkgui_helpers.py ===================================== --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -59,6 +59,8 @@ class Color: def get_icon_pixmap(icon_name, size=16, color=None, quiet=False): try: iconinfo = gtk_icon_theme.lookup_icon(icon_name, size, 0) + if not iconinfo: + raise GLib.GError if color: pixbuf, was_symbolic = iconinfo.load_symbolic(*color) return pixbuf View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6880fba3b4e3603de31f38a24c2fdf247f…

1 0

[Git][gajim/gajim][master] show all previous corrected messages. Fixes #8669
by Yann Leboulanger 28 Jun '17

28 Jun '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 6d9f82d8 by Yann Leboulanger at 2017-06-28T14:53:26+02:00 show all previous corrected messages. Fixes #8669 - - - - - 1 changed file: - src/conversation_textview.py Changes: ===================================== src/conversation_textview.py ===================================== --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -1126,9 +1126,15 @@ class ConversationTextview(GObject.GObject): try: index, insert_mark, old_txt = \ self.correct_message(correct_id, kind, name) - self.corrected_text_list[msg_stanza_id] = \ - '<b>Message corrected. Previous message:</b>\n{}' \ - .format(GLib.markup_escape_text(old_txt)) + if correct_id in self.corrected_text_list: + self.corrected_text_list[msg_stanza_id] = \ + self.corrected_text_list[correct_id] + '\n{}' \ + .format(GLib.markup_escape_text(old_txt)) + del self.corrected_text_list[correct_id] + else: + self.corrected_text_list[msg_stanza_id] = \ + '<b>Message corrected. Previous message:</b>\n{}' \ + .format(GLib.markup_escape_text(old_txt)) corrected = True except TypeError: log.debug('Message was not corrected !') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6d9f82d827bb3daed84bc5982fdca70d04…

1 0

[Git][gajim/gajim][master] Only use GStreamer when Farstream is available
by Philipp Hörist 27 Jun '17

27 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: bd3a0c8a by Philipp Hörist at 2017-06-28T00:43:44+02:00 Only use GStreamer when Farstream is available To use GStreamer we need to call Gst.Init(). We call Gst.Init() only when Farstream is available. - - - - - 1 changed file: - src/config.py Changes: ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -439,7 +439,7 @@ class PreferencesWindow: if config == value: combobox.set_active(index) - if HAS_GST: + if HAS_GST and gajim.HAVE_FARSTREAM: create_av_combobox('audio_input', AudioInputManager().get_devices()) create_av_combobox('audio_output', AudioOutputManager().get_devices( )) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bd3a0c8ac6a81ccfa6aaf8cabe711aa009…

1 0

[Git][gajim/gajim][master] Add LMC to common features
by Philipp Hörist 27 Jun '17

27 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 923bbc87 by Philipp Hörist at 2017-06-28T00:06:43+02:00 Add LMC to common features - - - - - 1 changed file: - src/common/gajim.py Changes: ===================================== src/common/gajim.py ===================================== --- a/src/common/gajim.py +++ b/src/common/gajim.py @@ -255,7 +255,7 @@ gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, nbxmpp.NS_SSN, nbxmpp.NS_MOOD, nbxmpp.NS_ACTIVITY, nbxmpp.NS_NICK, nbxmpp.NS_ROSTERX, nbxmpp.NS_SECLABEL, nbxmpp.NS_HASHES_2, nbxmpp.NS_HASHES_MD5, nbxmpp.NS_HASHES_SHA1, nbxmpp.NS_HASHES_SHA256, - nbxmpp.NS_HASHES_SHA512, nbxmpp.NS_CONFERENCE] + nbxmpp.NS_HASHES_SHA512, nbxmpp.NS_CONFERENCE, nbxmpp.NS_CORRECT] # Optional features gajim supports per account gajim_optional_features = {} View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/923bbc87a2d2f860e9b4e521d140880361…

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