Gtk4 port

data/io.elementary.mail.gschema.xml

@@ -7,15 +7,15 @@
       <summary>Whether the window was maximized on last run</summary>
       <description>Whether the window was maximized on last run</description>
     </key>
-    <key name="window-position" type="(ii)">
-      <default>(-1, -1)</default>
-      <summary>Window position</summary>
-      <description>Most recent window position (x, y)</description>
-    </key>
-    <key name="window-size" type="(ii)">
-      <default>(1024, 750)</default>
-      <summary>Most recent window size</summary>
-      <description>Most recent window size (width, height)</description>
+    <key name="window-width" type="i">
+      <default>1024</default>
+      <summary>Most recent window width</summary>
+      <description>Most recent window width</description>
+    </key>
+    <key name="window-height" type="i">
+      <default>750</default>
+      <summary>Most recent window height</summary>
+      <description>Most recent window height</description>
     </key>
     <key name="paned-start-position" type="i">
       <default>190</default>

meson.build

@@ -11,35 +11,31 @@ add_project_arguments(['--vapidir', join_paths(meson.current_source_dir(), 'vapi
 
 glib_dep = dependency('glib-2.0')
 gobject_dep = dependency('gobject-2.0')
-granite_dep = dependency('granite', version: '>= 6.0.0')
+granite_dep = dependency('granite-7', version: '>=7.1')
 gee_dep = dependency('gee-0.8')
-handy_dep = dependency('libhandy-1', version: '>=1.1.90')
+adw_dep = dependency('libadwaita-1')
+gtk_dep = dependency('gtk4')
 camel_dep = dependency('camel-1.2', version: '>= 3.28')
-libedataserver_dep = dependency('libedataserver-1.2', version: '>= 3.28')
-libedataserverui_dep = dependency('libedataserverui-1.2', version: '>= 3.28')
-if libedataserverui_dep.version().version_compare('>=3.45.1')
-    add_project_arguments('--define=HAS_SOUP_3', language: 'vala')
-    webkit2_dep = dependency('webkit2gtk-4.1')
-    webkit2_web_extension_dep = dependency('webkit2gtk-web-extension-4.1')
-else
-    webkit2_dep = dependency('webkit2gtk-4.0', version: '>=2.28')
-    webkit2_web_extension_dep = dependency('webkit2gtk-web-extension-4.0', version: '>=2.28')
-endif
+libedataserver_dep = dependency('libedataserver-1.2', version: '>=3.45.1')
+libedataserverui_dep = dependency('libedataserverui4-1.0', version: '>= 3.46.4')
+webkit_dep = dependency('webkitgtk-6.0')
+webkit_web_extension_dep = dependency('webkitgtk-web-process-extension-6.0')
 folks_dep = dependency('folks')
 m_dep = meson.get_compiler('c').find_library('m')
 
-webkit2_extension_path = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'webkit2')
+webkit_extension_path = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'webkit2')
 
 dependencies = [
     glib_dep,
     gobject_dep,
     granite_dep,
     gee_dep,
-    handy_dep,
+    adw_dep,
+    gtk_dep,
     camel_dep,
     libedataserver_dep,
     libedataserverui_dep,
-    webkit2_dep,
+    webkit_dep,
     folks_dep,
     m_dep
 ]
@@ -54,12 +50,11 @@ extension_dependencies = [
     glib_dep,
     gobject_dep,
     gee_dep,
-    webkit2_web_extension_dep
+    webkit_web_extension_dep
 ]
 
 add_global_arguments([
         '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
-        '-DHANDY_USE_UNSTABLE_API'
     ],
     language:'c'
 )

src/Application.vala

@@ -51,7 +51,6 @@ public class Mail.Application : Gtk.Application {
             string to = null;
 
             try {
-#if HAS_SOUP_3
                 GLib.Uri? mailto= null;
                 try {
                     mailto = GLib.Uri.parse (mailto_uri, GLib.UriFlags.NONE);
@@ -76,26 +75,6 @@ public class Mail.Application : Gtk.Application {
                         new Composer (to, mailto.get_query ()).present ();
                     });
                 }
-#else
-                Soup.URI mailto = new Soup.URI (mailto_uri);
-                if (mailto == null) {
-                    throw new OptionError.BAD_VALUE ("Argument is not a URL.");
-                }
-
-                if (mailto.scheme != "mailto") {
-                    throw new OptionError.BAD_VALUE ("Cannot open non-mailto: URL");
-                }
-
-                to = Soup.URI.decode (mailto.path);
-
-                if (main_window.is_session_started) {
-                    new Composer (to, mailto.query).present ();
-                } else {
-                    main_window.session_started.connect (() => {
-                        new Composer (to, mailto.query).present ();
-                    });
-                }
-#endif
             } catch (OptionError e) {
                 warning ("Argument parsing error. %s", e.message);
             }
@@ -107,8 +86,6 @@ public class Mail.Application : Gtk.Application {
     protected override void startup () {
         base.startup ();
 
-        Hdy.init ();
-
         var granite_settings = Granite.Settings.get_default ();
         var gtk_settings = Gtk.Settings.get_default ();
 
@@ -120,7 +97,7 @@ public class Mail.Application : Gtk.Application {
 
         var css_provider = new Gtk.CssProvider ();
         css_provider.load_from_resource ("io/elementary/mail/application.css");
-        Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default (), css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        Gtk.StyleContext.add_provider_for_display (Gdk.Display.get_default (), css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
         var quit_action = new SimpleAction ("quit", null);
         quit_action.activate.connect (() => {
@@ -155,24 +132,6 @@ public class Mail.Application : Gtk.Application {
         if (main_window == null) {
             main_window = new MainWindow (this);
             add_window (main_window);
-
-            int window_x, window_y;
-            var rect = Gtk.Allocation ();
-
-            settings.get ("window-position", "(ii)", out window_x, out window_y);
-            settings.get ("window-size", "(ii)", out rect.width, out rect.height);
-
-            if (window_x != -1 || window_y != -1) {
-                main_window.move (window_x, window_y);
-            }
-
-            main_window.set_allocation (rect);
-
-            if (settings.get_boolean ("window-maximized")) {
-                main_window.maximize ();
-            }
-
-            main_window.show_all ();
         }
 
         main_window.present ();