Port to GTK4

lib/meson.build

@@ -1,4 +1,4 @@
-indicators_dir = join_paths(get_option('prefix'), get_option('libdir'), 'wingpanel')
+indicators_dir = join_paths(get_option('prefix'), get_option('libdir'), 'wingpanel-8')
 
 config_vapi = meson.get_compiler('vala').find_library('config', dirs: meson.current_source_dir())
 
@@ -22,10 +22,6 @@ libwingpanel_deps = [
 libwingpanel_lib = library('wingpanel',
     'Indicator.vala',
     'IndicatorManager.vala',
-    'Widgets/Container.vala',
-    'Widgets/OverlayIcon.vala',
-    'Widgets/Separator.vala',
-    'Widgets/Switch.vala',
     config_header,
     dependencies: [libwingpanel_deps, config_vapi],
     vala_header: 'wingpanel.h',
@@ -41,7 +37,7 @@ pkg.generate(
     description: 'Wingpanel Indicators API',
     version: meson.project_version(),
     subdirs: 'wingpanel',
-    variables: ['indicatorsdir=${libdir}/wingpanel'],
+    variables: ['indicatorsdir=${libdir}/wingpanel-8'],
     requires: libwingpanel_deps
 )
 

meson.build

@@ -28,14 +28,14 @@ glib_dep = dependency('glib-2.0', version: '>=2.32')
 gio_dep = dependency('gio-2.0')
 gio_unix_dep = dependency('gio-unix-2.0')
 gmodule_dep = dependency('gmodule-2.0')
-gdk_wl_dep = dependency('gdk-wayland-3.0')
+gdk_wl_dep = dependency('gtk4-wayland')
 # GDK X11 dep is for detecting whether we're on Wayland or not ONLY, we don't actually have
 # a hard X11 dependency here
-gdk_x11_dep = dependency('gdk-x11-3.0')
+gdk_x11_dep = dependency('gtk4-x11')
 x11_dep = dependency('x11')
-gtk_dep = dependency('gtk+-3.0', version: '>=3.10')
+gtk_dep = dependency('gtk4')
 gee_dep = dependency('gee-0.8')
-granite_dep = dependency('granite', version: '>=5.4.0')
+granite_dep = dependency('granite-7')
 posix_dep = meson.get_compiler('vala').find_library('posix')
 wl_client_dep = dependency('wayland-client')
 

sample/SampleIndicator.vala

@@ -57,8 +57,8 @@ public class Sample.Indicator : Wingpanel.Indicator {
         };
 
         var hide_button = new Gtk.Button.with_label (_("Hide me!"));
-        hide_button.get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT);
-        hide_button.get_style_context ().add_class (Gtk.STYLE_CLASS_MENUITEM);
+        hide_button.get_style_context ().add_class (Granite.STYLE_CLASS_FLAT);
+        hide_button.get_style_context ().add_class (Granite.STYLE_CLASS_MENUITEM);
 
         var compositing_switch = new Granite.SwitchModelButton (_("Composited Icon"));
 

src/Application.vala

@@ -113,7 +113,7 @@ public class Wingpanel.Application : Gtk.Application {
         base.startup ();
 
         panel_window = new PanelWindow (this);
-        panel_window.show_all ();
+        panel_window.present ();
 
         register_actions ();
     }