From c3dadac7bb9b732fa2e174bf6470614888021b6b Mon Sep 17 00:00:00 2001 From: monsta Date: Wed, 11 Nov 2015 13:26:19 +0300 Subject: get rid of dependency on libmate-desktop this introduces a bit of code duplication but makes m-s-m independent of any MATE packages which rely upon GTK+, and so makes it possible to migrate m-s-m to GTK+3 right away. of course, this change might be reverted in the future (when all of MATE becomes GTK+3 only). --- mate-session/main.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'mate-session') 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 #include -#include - #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); -- cgit v1.2.1