summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Tarricone <brian@tarricone.org>2009-04-02 08:45:53 +0000
committerBrian Tarricone <brian@tarricone.org>2009-04-02 08:45:53 +0000
commitd1692342b6aeddd6daf0bb010b8af990d6adbb64 (patch)
tree107c2772e137010620ba0c3bfdd280758d65472f
parentf59534f36013fa688ef2e0257e2b2845de56a59c (diff)
downloadxfce4-session-d1692342b6aeddd6daf0bb010b8af990d6adbb64.tar.gz
* xfce4-session/sm-layer.c: Fix default value for /security/EnableTcp
so it's disabled if the property isn't in xfconf (bug 5126). (Old svn revision: 29696)
-rw-r--r--ChangeLog5
-rw-r--r--NEWS2
-rw-r--r--xfce4-session/sm-layer.c2
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e85dac70..3fdfb6b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-02 Brian Tarricone <bjt23@cornell.edu>
+
+ * xfce4-session/sm-layer.c: Fix default value for /security/EnableTcp
+ so it's disabled if the property isn't in xfconf (bug 5126).
+
2009-03-01 Brian Tarricone <bjt23@cornell.edu>
* settings/xfae-model.c: Don't crash in xfae_item_free() when passed
diff --git a/NEWS b/NEWS
index 127b52a1..d55bd765 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@
- Fix crash in settings dialog when a .desktop file with a missing
Application key is opened (bug 5020).
+- Ensure networked session handling over TCP is disabled by
+ default (bug 5126).
4.6.0
=====
diff --git a/xfce4-session/sm-layer.c b/xfce4-session/sm-layer.c
index 6677739b..ab0f49a8 100644
--- a/xfce4-session/sm-layer.c
+++ b/xfce4-session/sm-layer.c
@@ -105,7 +105,7 @@ sm_init (XfconfChannel *channel,
char *network_idlist;
char error[2048];
- if (disable_tcp || !xfconf_channel_get_bool (channel, "/security/EnableTcp", TRUE))
+ if (disable_tcp || !xfconf_channel_get_bool (channel, "/security/EnableTcp", FALSE))
{
#ifdef HAVE__ICETRANSNOLISTEN
extern void _IceTransNoListen (char *protocol);