diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-03-16 03:53:15 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-03-16 03:53:15 +0800 |
commit | f0335d9ccf5db856db4e072b2359250d53b72775 (patch) | |
tree | 2cfe58198bb1a9cbee3709d9b672e15752f33f8a /x11/gdm/files | |
parent | d84cd779e8a3dedc323f76376c5a21b143169b8f (diff) | |
download | marcuscom-ports-f0335d9ccf5db856db4e072b2359250d53b72775.tar marcuscom-ports-f0335d9ccf5db856db4e072b2359250d53b72775.tar.gz marcuscom-ports-f0335d9ccf5db856db4e072b2359250d53b72775.tar.bz2 marcuscom-ports-f0335d9ccf5db856db4e072b2359250d53b72775.tar.lz marcuscom-ports-f0335d9ccf5db856db4e072b2359250d53b72775.tar.xz marcuscom-ports-f0335d9ccf5db856db4e072b2359250d53b72775.tar.zst marcuscom-ports-f0335d9ccf5db856db4e072b2359250d53b72775.zip |
Import some patches from SVN, and add one of my own to fix aborts with
gdm.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12098 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gdm/files')
-rw-r--r-- | x11/gdm/files/patch-common_gdm-settings-direct.c | 21 | ||||
-rw-r--r-- | x11/gdm/files/patch-daemon_simple-slave-main.c | 35 | ||||
-rw-r--r-- | x11/gdm/files/patch-daemon_xdmcp-chooser-slave-main.c | 33 |
3 files changed, 89 insertions, 0 deletions
diff --git a/x11/gdm/files/patch-common_gdm-settings-direct.c b/x11/gdm/files/patch-common_gdm-settings-direct.c new file mode 100644 index 000000000..da88eda6c --- /dev/null +++ b/x11/gdm/files/patch-common_gdm-settings-direct.c @@ -0,0 +1,21 @@ +--- common/gdm-settings-direct.c.orig 2009-03-15 15:40:14.000000000 -0400 ++++ common/gdm-settings-direct.c 2009-03-15 15:49:10.000000000 -0400 +@@ -38,7 +38,7 @@ + #include "gdm-settings-utils.h" + #include "gdm-settings-direct.h" + +-static GHashTable *schemas; ++static GHashTable *schemas = NULL; + static GdmSettings *settings_object; + + static GdmSettingsEntry * +@@ -232,7 +232,8 @@ gdm_settings_direct_init (GdmSettings *s + g_return_val_if_fail (file != NULL, FALSE); + g_return_val_if_fail (root != NULL, FALSE); + +- g_assert (schemas == NULL); ++ if (schemas != NULL) ++ return TRUE; + + if (! gdm_settings_parse_schemas (file, root, &list)) { + g_warning ("Unable to parse schemas"); diff --git a/x11/gdm/files/patch-daemon_simple-slave-main.c b/x11/gdm/files/patch-daemon_simple-slave-main.c new file mode 100644 index 000000000..9557734cf --- /dev/null +++ b/x11/gdm/files/patch-daemon_simple-slave-main.c @@ -0,0 +1,35 @@ +--- daemon/simple-slave-main.c 2008/08/15 17:13:36 6382 ++++ daemon/simple-slave-main.c 2009/03/14 01:06:00 6769 +@@ -43,10 +43,13 @@ + #include "gdm-log.h" + #include "gdm-common.h" + #include "gdm-simple-slave.h" ++#include "gdm-settings.h" ++#include "gdm-settings-direct.h" + + #include "gdm-settings-client.h" + +-static int gdm_return_code = 0; ++static GdmSettings *settings = NULL; ++static int gdm_return_code = 0; + + static DBusGConnection * + get_system_bus (void) +@@ -202,6 +205,17 @@ + + gdm_log_init (); + ++ settings = gdm_settings_new (); ++ if (settings == NULL) { ++ g_warning ("Unable to initialize settings"); ++ goto out; ++ } ++ ++ if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) { ++ g_warning ("Unable to initialize settings"); ++ goto out; ++ } ++ + gdm_log_set_debug (is_debug_set (debug)); + + if (display_id == NULL) { diff --git a/x11/gdm/files/patch-daemon_xdmcp-chooser-slave-main.c b/x11/gdm/files/patch-daemon_xdmcp-chooser-slave-main.c new file mode 100644 index 000000000..4f271394a --- /dev/null +++ b/x11/gdm/files/patch-daemon_xdmcp-chooser-slave-main.c @@ -0,0 +1,33 @@ +--- daemon/xdmcp-chooser-slave-main.c 2008/08/15 17:13:36 6382 ++++ daemon/xdmcp-chooser-slave-main.c 2009/03/14 01:06:00 6769 +@@ -43,8 +43,11 @@ + #include "gdm-log.h" + #include "gdm-common.h" + #include "gdm-xdmcp-chooser-slave.h" ++#include "gdm-settings.h" ++#include "gdm-settings-direct.h" + +-static int gdm_return_code = 0; ++static GdmSettings *settings = NULL; ++static int gdm_return_code = 0; + + static DBusGConnection * + get_system_bus (void) +@@ -199,6 +202,17 @@ + + gdm_log_init (); + ++ settings = gdm_settings_new (); ++ if (settings == NULL) { ++ g_warning ("Unable to initialize settings"); ++ goto out; ++ } ++ ++ if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) { ++ g_warning ("Unable to initialize settings"); ++ goto out; ++ } ++ + gdm_log_set_debug (is_debug_set (debug)); + + if (display_id == NULL) { |