5 files changed, 35 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 597ff12..ada344c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+1.12.1
+ * Get rid of dependency on libmate-desktop
+
 1.12.0
 * Add support for an optional dock, such as Plank
 * Retrieve strings directly from gschema (requires intltool 0.50.1)
diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
index 3fcb4bd..470fe57 100644
--- a/capplet/gsm-properties-dialog.c
+++ b/capplet/gsm-properties-dialog.c
@@ -552,7 +552,9 @@ setup_dialog (GsmPropertiesDialog *dialog)
 
 gtk_tree_view_column_set_sort_column_id (column, STORE_COL_DESCRIPTION);
 gtk_tree_view_set_search_column (treeview, STORE_COL_SEARCH);
+#if !GTK_CHECK_VERSION (3, 14, 0)
 gtk_tree_view_set_rules_hint (treeview, TRUE);
+#endif
 
 gtk_tree_view_enable_model_drag_source (treeview,
 GDK_BUTTON1_MASK|GDK_BUTTON2_MASK,
diff --git a/configure.ac b/configure.ac
index 9fe1f29..ff0ea31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([mate-session-manager], [1.12.0], [http://www.mate-desktop.org/])
+AC_INIT([mate-session-manager], [1.12.1], [http://www.mate-desktop.org/])
 AC_CONFIG_SRCDIR([mate-session])
 AC_CONFIG_HEADERS([config.h])
 
@@ -55,7 +55,6 @@ GLIB_REQUIRED=2.36.0
 GIO_REQUIRED=2.25.0
 DBUS_GLIB_REQUIRED=0.76
 UPOWER_REQUIRED=0.9.0
-MATE_DESKTOP_REQUIRED=1.9.3
 
 case "$with_gtk" in
 2.0) GTK_API_VERSION=2.0
@@ -76,7 +75,6 @@ PKG_CHECK_MODULES(MATE_SESSION,
 gio-2.0 >= $GIO_REQUIRED
 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
 dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED
 )
 
 PKG_CHECK_MODULES(SESSION_PROPERTIES,
diff --git a/egg/eggsmclient-xsmp.c b/egg/eggsmclient-xsmp.c
index 79edd82..ae6629b 100644
--- a/egg/eggsmclient-xsmp.c
+++ b/egg/eggsmclient-xsmp.c
@@ -366,9 +366,13 @@ sm_client_xsmp_startup (EggSMClient *client,
 xsmp->client_id = g_strdup (ret_client_id);
 free (ret_client_id);
 
+#if !GTK_CHECK_VERSION (3, 0, 0)
 gdk_threads_enter ();
+#endif
 gdk_x11_set_sm_client_id (xsmp->client_id);
+#if !GTK_CHECK_VERSION (3, 0, 0)
 gdk_threads_leave ();
+#endif
 
 g_debug ("Got client ID \"%s\"", xsmp->client_id);
 }
@@ -536,7 +540,9 @@ idle_do_pending_events (gpointer data)
 EggSMClientXSMP *xsmp = data;
 EggSMClient *client = data;
 
+#if !GTK_CHECK_VERSION (3, 0, 0)
 gdk_threads_enter ();
+#endif
 
 xsmp->idle = 0;
 
@@ -561,7 +567,9 @@ idle_do_pending_events (gpointer data)
 }
 
 out:
+#if !GTK_CHECK_VERSION (3, 0, 0)
 gdk_threads_leave ();
+#endif
 return FALSE;
 }
 
@@ -1283,9 +1291,13 @@ process_ice_messages (IceConn ice_conn)
 {
 IceProcessMessagesStatus status;
 
+#if !GTK_CHECK_VERSION (3, 0, 0)
 gdk_threads_enter ();
+#endif
 status = IceProcessMessages (ice_conn, NULL, NULL);
+#if !GTK_CHECK_VERSION (3, 0, 0)
 gdk_threads_leave ();
+#endif
 
 switch (status)
 {
diff --git a/mate-session/main.c b/mate-session/main.c
index 5f6e221..967bb8a 100644
--- a/mate-session/main.c
+++ b/mate-session/main.c
@@ -39,8 +39,6 @@
 #include <dbus/dbus-glib-bindings.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include <libmate-desktop/mate-gsettings.h>
-
 #include "mdm-signal-handler.h"
 #include "mdm-log.h"
 
@@ -537,6 +535,22 @@ void debug_changed (GSettings *settings, gchar *key, gpointer user_data)
 mdm_log_set_debug (debug);
 }
 
+static gboolean
+schema_exists (const gchar* schema_name)
+{
+ GSettingsSchemaSource *source;
+ GSettingsSchema *schema;
+ gboolean exists;
+
+ source = g_settings_schema_source_get_default();
+ schema = g_settings_schema_source_lookup (source, schema_name, FALSE);
+ exists = (schema != NULL);
+ if (schema)
+ g_settings_schema_unref (schema);
+
+ return exists;
+}
+
 static void set_overlay_scroll (void)
 {
 GSettings *settings;
@@ -608,7 +622,7 @@ int main(int argc, char** argv)
 mdm_log_init();
 
 /* Allows to enable/disable debug from GSettings only if it is not set from argument */
- if (!debug && mate_gsettings_schema_exists(DEBUG_SCHEMA))
+ if (!debug && schema_exists(DEBUG_SCHEMA))
 {
 debug_settings = g_settings_new (DEBUG_SCHEMA);
 g_signal_connect (debug_settings, "changed::" DEBUG_KEY, G_CALLBACK (debug_changed), NULL);