Revert "Gio::Settings: fix type of 'key' parameter of writable-change-event signal"

This reverts commit d78ae1d81410bd7930aede831cdf1f15ae4920af.

This doesn't seem appropriate for the stable release cycle.

3 files changed, 3 insertions, 21 deletions

diff --git a/gio/src/gio_signals.defs b/gio/src/gio_signals.defs
index 31a26839..7af937c9 100644
--- a/gio/src/gio_signals.defs
+++ b/gio/src/gio_signals.defs
@@ -1049,7 +1049,7 @@
   (return-type "gboolean")
   (when "last")
   (parameters
-    '("GQuark" "p0")
+    '("guint" "p0")
   )
 )
 
@@ -1752,7 +1752,7 @@
   (return-type "gboolean")
   (when "last")
   (parameters
-    '("GQuark" "p0")
+    '("guint" "p0")
   )
 )
 
diff --git a/gio/src/gio_signals.defs.patch b/gio/src/gio_signals.defs.patch
index 06a331f1..a7b07ba6 100644
--- a/gio/src/gio_signals.defs.patch
+++ b/gio/src/gio_signals.defs.patch
@@ -36,24 +36,6 @@
    )
  )
  
-@@ -1049,6 +1049,6 @@
-   (return-type "gboolean")
-   (when "last")
-   (parameters
--    '("guint" "p0")
-+    '("GQuark" "p0")
-   )
- )
-
-@@ -1752,6 +1752,6 @@
-   (return-type "gboolean")
-   (when "last")
-   (parameters
--    '("guint" "p0")
-+    '("GQuark" "p0")
-   )
- )
-
 @@ -1824,8 +1824,8 @@
    (return-type "void")
    (when "last")
diff --git a/gio/src/settings.hg b/gio/src/settings.hg
index dbdbf201..49c1905c 100644
--- a/gio/src/settings.hg
+++ b/gio/src/settings.hg
@@ -215,7 +215,7 @@ _DEPRECATE_IFDEF_END
 #m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
   _WRAP_SIGNAL(void changed(const Glib::ustring& key), "changed", detail_name key, two_signal_methods)
 
-  _WRAP_SIGNAL(bool writable_change_event(GQuark key), "writable-change-event")
+  _WRAP_SIGNAL(bool writable_change_event(guint key), "writable-change-event")
   _WRAP_SIGNAL(void writable_changed(const Glib::ustring& key), writable_changed)
 };