From 9bfec48843abf20676c083873358f43eef170a18 Mon Sep 17 00:00:00 2001
From: Marcus Lundblad <ml@dfupdate.se>
Date: Wed, 21 Sep 2022 21:16:38 +0200
Subject: [PATCH 1/2] locationServiceDialog: Port template to GTK4

---
 data/ui/location-service-dialog.ui | 53 +++++++++++-------------------
 1 file changed, 19 insertions(+), 34 deletions(-)

diff --git a/data/ui/location-service-dialog.ui b/data/ui/location-service-dialog.ui
index dc40ceb2..c582cbd0 100644
--- a/data/ui/location-service-dialog.ui
+++ b/data/ui/location-service-dialog.ui
@@ -1,51 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="4.0"/>
   <template class="Gjs_LocationServiceDialog" parent="GtkDialog">
-    <property name="can_focus">False</property>
-    <property name="type">popup</property>
-    <property name="type_hint">dialog</property>
     <property name="width_request">400</property>
     <property name="height_request">150</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="contentArea">
-        <property name="visible">True</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Turn on location services to find your location</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child type="titlebar">
+    <child internal-child="headerbar">
       <object class="GtkHeaderBar" id="headerBar">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="show-close-button">False</property>
-        <child>
+        <property name="show-title-buttons">0</property>
+        <child type="start">
           <object class="GtkButton" id="cancelButton">
-            <property name="label" translatable="yes">Cancel</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="label" translatable="1">Cancel</property>
+            <property name="focusable">1</property>
           </object>
-          <packing>
-            <property name="pack-type">start</property>
-          </packing>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkButton" id="settingsButton">
-            <property name="label" translatable="yes">Location Settings</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="label" translatable="1">Location Settings</property>
+            <property name="focusable">1</property>
+            <property name="receives_default">1</property>
             <style>
               <class name="suggested-action"/>
             </style>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox" id="contentArea">
+        <child>
+          <object class="GtkLabel">
+            <property name="label" translatable="1">Turn on location services to find your location</property>
+          </object>
         </child>
       </object>
     </child>
-- 
GitLab


From e397e01b80587a7dea30daccdcea07233710c173 Mon Sep 17 00:00:00 2001
From: Marcus Lundblad <ml@dfupdate.se>
Date: Wed, 21 Sep 2022 22:12:10 +0200
Subject: [PATCH 2/2] locationServiceDialog: Adjust the desktop ID for the
 location panel

The location settings panel now has the ID "gnome-location-panel.desktop".
---
 src/locationServiceDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locationServiceDialog.js b/src/locationServiceDialog.js
index d215ab01..16798eb2 100644
--- a/src/locationServiceDialog.js
+++ b/src/locationServiceDialog.js
@@ -27,7 +27,7 @@ import Gtk from 'gi://Gtk';
 
 import * as Utils from './utils.js';
 
-const _PRIVACY_PANEL = 'gnome-privacy-panel.desktop';
+const _PRIVACY_PANEL = 'gnome-location-panel.desktop';
 
 export class LocationServiceDialog extends Gtk.Dialog {
 
-- 
GitLab