Migration from Gtk3 to Gtk4 and libadwaita 1.7 #2006

Scroker · 2025-04-28T00:02:20Z

This pull request collects the changes I made in order to move the UI of the application from gtk3 to gtk4 and libadwaita 1.7. The version of gnome that is compatible to date is 48.
In general I tried to reuse as much code as possible but obviously the js and xml files related to the UI component are deeply changed. On the daemon instead I intervened almost exclusively to make it compatible with Gtk4.
Finally I reorganized the icon part of the gresource to natively get an Icon Theme.

…ication

…gsconnect into gtk4-port

Scroker · 2025-05-05T15:27:28Z

data/org.gnome.Shell.Extensions.GSConnect.gresource.xml

+    <file compressed="true" preprocess="xml-stripblanks" alias="phone-symbolic.svg">icons/phone-symbolic.svg</file>
+    <file compressed="true" preprocess="xml-stripblanks" alias="phone-vibrate-symbolic.svg">icons/phone-vibrate-symbolic.svg</file>
+    <file compressed="true" preprocess="xml-stripblanks" alias="chat-bubbles-text-symbolic.svg">icons/chat-bubbles-text-symbolic.svg</file>
+  </gresource>
 </gresources>


With this change the application automatically recognize the icon theme inside the gresouce

…ndows

Scroker · 2025-05-07T11:27:07Z

I don't know if I messed things up, but I tried as much as possible to eliminate unnecessary changes and reduced the changes by about ten files. I understand that the commits are very messed up, if it's okay with you I'll move the changes back to another branch with one of the more structured commits and resend the pull request using that.

I also apologize for all the mess about destroy dispose and finalize. I did not really understand the resource deallocation mechanism of this application. Now I have understood it and tried to restore it and implemented it for new windows as well. Now I simply have a recurring error if I turn off the daemon after opening the message window:

../gobject/gsignal.c:2699: instance '0x556b5097d630' has no handler with id '3651'

Anyway I saw the errors related to the tests, I think I reproduced them locally. On the clipboard I had to make some adjustments for Gtk4 even though I have been using it for days and it was working. Anyway, the test result is now this:

1..2
not ok 1 The Clipboard component pulls changes from the session clipboard
# Message: Error: Timeout - Async function did not complete within 5000ms (set by jasmine.DEFAULT_TIMEOUT_INTERVAL) in file:///usr/libexec/installed-tests/gsconnect/jasmine.js (line 7031)
# Stack:
#   error properties: Object({ matches: Function })
#   setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
#   _init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34

(gjs:551912): Gjs-WARNING **: 13:26:00.411: Unhandled promise rejection. To suppress this warning, add an error handler to your promise chain with .catch() or a try-catch block around your await expression. Stack trace of the failed promise:
id<@file:///usr/libexec/installed-tests/gsconnect/components/testClipboardComponent.js:49:58
set text@file:///usr/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/components/clipboard.js:66:29
@file:///usr/libexec/installed-tests/gsconnect/components/testClipboardComponent.js:57:9
attempt@file:///usr/libexec/installed-tests/gsconnect/jasmine.js:7054:24
QueueRunner.prototype.run@file:///usr/libexec/installed-tests/gsconnect/jasmine.js:7087:25
runNext@file:///usr/libexec/installed-tests/gsconnect/jasmine.js:7006:18
next@file:///usr/libexec/installed-tests/gsconnect/jasmine.js:7013:11
once/<@file:///usr/libexec/installed-tests/gsconnect/jasmine.js:6907:11
QueueRunner.prototype.run/<@file:///usr/libexec/installed-tests/gsconnect/jasmine.js:7103:12
setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
_init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34

not ok 2 The Clipboard component pushes changes to the session clipboard
# Message: Expected '83e51d23-bc25-4b04-8dd5-cfd32be078cf' to be '88ca6802-5cf2-4780-9be3-7f2923d30d77'.
# Stack:
#   error properties: Object({ matches: Function })
#   id<@file:///usr/libexec/installed-tests/gsconnect/components/testClipboardComponent.js:38:36
#   @file:///usr/libexec/installed-tests/gsconnect/components/testClipboardComponent.js:57:9
#   setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
#   _init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34
# Message: Error: Timeout - Async function did not complete within 5000ms (set by jasmine.DEFAULT_TIMEOUT_INTERVAL) in file:///usr/libexec/installed-tests/gsconnect/jasmine.js (line 7031)
# Stack:
#   error properties: Object({ matches: Function })
#   setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
#   _init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34
nome/gjs/modules/core/overrides/GLib.js:263:34
# Message: Error: Timeout - Async function did not complete within 5000ms (set by jasmine.DEFAULT_TIMEOUT_INTERVAL) in file:///usr/libexec/installed-tests/gsconnect/jasmine.js (line 7031)
# Stack:
#   error properties: Object({ matches: Function })
#   setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
#   _init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34
Stack:
#   error properties: Object({ matches: Function })
#   setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
#   _init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34

On the SMS part the real problem is that I imported your WIP: No-cache SMS support which solves a number of issues that also plague the current stable version on reading the message history.As a result of the changes made, however, the whole chain of sending the message and reading the history has changed and the test fails:

1..8
ok 1 The sms plugin can be loaded
ok 2 The sms plugin enables its GActions when connected
ok 3 The sms plugin requests messages when connected
not ok 4 The sms plugin can request a list of conversations
# Message: Error: <spyOn> : _handleDigest() method does not exist\nUsage: spyOn(<object>, <methodName>) in file:///usr/libexec/installed-tests/gsconnect/jasmine.js (line 7947)
# Stack:
#   error properties: Object({ matches: Function })
#   @file:///usr/libexec/installed-tests/gsconnect/plugins/testSmsPlugin.js:226:14
#   setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
#   _init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34
not ok 5 The sms plugin can request full conversations
# Message: Error: <spyOn> : _handleDigest() method does not exist\nUsage: spyOn(<object>, <methodName>) in file:///usr/libexec/installed-tests/gsconnect/jasmine.js (line 7947)
# Stack:
#   error properties: Object({ matches: Function })
#   @file:///usr/libexec/installed-tests/gsconnect/plugins/testSmsPlugin.js:235:14
#   setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
#   _init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34
not ok 6 The sms plugin only requests new or updated converations
# Message: Error: <spyOn> : _handleDigest() method does not exist\nUsage: spyOn(<object>, <methodName>) in file:///usr/libexec/installed-tests/gsconnect/jasmine.js (line 7947)
# Stack:
#   error properties: Object({ matches: Function })
#   @file:///usr/libexec/installed-tests/gsconnect/plugins/testSmsPlugin.js:252:14
#   setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
#   _init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34
ok 7 The sms plugin can send SMS messages
ok 8 The sms plugin disables its GActions when disconnected

Scroker · 2025-05-07T11:46:30Z

I don't know if I messed things up, but I tried as much as possible to eliminate unnecessary changes and reduced the changes by about ten files. I understand that the commits are very messed up, if it's okay with you I'll move the changes back to another branch with one of the more structured commits and resend the pull request using that.

I also apologize for all the mess about destroy dispose and finalize. I did not really understand the resource deallocation mechanism of this application. Now I have understood it and tried to restore it and implemented it for new windows as well. Now I simply have a recurring error if I shut down the daemon after opening the message window:

../gobject/gsignal.c:2699: instance '0x55ed27a5f620' has no handler with id '1932'

Anyway I saw the errors related to the tests, I think I reproduced them locally. On the clipboard I had to make some adjustments for Gtk4 even though I have been using it for days and it was working. Anyway, the test result is now this:

1..2
not ok 1 The Clipboard component pulls changes from the session clipboard
# Message: Error: Timeout - Async function did not complete within 5000ms (set by jasmine.DEFAULT_TIMEOUT_INTERVAL) in file:///usr/libexec/installed-tests/gsconnect/jasmine.js (line 7031)
# Stack:
#   error properties: Object({ matches: Function })
#   setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
#   _init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34

(gjs:551912): Gjs-WARNING **: 13:26:00.411: Unhandled promise rejection. To suppress this warning, add an error handler to your promise chain with .catch() or a try-catch block around your await expression. Stack trace of the failed promise:
id<@file:///usr/libexec/installed-tests/gsconnect/components/testClipboardComponent.js:49:58
set text@file:///usr/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/service/components/clipboard.js:66:29
@file:///usr/libexec/installed-tests/gsconnect/components/testClipboardComponent.js:57:9
attempt@file:///usr/libexec/installed-tests/gsconnect/jasmine.js:7054:24
QueueRunner.prototype.run@file:///usr/libexec/installed-tests/gsconnect/jasmine.js:7087:25
runNext@file:///usr/libexec/installed-tests/gsconnect/jasmine.js:7006:18
next@file:///usr/libexec/installed-tests/gsconnect/jasmine.js:7013:11
once/<@file:///usr/libexec/installed-tests/gsconnect/jasmine.js:6907:11
QueueRunner.prototype.run/<@file:///usr/libexec/installed-tests/gsconnect/jasmine.js:7103:12
setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
_init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34

not ok 2 The Clipboard component pushes changes to the session clipboard
# Message: Expected '83e51d23-bc25-4b04-8dd5-cfd32be078cf' to be '88ca6802-5cf2-4780-9be3-7f2923d30d77'.
# Stack:
#   error properties: Object({ matches: Function })
#   id<@file:///usr/libexec/installed-tests/gsconnect/components/testClipboardComponent.js:38:36
#   @file:///usr/libexec/installed-tests/gsconnect/components/testClipboardComponent.js:57:9
#   setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
#   _init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34
# Message: Error: Timeout - Async function did not complete within 5000ms (set by jasmine.DEFAULT_TIMEOUT_INTERVAL) in file:///usr/libexec/installed-tests/gsconnect/jasmine.js (line 7031)
# Stack:
#   error properties: Object({ matches: Function })
#   setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
#   _init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34
nome/gjs/modules/core/overrides/GLib.js:263:34
# Message: Error: Timeout - Async function did not complete within 5000ms (set by jasmine.DEFAULT_TIMEOUT_INTERVAL) in file:///usr/libexec/installed-tests/gsconnect/jasmine.js (line 7031)
# Stack:
#   error properties: Object({ matches: Function })
#   setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
#   _init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34
Stack:
#   error properties: Object({ matches: Function })
#   setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
#   _init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34

On the SMS part the real problem is that I imported your WIP: No-cache SMS support which solves a number of issues that also plague the current stable version on reading the message history. As a result of the changes made, however, the whole chain of sending the message and reading the history has changed and the test fails:

1..8
ok 1 The sms plugin can be loaded
ok 2 The sms plugin enables its GActions when connected
ok 3 The sms plugin requests messages when connected
not ok 4 The sms plugin can request a list of conversations
# Message: Error: <spyOn> : _handleDigest() method does not exist\nUsage: spyOn(<object>, <methodName>) in file:///usr/libexec/installed-tests/gsconnect/jasmine.js (line 7947)
# Stack:
#   error properties: Object({ matches: Function })
#   @file:///usr/libexec/installed-tests/gsconnect/plugins/testSmsPlugin.js:226:14
#   setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
#   _init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34
not ok 5 The sms plugin can request full conversations
# Message: Error: <spyOn> : _handleDigest() method does not exist\nUsage: spyOn(<object>, <methodName>) in file:///usr/libexec/installed-tests/gsconnect/jasmine.js (line 7947)
# Stack:
#   error properties: Object({ matches: Function })
#   @file:///usr/libexec/installed-tests/gsconnect/plugins/testSmsPlugin.js:235:14
#   setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
#   _init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34
not ok 6 The sms plugin only requests new or updated converations
# Message: Error: <spyOn> : _handleDigest() method does not exist\nUsage: spyOn(<object>, <methodName>) in file:///usr/libexec/installed-tests/gsconnect/jasmine.js (line 7947)
# Stack:
#   error properties: Object({ matches: Function })
#   @file:///usr/libexec/installed-tests/gsconnect/plugins/testSmsPlugin.js:252:14
#   setTimeout/source<@resource:///org/gnome/gjs/modules/esm/_timers.js:72:9
#   _init/GLib.MainLoop.prototype.runAsync/</<@resource:///org/gnome/gjs/modules/core/overrides/GLib.js:263:34
ok 7 The sms plugin can send SMS messages
ok 8 The sms plugin disables its GActions when disconnected

Let me know how to proceed, whether to change branches and bring back the changes or continue on this one. And if you have any advice on how to deal with these issues on testing.

PS: I know that in general I shouldn't have touched the tests, but clipboard had direct dependencies with Gtk3 so I was forced, also on this let me know if it's ok.

github-actions · 2025-05-16T06:52:58Z

This pull request has conflicts, please resolve those so that the changes can be evaluated.

github-actions · 2025-05-20T15:05:10Z

All conflicts have been resolved, thanks!

…rences page

github-actions · 2025-07-11T18:06:29Z

This pull request has conflicts, please resolve those so that the changes can be evaluated.

LorierMatthieu · 2025-07-25T13:22:36Z

What's happening here?

github-actions · 2025-07-25T15:55:04Z

All conflicts have been resolved, thanks!

LorierMatthieu · 2025-07-25T19:40:34Z

Is this a response? If yes, so the work is still progressing.

github-actions · 2025-09-07T18:12:14Z

This pull request has conflicts, please resolve those so that the changes can be evaluated.

ferdnyc and others added 30 commits July 31, 2023 20:07

WIP: No-cache SMS support

87404c0

Initial mock of in GTK4

2d85b8b

Now the deamon works

8707573

New graphics, sendfile now works

f24f55d

Added the pairing function

50eeda8

Removed some non system icon

46c7251

some graphical improvements to the pair ui

01f1232

A little bugfixing

047ff30

Merge branch 'main' into gtk4-port

729d431

Add extension and app button to homepage

136427b

Style improvements to the home page

e8c3628

Clean de device.js code

8340d24

Merge branch 'main' into gtk4-port

7f7de8f

Merge branch 'main' into gtk4-port

c36bafc

Merge branch 'main' into gtk4-port

cb1cff7

Switch messaging-window.ui to Gtk4/Adwaita

a6f57d0

Migrate the findmyphone deprecated messagedialog component to a notif…

79324ef

…ication

Merge branch 'gtk4-port' of github.com:Scroker/gnome-shell-extension-…

ef5a437

…gsconnect into gtk4-port

Update messaging-window.ui

701ba67

Update messaging-window.ui

8d04358

Start the migration of messaging.js to the new UI

7bc255f

Switch service-error-dialog.ui to Gtk4/Adwaita

70a9c23

Switch mousepad-input-dialog.ui to Gtk4/Adwaita

72b05a6

Update mousepad-input-dialog.ui

6d85be1

Move screenshots to a new folder and adapt files

f92d5dc

Switch messaging-conversation.ui to Gtk4/Adwaita

fea5921

Update messaging-conversation.ui to use second-icon

fc99492

Switch messaging-conversation-summary.ui to Gtk4/Adwaita

de3dd24

Update service-error-dialog.ui

cc0e5da

Switch messaging-conversation-message.ui to Gtk4/Adwaita

64b2930

Scroker commented May 5, 2025

View reviewed changes

Scroker added 5 commits May 6, 2025 18:05

Restored the destroy chain and create a new one for new ApplicationWi…

4b96e20

…ndows

Trying to minimize the difference with the main branch

4d895a9

Trying to minimize the difference with the main branch

082e01b

Trying to minimize the difference with the main branch

c4f067e

Try to solve the errors in testClipboardComponent.test

da09c6c

Eslint test fixes

53fbf61

github-actions bot added the conflicts Pull requests with merge conflicts that need to be resolved label May 16, 2025

Scroker added 2 commits May 20, 2025 17:03

share and notification fixes

a331aed

Merge branch 'main' into gtk4-port

287c04c

github-actions bot removed the conflicts Pull requests with merge conflicts that need to be resolved label May 20, 2025

LorierMatthieu and others added 5 commits May 20, 2025 19:23

Give all available space to AdwSpinner

ed630f6

Update french translations

bbbfcd5

Change buttons' order on messaging window

af44760

Fixed the Encryption Info AlertDialog and CommandList on device prefe…

5ad7d75

…rences page

Merge branch 'main' into gtk4-port

81dab3b

github-actions bot added the conflicts Pull requests with merge conflicts that need to be resolved label Jul 11, 2025

Merge branch 'main' into gtk4-port

a37bd54

github-actions bot removed the conflicts Pull requests with merge conflicts that need to be resolved label Jul 25, 2025

Merge branch 'main' into gtk4-port

7f76b13

github-actions bot added the conflicts Pull requests with merge conflicts that need to be resolved label Sep 7, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Migration from Gtk3 to Gtk4 and libadwaita 1.7 #2006

Migration from Gtk3 to Gtk4 and libadwaita 1.7 #2006

Uh oh!

Scroker commented Apr 28, 2025

Uh oh!

Scroker May 5, 2025

Uh oh!

Scroker commented May 7, 2025

Uh oh!

Scroker commented May 7, 2025

Uh oh!

github-actions bot commented May 16, 2025

Uh oh!

github-actions bot commented May 20, 2025

Uh oh!

github-actions bot commented Jul 11, 2025

Uh oh!

LorierMatthieu commented Jul 25, 2025

Uh oh!

github-actions bot commented Jul 25, 2025

Uh oh!

LorierMatthieu commented Jul 25, 2025

Uh oh!

github-actions bot commented Sep 7, 2025

Uh oh!

Uh oh!

Migration from Gtk3 to Gtk4 and libadwaita 1.7 #2006

Are you sure you want to change the base?

Migration from Gtk3 to Gtk4 and libadwaita 1.7 #2006

Uh oh!

Conversation

Scroker commented Apr 28, 2025

Uh oh!

Scroker May 5, 2025

Choose a reason for hiding this comment

Uh oh!

Scroker commented May 7, 2025

Uh oh!

Scroker commented May 7, 2025

Uh oh!

github-actions bot commented May 16, 2025

Uh oh!

github-actions bot commented May 20, 2025

Uh oh!

github-actions bot commented Jul 11, 2025

Uh oh!

LorierMatthieu commented Jul 25, 2025

Uh oh!

github-actions bot commented Jul 25, 2025

Uh oh!

LorierMatthieu commented Jul 25, 2025

Uh oh!

github-actions bot commented Sep 7, 2025

Uh oh!

Uh oh!