[Git][gajim/gajim][gajim_1.1] 3 commits: DBus: Correctly raise NewMessage signal

Philipp Hörist gitlab at dev.gajim.org
Thu Jan 10 22:38:44 CET 2019


Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim


Commits:
3841ed51 by Philipp Hörist at 2019-01-10T21:34:08Z
DBus: Correctly raise NewMessage signal

- - - - -
caf95ead by streaps at 2019-01-10T21:34:08Z
Jingle Audio: Update codecs

Fixes #9535

- - - - -
48f1df0b by Philipp Hörist at 2019-01-10T21:38:29Z
Update ChangeLog

- - - - -


4 changed files:

- ChangeLog
- gajim/common/jingle_rtp.py
- gajim/remote_control.py
- gajim/session.py


Changes:

=====================================
ChangeLog
=====================================
@@ -1,20 +1,31 @@
+Gajim 1.1.2 (11 January 2019)
+
+  Bug fixes
+
+  * #9518 Windows: Pressing "^" yields "^^"
+  * #9522 Windows: Switching keyboard layouts leads to a crash
+  * #9525 Windows/Mac: Links are not clickable in the About dialog
+  * #9535 Jingle Audio: Update codecs
+  * DBus: Correctly raise NewMessage signal
+  * Clicking on tray notifications does not open the chat
+
 Gajim 1.1.1 (23 December 2018)
 
   Bug fixes
 
-  * 8362 DBus: Incorrect unread message count
-  * 9427 Placeholder not cleared if pasting text into message input
-  * 9444 Determine the delay timestamp correctly when using mam:1
-  * 9453 Fix opening links inside the group chat subject (MacOS/Windows)
-  * 9465 Allow the full range of possible nicknames in group chats
-  * 9067 Gajim crashes when receiving xhtml messages
-  * 9096 Error when clicking on a subscription notification
-  * 9446 Chatstate error in MUC conversation
-  * 9471 Conversation Textview: Error on key press
-  * 9472 Handle presences without from attr correctly
-  * 9473 Error when creating a new group chat
-  * 9491 Identify group chat subject changes correctly
-  * 9496 Error on MUC roster selection change
+  * #8362 DBus: Incorrect unread message count
+  * #9427 Placeholder not cleared if pasting text into message input
+  * #9444 Determine the delay timestamp correctly when using mam:1
+  * #9453 Fix opening links inside the group chat subject (MacOS/Windows)
+  * #9465 Allow the full range of possible nicknames in group chats
+  * #9067 Gajim crashes when receiving xhtml messages
+  * #9096 Error when clicking on a subscription notification
+  * #9446 Chatstate error in MUC conversation
+  * #9471 Conversation Textview: Error on key press
+  * #9472 Handle presences without from attr correctly
+  * #9473 Error when creating a new group chat
+  * #9491 Identify group chat subject changes correctly
+  * #9496 Error on MUC roster selection change
   * Determine soundplayer correctly on unix systems
   * In some circumstances plugins could not be deleted
   * Show correct contact status on tabs
@@ -36,13 +47,13 @@ Gajim 1.1.0 (06 November 2018)
 
   Bug fixes
 
-  * 8968 Windows: Gajim loads DLLs from wrong location
-  * 9322 Error when adding contact
-  * 9357 Acquire sleep inhibtor correctly after sleep
-  * 9385 Ignore invalid bookmarks
-  * 9386 Discovery: Browsing nodes without identity
-  * 9393 Error when parsing invalid timestamps
-  * 9398 Error on jingle file transfer
+  * #8968 Windows: Gajim loads DLLs from wrong location
+  * #9322 Error when adding contact
+  * #9357 Acquire sleep inhibtor correctly after sleep
+  * #9385 Ignore invalid bookmarks
+  * #9386 Discovery: Browsing nodes without identity
+  * #9393 Error when parsing invalid timestamps
+  * #9398 Error on jingle file transfer
 
 Gajim 1.0.99.1 (07 October 2018)
 
@@ -59,17 +70,17 @@ Gajim 1.0.99.1 (07 October 2018)
 
   Bug fixes
 
-  * 9198 Creating new MUCs with captial letters is not possible
-  * 9210 Error when clicking on new message indicator
-  * 9280 Inviting users to a MUC causes error
-  * 9301 Error when opening service discovery window
-  * 9309 Error when clicking on a groupchat invite notification
-  * 9311 Error when requesting server info
-  * 9117 Windows UAC changes status not available
-  * 9324 No menus/dialogs on Win7
-  * 9326 IPV6 Connection problem on Win10
-  * 9334 Joining big MUCs takes very long
-  * 9339 Error caused by remote_control
+  * #9198 Creating new MUCs with captial letters is not possible
+  * #9210 Error when clicking on new message indicator
+  * #9280 Inviting users to a MUC causes error
+  * #9301 Error when opening service discovery window
+  * #9309 Error when clicking on a groupchat invite notification
+  * #9311 Error when requesting server info
+  * #9117 Windows UAC changes status not available
+  * #9324 No menus/dialogs on Win7
+  * #9326 IPV6 Connection problem on Win10
+  * #9334 Joining big MUCs takes very long
+  * #9339 Error caused by remote_control
 
 Gajim 1.0.99 (19 August 2018)
 
@@ -92,16 +103,16 @@ Gajim 1.0.99 (19 August 2018)
 
   Bug fixes
 
-  * 8658 Translation doesnt work on Windows
-  * 8750 Increase time frame for duplicate search in MUCs
-  * 9138 Translation in Flatpak does not work
-  * 9140 Error when clicking on the notification of an incoming message
-  * 9159 Wrong form type when responding to a voice request
-  * 9069 Send cancel IQ if muc configuration is aborted 
-  * 9167 Flatpak fails to determine locale settings
-  * 9171 Gajim requests vcard multiple times
-  * 9198 Creating new MUCs with capital letters is not possible
-  * 9211 Punycode and Unicode with Internationalized Domain Names
+  * #8658 Translation doesnt work on Windows
+  * #8750 Increase time frame for duplicate search in MUCs
+  * #9138 Translation in Flatpak does not work
+  * #9140 Error when clicking on the notification of an incoming message
+  * #9159 Wrong form type when responding to a voice request
+  * #9069 Send cancel IQ if muc configuration is aborted 
+  * #9167 Flatpak fails to determine locale settings
+  * #9171 Gajim requests vcard multiple times
+  * #9198 Creating new MUCs with capital letters is not possible
+  * #9211 Punycode and Unicode with Internationalized Domain Names
 
   Other changes
 
@@ -123,9 +134,9 @@ Gajim 1.0.3 (20 May 2018)
 
   Bugs fixed:
 
-  * 8296 Fix errors on roster updates after stream management resume
-  * 9106 Convert font weight from pango to css values
-  * 9124 Bring ChatControl to front when notification is clicked
+  * #8296 Fix errors on roster updates after stream management resume
+  * #9106 Convert font weight from pango to css values
+  * #9124 Bring ChatControl to front when notification is clicked
 
   * Set no-store hint on groupchat chatstates
   * Dont show OOB uri if message body is the same
@@ -139,26 +150,26 @@ Gajim 1.0.2 (30 April 2018)
 
   Bugs fixed:
 
-  * 7879 Server name is rejected for group chat bookmarks
-  * 8964 setup.py install misses some files if used with "--skip-build"
-  * 9017 Password was sometimes stored in plaintext
-  * 9022 Dont show error when receiving invalid avatars
-  * 9031 Windows: Always hide roster window on X
-  * 9038 No License in About dialog
-  * 9039 Encode filenames before sending
-  * 9044 Catch invalid IQ stanzas and log them
-  * 9049 XMPP logo in "Add New Contact" window instead Gajim logo
-  * 9050 Mark some strings as translatable
-  * 9054 Error on file send completion
-  * 9055 Removing a bookmark causes error
-  * 9057 Avatar is deleted when updating vCard
-  * 9065 Account label isn't change in tooltip of notification area icon
-  * 9066 Placeholder text does't disappear
-  * 9068 Missing pulseaudio in Flatpak image
-  * 9070 Fix History Manager search
-  * 9074 Proxy comobobox in accounts/connections doesn't get update after ManageProxies
-  * 9094 problem receiving file
-  * 9101 Notification never autohides in gnome
+  * #7879 Server name is rejected for group chat bookmarks
+  * #8964 setup.py install misses some files if used with "--skip-build"
+  * #9017 Password was sometimes stored in plaintext
+  * #9022 Dont show error when receiving invalid avatars
+  * #9031 Windows: Always hide roster window on X
+  * #9038 No License in About dialog
+  * #9039 Encode filenames before sending
+  * #9044 Catch invalid IQ stanzas and log them
+  * #9049 XMPP logo in "Add New Contact" window instead Gajim logo
+  * #9050 Mark some strings as translatable
+  * #9054 Error on file send completion
+  * #9055 Removing a bookmark causes error
+  * #9057 Avatar is deleted when updating vCard
+  * #9065 Account label isn't change in tooltip of notification area icon
+  * #9066 Placeholder text does't disappear
+  * #9068 Missing pulseaudio in Flatpak image
+  * #9070 Fix History Manager search
+  * #9074 Proxy comobobox in accounts/connections doesn't get update after ManageProxies
+  * #9094 problem receiving file
+  * #9101 Notification never autohides in gnome
 
   * Correctly reload Plugins
   * Save history export with utf8 encoding


=====================================
gajim/common/jingle_rtp.py
=====================================
@@ -301,8 +301,9 @@ class JingleRTPContent(JingleContent):
             attrs = {
                 'name': codec.encoding_name,
                 'id': codec.id,
-                'channels': codec.channels
             }
+            if codec.channels > 0:
+                attrs['channels'] = codec.channels
             if codec.clock_rate:
                 attrs['clockrate'] = codec.clock_rate
             if codec.optional_params:
@@ -350,18 +351,35 @@ class JingleAudio(JingleRTPContent):
     def setup_stream(self):
         JingleRTPContent.setup_stream(self, self._on_src_pad_added)
 
-        # Configure SPEEX
-        # Workaround for psi (not needed since rev
-        # 147aedcea39b43402fe64c533d1866a25449888a):
-        #  place 16kHz before 8kHz, as buggy psi versions will take in
-        #  account only the first codec
-
-        codecs = [
+        # list of codecs that are explicitly allowed
+        allow_codecs = [
+            Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'OPUS',
+                                Farstream.MediaType.AUDIO, 48000),
+            Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'SPEEX',
+                                Farstream.MediaType.AUDIO, 32000),
             Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'SPEEX',
                                 Farstream.MediaType.AUDIO, 16000),
+            Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'G722',
+                                Farstream.MediaType.AUDIO, 8000),
             Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'SPEEX',
+                                Farstream.MediaType.AUDIO, 8000),
+            Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'PCMA',
+                                Farstream.MediaType.AUDIO, 8000),
+            Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'PCMU',
                                 Farstream.MediaType.AUDIO, 8000)]
-        self.p2psession.set_codec_preferences(codecs)
+
+        # disable all other codecs
+        disable_codecs = []
+        codecs_without_config = self.p2psession.props.codecs_without_config
+        allowed_encoding_names = [c.encoding_name for c in allow_codecs] + ['telephone-event']
+        for codec in codecs_without_config:
+            if codec.encoding_name not in allowed_encoding_names:
+                disable_codecs.append(Farstream.Codec.new(Farstream.CODEC_ID_DISABLE,
+                                                          codec.encoding_name,
+                                                          Farstream.MediaType.AUDIO,
+                                                          codec.clock_rate))
+
+        self.p2psession.set_codec_preferences(allow_codecs + disable_codecs)
 
         # the local parts
         # TODO: Add queues?


=====================================
gajim/remote_control.py
=====================================
@@ -312,6 +312,8 @@ class GajimRemote(Server):
             ged.POSTGUI, self.on_unsubscribed_presence_received)
         app.ged.register_event_handler('gc-message-received',
             ged.POSTGUI, self.on_gc_message_received)
+        app.ged.register_event_handler('decrypted-message-received',
+            ged.POSTGUI, self._nec_decrypted_message_received)
         app.ged.register_event_handler('our-show', ged.POSTGUI,
             self.on_our_status)
         app.ged.register_event_handler('account-created', ged.POSTGUI,
@@ -388,6 +390,12 @@ class GajimRemote(Server):
             obj.timestamp, obj.delayed, obj.xhtml_msgtxt, obj.status_code,
             obj.displaymarking, obj.captcha_form, obj.needs_highlight]))
 
+    def _nec_decrypted_message_received(self, obj):
+        self.raise_signal('NewMessage', (
+            obj.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp,
+            obj.encrypted, obj.mtype, obj.subject,
+            obj.msg_log_id, obj.user_nick, obj.xhtml, obj.form_node]))
+
     def on_our_status(self, obj):
         self.raise_signal('AccountPresence', (obj.show, obj.conn.name))
 


=====================================
gajim/session.py
=====================================
@@ -166,12 +166,6 @@ class ChatControlSession:
         if not pm:
             self.roster_message2(obj)
 
-        if app.interface.remote_ctrl:
-            app.interface.remote_ctrl.raise_signal('NewMessage', (
-                self.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp,
-                obj.encrypted, obj.mtype, obj.subject,
-                obj.msg_log_id, obj.user_nick, obj.xhtml, obj.form_node]))
-
     def roster_message2(self, obj):
         """
         Display the message or show notification in the roster



View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/60f8c52c3acf6836efa7a30caec14e89e75582ea...48f1df0bfbe78b388ece192965b8b6cda9c1b71c

-- 
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/60f8c52c3acf6836efa7a30caec14e89e75582ea...48f1df0bfbe78b388ece192965b8b6cda9c1b71c
You're receiving this email because of your account on dev.gajim.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.gajim.org/pipermail/commits/attachments/20190110/8451033b/attachment-0001.html>


More information about the Commits mailing list