[gnome-terminal] app: Suppress some deprecated gtk settings warnings

[Christian Persch <chpe src gnome org>]

commit 93cc77012f0c51e211f80fd3237fe9b8bde92be0
Author: Christian Persch <chpe gnome org>
Date:   Thu Jul 3 11:24:07 2014 +0200

    app: Suppress some deprecated gtk settings warnings
    
    They're just annoying.

 src/terminal-app.c              |    3 +++
 src/terminal-screen-container.c |    6 +++++-
 src/terminal-util.h             |   29 +++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/src/terminal-app.c b/src/terminal-app.c
index 4ac2972..95302c5 100644
--- a/src/terminal-app.c
+++ b/src/terminal-app.c
@@ -387,10 +387,13 @@ terminal_app_init (TerminalApp *app)
   terminal_accels_init (G_APPLICATION (app), settings);
 
 #if 1
+{
   /* Legacy gtkuimanager menu accelerator */
   /* Disallow in-place menu accel changes. Only needed on gtk 3.8,
    * it's unused and ignored from 3.10 onward. */
+  TERMINAL_UTIL_OBJECT_TYPE_UNDEPRECATE_PROPERTY (GTK_TYPE_SETTINGS, "gtk-can-change-accels");
   g_object_set (gtk_settings_get_default (), "gtk-can-change-accels", FALSE, NULL);
+}
 #endif
 }
 
diff --git a/src/terminal-screen-container.c b/src/terminal-screen-container.c
index 5d11cd0..d79529a 100644
--- a/src/terminal-screen-container.c
+++ b/src/terminal-screen-container.c
@@ -18,6 +18,7 @@
 #include "config.h"
 
 #include "terminal-screen-container.h"
+#include "terminal-util.h"
 #include "terminal-debug.h"
 
 #include <gtk/gtk.h>
@@ -64,10 +65,13 @@ terminal_screen_container_style_updated (GtkWidget *widget)
                         "window-placement-set", &set,
                         NULL);
 
-  if (!set)
+  if (!set) {
+    TERMINAL_UTIL_OBJECT_TYPE_UNDEPRECATE_PROPERTY (GTK_TYPE_SETTINGS,
+                                                    "gtk-scrolled-window-placement");
     g_object_get (gtk_widget_get_settings (widget),
                   "gtk-scrolled-window-placement", &corner,
                   NULL);
+  }
 
   switch (corner) {
     case GTK_CORNER_TOP_LEFT:
diff --git a/src/terminal-util.h b/src/terminal-util.h
index c4e7c05..0367429 100644
--- a/src/terminal-util.h
+++ b/src/terminal-util.h
@@ -85,6 +85,35 @@ void terminal_g_settings_set_rgba_palette (GSettings      *settings,
 
 void terminal_util_bind_mnemonic_label_sensitivity (GtkWidget *widget);
 
+void terminal_util_object_class_undeprecate_property (GObjectClass *klass,
+                                                      const char *prop);
+
+#define TERMINAL_UTIL_OBJECT_CLASS_UNDEPRECATE_PROPERTY(klass, prop) \
+  { \
+    static volatile gsize once = 0; \
+    \
+    if (g_once_init_enter (&once)) { \
+      GParamSpec *pspec; \
+      \
+      pspec = g_object_class_find_property (klass, prop); \
+      g_warn_if_fail (pspec != NULL); \
+      if (pspec) { \
+        g_warn_if_fail (pspec->flags & G_PARAM_DEPRECATED); \
+        pspec->flags &= ~G_PARAM_DEPRECATED; \
+      } \
+      g_once_init_leave (&once, 1); \
+    } \
+  }
+
+#define TERMINAL_UTIL_OBJECT_TYPE_UNDEPRECATE_PROPERTY(type, prop) \
+  { \
+    GObjectClass *klass; \
+    \
+    klass = g_type_class_ref (type); \
+    TERMINAL_UTIL_OBJECT_CLASS_UNDEPRECATE_PROPERTY (klass, prop); \
+    g_type_class_unref (klass); \
+  }
+
 G_END_DECLS
 
 #endif /* TERMINAL_UTIL_H */