summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-01-14 16:17:43 +0300
committermonsta <[email protected]>2016-01-15 13:26:42 +0300
commite155641d454e11c9667f0c299158e509b702f984 (patch)
treeaf2436fa6f983651fd4a2e4c5a2880cb3add8fa4
parent4023e78b14bafc58b4ef9fb6e1cd7d9a86263442 (diff)
downloadmate-control-center-e155641d454e11c9667f0c299158e509b702f984.tar.bz2
mate-control-center-e155641d454e11c9667f0c299158e509b702f984.tar.xz
[GTK+3] appearance: fix a few deprecations
-rw-r--r--capplets/appearance/appearance-desktop.c4
-rw-r--r--capplets/appearance/appearance-main.c6
2 files changed, 10 insertions, 0 deletions
diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c
index 18c9e72f..385249b3 100644
--- a/capplets/appearance/appearance-desktop.c
+++ b/capplets/appearance/appearance-desktop.c
@@ -713,7 +713,11 @@ wp_drag_received (GtkWidget *widget,
cursor = gdk_cursor_new_for_display (gdk_display_get_default (),
GDK_WATCH);
gdk_window_set_cursor (window, cursor);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ g_object_unref (cursor);
+#else
gdk_cursor_unref (cursor);
+#endif
for (uri = uris; *uri; ++uri)
{
diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c
index b51591e9..4b2aae4d 100644
--- a/capplets/appearance/appearance-main.c
+++ b/capplets/appearance/appearance-main.c
@@ -40,8 +40,11 @@ init_appearance_data (int *argc, char ***argv, GOptionContext *context)
GtkBuilder *ui;
GError *err = NULL;
+#if !GTK_CHECK_VERSION (3, 0, 0)
gdk_threads_init ();
gdk_threads_enter ();
+#endif
+
theme_thumbnail_factory_init (*argc, *argv);
capplet_init (context, argc, argv);
activate_settings_daemon ();
@@ -236,7 +239,10 @@ main (int argc, char **argv)
/* start the mainloop */
gtk_main ();
+
+#if !GTK_CHECK_VERSION (3, 0, 0)
gdk_threads_leave ();
+#endif
/* free stuff */
g_free (data);