Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][gajim_1.0] Silence 'git unavailable' message
by Philipp Hörist 25 Feb '18

25 Feb '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: 84748928 by André Apitzsch at 2018-02-23T00:16:24+01:00 Silence 'git unavailable' message - - - - - 1 changed file: - gajim/__init__.py Changes: ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -3,10 +3,10 @@ import subprocess __version__ = "0.99.2" try: - node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, - stdout=subprocess.PIPE).communicate()[0] + p = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) + node = p.communicate()[0] if node: __version__ += '+' + node.decode('utf-8').strip() except Exception: pass - View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/84748928d41e11bc57d5b7de7d5f0fb59f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/84748928d41e11bc57d5b7de7d5f0fb59f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: MAM: Display received mam message in open chats
by Philipp Hörist 25 Feb '18

25 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c6e7f862 by Philipp Hörist at 2018-02-25T21:04:34+01:00 MAM: Display received mam message in open chats - - - - - 51a4c4b5 by Philipp Hörist at 2018-02-25T21:20:38+01:00 MAM: Display corrected messages on MAM catchup This shows corrected messages correctly in groupchat when we receive the messages via MAM - - - - - 3 changed files: - gajim/chat_control.py - gajim/common/connection_handlers_events.py - gajim/groupchat_control.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -240,6 +240,9 @@ class ChatControl(ChatControlBase): self._nec_caps_received) app.ged.register_event_handler('stanza-message-outgoing', ged.OUT_POSTCORE, self._message_sent) + app.ged.register_event_handler( + 'mam-decrypted-message-received', + ged.GUI1, self._nec_mam_decrypted_message_received) # PluginSystem: adding GUI extension point for this ChatControl # instance object @@ -806,6 +809,20 @@ class ChatControl(ChatControlBase): app.plugin_manager.extension_point( 'encryption_dialog' + self.encryption, self) + def _nec_mam_decrypted_message_received(self, obj): + if obj.conn.name != self.account: + return + if obj.with_ != self.contact.jid: + return + + kind = 'incoming' + if obj.kind == KindConstant.CHAT_MSG_SENT: + kind = 'outgoing' + + self.print_conversation(obj.msgtxt, kind, tim=obj.timestamp, + encrypted=obj.encrypted, correct_id=obj.correct_id, + msg_stanza_id=obj.message_id, additional_data=obj.additional_data) + def _message_sent(self, obj): if obj.conn.name != self.account: return ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1052,6 +1052,7 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): # use stanza-id as unique-id self.unique_id, origin_id = self.get_unique_id() + self.message_id = self.msg_.getID() # Check for duplicates if app.logger.find_stanza_id(account, @@ -1151,6 +1152,7 @@ class MamGcMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): return False self.unique_id = self.get_stanza_id(self.result, query=True) + self.message_id = self.msg_.getID() # Check for duplicates if app.logger.find_stanza_id(account, @@ -1199,11 +1201,17 @@ class MamDecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): base_network_events = [] def generate(self): + self.correct_id = None + if not self.msgtxt: # For example Chatstates, Receipts, Chatmarkers log.debug('Received MAM message without text') return + replace = self.msg_.getTag('replace', namespace=nbxmpp.NS_CORRECT) + if replace is not None: + self.correct_id = replace.getAttr('id') + self.get_oob_data(self.msg_) if self.groupchat: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1107,8 +1107,9 @@ class GroupchatControl(ChatControlBase): return self.print_conversation( obj.msgtxt, contact=obj.nick, - tim=obj.timestamp, encrypted=obj.encrypted, - msg_stanza_id=obj.unique_id, + tim=obj.timestamp, correct_id=obj.correct_id, + encrypted=obj.encrypted, + msg_stanza_id=obj.message_id, additional_data=obj.additional_data) def _nec_gc_message_received(self, obj): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/12b27bf5bac7c56d014c31912508a3410… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/12b27bf5bac7c56d014c31912508a3410… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HistoryManger: Fix window dimensions
by Philipp Hörist 25 Feb '18

25 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 12b27bf5 by Philipp Hörist at 2018-02-25T20:18:46+01:00 HistoryManger: Fix window dimensions - - - - - 1 changed file: - gajim/data/gui/history_manager.ui Changes: ===================================== gajim/data/gui/history_manager.ui ===================================== --- a/gajim/data/gui/history_manager.ui +++ b/gajim/data/gui/history_manager.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkMenu" id="context_menu"> @@ -82,6 +82,9 @@ <action-widget response="-6">cancel_button</action-widget> <action-widget response="-5">save_button</action-widget> </action-widgets> + <child> + <placeholder/> + </child> </object> <object class="GtkImage" id="image1"> <property name="visible">True</property> @@ -136,111 +139,56 @@ <property name="orientation">vertical</property> <child> <object class="GtkBox" id="welcome_vbox"> + <property name="width_request">300</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="margin_left">20</property> + <property name="margin_right">20</property> <property name="orientation">vertical</property> + <property name="spacing">10</property> <child> - <object class="GtkLabel" id="welcome_label"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">center</property> <property name="label" translatable="yes"><big>Welcome to Gajim History Logs Manager</big></property> <property name="use_markup">True</property> - <property name="justify">center</property> - <property name="wrap">True</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="hbox3"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="xalign">1</property> - <property name="yalign">0</property> - <property name="stock">gtk-info</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="info_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">This log manager is not intended for log viewing. If you are looking for such functionality, use the history window instead. + <property name="halign">start</property> + <property name="label" translatable="yes">This log manager is not intended for log viewing. If you are looking for such functionality, use the history window instead. Use this program to delete or export logs. You can select logs from the left and/or search database from below.</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="wrap">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">20</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkBox" id="hbox2"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkImage" id="warning_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="xalign">1</property> - <property name="yalign">0</property> - <property name="stock">gtk-dialog-warning</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="warning_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">WARNING: + <property name="halign">start</property> + <property name="label" translatable="yes">WARNING: If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with.</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="use_markup">True</property> + <property name="wrap">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">20</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> @@ -358,5 +306,8 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene </child> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> </object> </interface> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/12b27bf5bac7c56d014c31912508a34106… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/12b27bf5bac7c56d014c31912508a34106… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] setup.py: remove unused function
by Philipp Hörist 23 Feb '18

23 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 91aac652 by André Apitzsch at 2018-02-23T00:20:11+01:00 setup.py: remove unused function - - - - - 1 changed file: - setup.py Changes: ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -6,8 +6,6 @@ import sys if sys.version_info[0] < 3: sys.exit('Tried to install with Python 2, gajim only supports Python 3.') -import codecs - from setuptools import setup, find_packages from setuptools import Command from setuptools.command.build_py import build_py as _build @@ -129,20 +127,6 @@ def build_intl(build_cmd): data_files.append((target, [base + '/' + filename])) -def substitute_variables(filename_in, filename_out, subst_vars): - ''' - Substitute variables in a file. - ''' - f_in = codecs.open(filename_in, encoding='utf-8') - f_out = codecs.open(filename_out, encoding='utf-8', mode='w') - for line in f_in: - for variable, substitution in subst_vars: - line = line.replace(variable, substitution) - f_out.write(line) - f_in.close() - f_out.close() - - def merge(in_file, out_file, option, po_dir='po'): ''' Run the msgfmt command. @@ -276,7 +260,7 @@ setup( package_data={'gajim': package_data}, data_files=data_files, install_requires=[ - 'nbxmpp>=0.6.1', + 'nbxmpp>=0.6.3', 'pyOpenSSL>=0.12', 'pyasn1', ], View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/91aac652f2851c1eca88872a06160e5565… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/91aac652f2851c1eca88872a06160e5565… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make file transfer labels sound less technical
by Philipp Hörist 22 Feb '18

22 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a94276f6 by Philipp Hörist at 2018-02-22T22:45:15+01:00 Make file transfer labels sound less technical - - - - - 3 changed files: - gajim/chat_control.py - gajim/groupchat_control.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -314,20 +314,9 @@ class ChatControl(ChatControlBase): jingle.get_enabled() or httpupload.get_enabled()) # Set File Transfer Button tooltip - ft_pref = app.config.get_per('accounts', self.account, - 'filetransfer_preference') - - tooltip_text = None - if httpupload.get_enabled() and jingle.get_enabled(): - if ft_pref == 'httpupload': - tooltip_text = _('HTTP File Upload') - else: - tooltip_text = _('Jingle File Transfer') - elif httpupload.get_enabled(): - tooltip_text = _('HTTP File Upload') - elif jingle.get_enabled(): - tooltip_text = _('Jingle File Transfer') - elif online: + if online and (httpupload.get_enabled() or jingle.get_enabled()): + tooltip_text = _('Send File…') + else: tooltip_text = _('No File Transfer available') self.sendfile_button.set_tooltip_text(tooltip_text) ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -631,13 +631,10 @@ class GroupchatControl(ChatControlBase): win.lookup_action('send-file-' + self.control_id).set_enabled( httpupload.get_enabled()) - tooltip_text = None - if online: - if httpupload.get_enabled(): - tooltip_text = _('HTTP File Upload') - else: - tooltip_text = _('HTTP File Upload not supported ' - 'by your server') + if online and httpupload.get_enabled(): + tooltip_text = _('Send File…') + else: + tooltip_text = _('No File Transfer available') self.sendfile_button.set_tooltip_text(tooltip_text) # Actions ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -608,9 +608,9 @@ Build dynamic Application Menus def get_singlechat_menu(control_id): singlechat_menu = [ - (_('Send File...'), [ - ('win.send-file-httpupload-', 'HTTP Upload'), - ('win.send-file-jingle-', 'Jingle'), + (_('Send File…'), [ + ('win.send-file-httpupload-', _('Upload File…')), + ('win.send-file-jingle-', _('Send File Directly…')), ]), ('win.invite-contacts-', _('Invite Contacts')), ('win.add-to-roster-', _('Add to Roster')), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a94276f6e9e3a79da2c86b7e9218d7e5c4… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a94276f6e9e3a79da2c86b7e9218d7e5c4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Dont notify about PMs from MUCs we are not joined
by Philipp Hörist 22 Feb '18

22 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f30564c1 by Philipp Hörist at 2018-02-22T21:42:49+01:00 Dont notify about PMs from MUCs we are not joined The server sends us carbons if one of our other resources has a conversation in a muc we are not joined. Instead we log the messages silently. - - - - - 994244c9 by Philipp Hörist at 2018-02-22T22:03:55+01:00 MAM: Check muc#user namespace before we disco 1. Check if the message has the muc#user namespace 2. Check if we have this jid already in the DB 3. Last resort disco the jid - - - - - 2 changed files: - gajim/common/connection_handlers_events.py - gajim/session.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -176,8 +176,10 @@ class HelperEvent: def _is_muc_pm(self, message): if self.muc_pm is not None: return self.muc_pm - self.muc_pm = message.getTag( - 'x', namespace=nbxmpp.NS_MUC_USER) is not None + self.muc_pm = False + muc_user = message.getTag('x', namespace=nbxmpp.NS_MUC_USER) + if muc_user is not None: + self.muc_pm = muc_user.getChildren() == [] return self.muc_pm class HttpAuthReceivedEvent(nec.NetworkIncomingEvent): @@ -1125,6 +1127,8 @@ class MamGcMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): :stanza: Complete stanza Node :forwarded: Forwarded Node :result: Result Node + :muc_pm: True, if this is a MUC PM + propagated to MamDecryptedMessageReceivedEvent ''' self._set_base_event_vars_as_attributes(base_event) self.additional_data = {} @@ -1205,23 +1209,27 @@ class MamDecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): if self.groupchat: return True - self.is_pm = app.logger.jid_is_room_jid(self.with_.getStripped()) - if self.is_pm is None: - # Check if this event is triggered after a disco, so we dont - # run into an endless loop - if hasattr(self, 'disco'): - log.error('JID not known even after sucessful disco') + if not self.muc_pm: + # muc_pm = False, means only there was no muc#user namespace + # This could still be a muc pm, we check the database if we + # know this jid. If not we disco it. + self.muc_pm = app.logger.jid_is_room_jid(self.with_.getStripped()) + if self.muc_pm is None: + # Check if this event is triggered after a disco, so we dont + # run into an endless loop + if hasattr(self, 'disco'): + log.error('JID not known even after sucessful disco') + return + # we don't know this JID, we need to disco it. + server = self.with_.getDomain() + if server not in self.conn.mam_awaiting_disco_result: + self.conn.mam_awaiting_disco_result[server] = [self] + self.conn.discoverInfo(server) + else: + self.conn.mam_awaiting_disco_result[server].append(self) return - # we don't know this JID, we need to disco it. - server = self.with_.getDomain() - if server not in self.conn.mam_awaiting_disco_result: - self.conn.mam_awaiting_disco_result[server] = [self] - self.conn.discoverInfo(server) - else: - self.conn.mam_awaiting_disco_result[server].append(self) - return - if self.is_pm: + if self.muc_pm: self.with_ = str(self.with_) else: self.with_ = self.with_.getStripped() @@ -1599,6 +1607,7 @@ class DecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.forwarded = self.msg_obj.forwarded self.sent = self.msg_obj.sent self.conn = self.msg_obj.conn + self.muc_pm = self.msg_obj.muc_pm self.popup = False self.msg_log_id = None # id in log database self.attention = False # XEP-0224 ===================================== gajim/session.py ===================================== --- a/gajim/session.py +++ b/gajim/session.py @@ -101,7 +101,7 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): if treat_as: obj.mtype = treat_as pm = False - if obj.gc_control and obj.resource: + if obj.muc_pm or (obj.gc_control and obj.resource): # It's a Private message pm = True obj.mtype = 'pm' @@ -123,6 +123,11 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): additional_data=obj.additional_data, stanza_id=obj.unique_id) + if obj.muc_pm and not obj.gc_control: + # This is a carbon of a PM from a MUC we are not currently + # joined. We log it silently without notification. + return True + # Handle chat states if contact and (not obj.forwarded or not obj.sent): if self.control and self.control.type_id == \ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/52fa57795ac04fb273c3686f05adb3d76… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/52fa57795ac04fb273c3686f05adb3d76… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Better emoticon theme fallback strategy
by Philipp Hörist 21 Feb '18

21 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 52fa5779 by Philipp Hörist at 2018-02-22T00:37:54+01:00 Better emoticon theme fallback strategy Fallback must be happening in init_emoticon() instead of PreferencesWindow - - - - - 3 changed files: - gajim/common/helpers.py - gajim/config.py - gajim/gui_interface.py Changes: ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1596,15 +1596,31 @@ def version_condition(current_version, required_version): def get_available_emoticon_themes(): emoticons_themes = [] emoticons_data_path = os.path.join(app.DATA_DIR, 'emoticons') + font_theme_path = os.path.join( + app.DATA_DIR, 'emoticons', 'font-emoticons', 'emoticons_theme.py') folders = os.listdir(emoticons_data_path) if os.path.isdir(app.MY_EMOTS_PATH): folders += os.listdir(app.MY_EMOTS_PATH) + file = 'emoticons_theme.py' + if os.name == 'nt' and not os.path.exists(font_theme_path): + # When starting Gajim from source .py files are available + # We test this with font-emoticons and fallback to .pyc files otherwise + file = 'emoticons_theme.pyc' + for theme in folders: - theme_path = os.path.join( - emoticons_data_path, theme, 'emoticons_theme.py') + theme_path = os.path.join(emoticons_data_path, theme, file) if os.path.exists(theme_path): emoticons_themes.append(theme) emoticons_themes.sort() return emoticons_themes + +def get_emoticon_theme_path(theme): + emoticons_data_path = os.path.join(app.DATA_DIR, 'emoticons', theme) + if os.path.exists(emoticons_data_path): + return emoticons_data_path + + emoticons_user_path = os.path.join(app.MY_EMOTS_PATH, theme) + if os.path.exists(emoticons_user_path): + return emoticons_user_path ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -151,13 +151,10 @@ class PreferencesWindow: config_theme = app.config.get('emoticons_theme') if config_theme not in emoticon_themes: - # Fallback theme - config_theme = 'font-emoticons' - app.config.set('emoticons_theme', 'font-emoticons') + config_theme = _('Disabled') emoticons_combobox.set_id_column(0) emoticons_combobox.set_active_id(config_theme) - # Set default for single window type choices = c_config.opt_one_window_types type_ = app.config.get('one_message_window') ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1996,18 +1996,16 @@ class Interface: if 'preferences' in app.interface.instances: transient_for = app.interface.instances['preferences'].window - path = os.path.join(app.DATA_DIR, 'emoticons', emot_theme) - if not os.path.exists(path): - # It's maybe a user theme - path = os.path.join(app.MY_EMOTS_PATH, emot_theme) - if not os.path.exists(path): - # theme doesn't exist, disable emoticons - dialogs.WarningDialog(_('Emoticons disabled'), - _('Your configured emoticons theme has not been found, so ' - 'emoticons have been disabled.'), - transient_for=transient_for) + themes = helpers.get_available_emoticon_themes() + if emot_theme not in themes: + if 'font-emoticons' in themes: + emot_theme = 'font-emoticons' + app.config.set('emoticons_theme', 'font-emoticons') + else: app.config.set('emoticons_theme', '') return + + path = helpers.get_emoticon_theme_path(emot_theme) if not emoticons.load(path, ascii_emoticons): dialogs.WarningDialog( _('Emoticons disabled'), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/52fa57795ac04fb273c3686f05adb3d766… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/52fa57795ac04fb273c3686f05adb3d766… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor emoticon theme combobox
by Philipp Hörist 21 Feb '18

21 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: eb3a53c7 by Philipp Hörist at 2018-02-21T23:52:53+01:00 Refactor emoticon theme combobox - Use ComboBoxText, its much simpler - Add a dedicated method that returns all available themes - If the configured Theme is not available fallback to font-emoticons - - - - - 3 changed files: - gajim/common/helpers.py - gajim/config.py - gajim/data/gui/preferences_window.ui Changes: ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1592,3 +1592,19 @@ def version_condition(current_version, required_version): if V(current_version) < V(required_version): return False return True + +def get_available_emoticon_themes(): + emoticons_themes = [] + emoticons_data_path = os.path.join(app.DATA_DIR, 'emoticons') + + folders = os.listdir(emoticons_data_path) + if os.path.isdir(app.MY_EMOTS_PATH): + folders += os.listdir(app.MY_EMOTS_PATH) + + for theme in folders: + theme_path = os.path.join( + emoticons_data_path, theme, 'emoticons_theme.py') + if os.path.exists(theme_path): + emoticons_themes.append(theme) + emoticons_themes.sort() + return emoticons_themes ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -143,29 +143,20 @@ class PreferencesWindow: # emoticons emoticons_combobox = self.xml.get_object('emoticons_combobox') - emoticons_list = os.listdir(os.path.join(app.DATA_DIR, 'emoticons')) - # user themes - if os.path.isdir(app.MY_EMOTS_PATH): - emoticons_list += os.listdir(app.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 = [_('Disabled')] - for dir_ in emoticons_list: - if not os.path.isdir(os.path.join(app.DATA_DIR, 'emoticons', dir_)) \ - and not os.path.isdir(os.path.join(app.MY_EMOTS_PATH, dir_)) : - continue - if dir_ != '.svn': - l.append(dir_) - for i in range(len(l)): - model.append([l[i]]) - if app.config.get('emoticons_theme') == l[i]: - emoticons_combobox.set_active(i) - if not app.config.get('emoticons_theme'): - emoticons_combobox.set_active(0) + emoticon_themes = helpers.get_available_emoticon_themes() + + emoticons_combobox.append_text(_('Disabled')) + for theme in emoticon_themes: + emoticons_combobox.append_text(theme) + + config_theme = app.config.get('emoticons_theme') + if config_theme not in emoticon_themes: + # Fallback theme + config_theme = 'font-emoticons' + app.config.set('emoticons_theme', 'font-emoticons') + emoticons_combobox.set_id_column(0) + emoticons_combobox.set_active_id(config_theme) + # Set default for single window type choices = c_config.opt_one_window_types ===================================== gajim/data/gui/preferences_window.ui ===================================== --- a/gajim/data/gui/preferences_window.ui +++ b/gajim/data/gui/preferences_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkAdjustment" id="adjustment1"> @@ -516,17 +516,6 @@ </packing> </child> <child> - <object class="GtkComboBox" id="emoticons_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <signal name="changed" handler="on_emoticons_combobox_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> <object class="GtkCheckButton" id="show_avatar_in_tabs_checkbutton"> <property name="label" translatable="yes">Show avatar in chat tabs</property> <property name="visible">True</property> @@ -542,6 +531,17 @@ <property name="width">2</property> </packing> </child> + <child> + <object class="GtkComboBoxText" id="emoticons_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <signal name="changed" handler="on_emoticons_combobox_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> </object> </child> <child type="label"> @@ -2888,5 +2888,8 @@ to discover one from server.</property> </child> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> </object> </interface> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/eb3a53c79110c94b7a272cdb2f4ca3e1f2… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/eb3a53c79110c94b7a272cdb2f4ca3e1f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Tag MUC PMs
by Philipp Hörist 21 Feb '18

21 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1fbc6a23 by Philipp Hörist at 2018-02-21T23:09:30+01:00 Tag MUC PMs This gives the server the chance to react accordingly without applying much logic. Also it makes it easier for us to recognize MUC PMs in MAM querys - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -64,6 +64,7 @@ from gajim.common import exceptions from gajim.common import check_X509 from gajim.common.connection_handlers import * from gajim.common.helpers import version_condition +from gajim.common.contacts import GC_Contact from gajim.gtkgui_helpers import get_action @@ -373,6 +374,10 @@ class CommonConnection: contact = app.contacts.get_contact_with_highest_priority( self.name, obj.jid) + # Mark Message as MUC PM + if isinstance(contact, GC_Contact): + msg_iq.setTag('x', namespace=nbxmpp.NS_MUC_USER) + # chatstates - if peer supports xep85, send chatstates # please note that the only valid tag inside a message containing a # <body> tag is the active event View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1fbc6a2304b9066555ac367949bdc2e90d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1fbc6a2304b9066555ac367949bdc2e90d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Pass jid as string to find_stanza_id()
by Philipp Hörist 21 Feb '18

21 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 70e0bcc5 by Philipp Hörist at 2018-02-21T23:01:47+01:00 Pass jid as string to find_stanza_id() - - - - - 1 changed file: - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1281,7 +1281,7 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): if type_ == 'groupchat': archive_jid = self.stanza.getFrom().getStripped() else: - archive_jid = self.conn.get_own_jid() + archive_jid = self.conn.get_own_jid().getStripped() if app.logger.find_stanza_id(account, archive_jid, self.unique_id, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/70e0bcc5db144c2954c7cad077e9083f5f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/70e0bcc5db144c2954c7cad077e9083f5f… You're receiving this email because of your account on dev.gajim.org.

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