~ubuntu-branches/ubuntu/karmic/xfce4-session/karmic

« back to all changes in this revision

Viewing changes to xfce4-session/sm-layer.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2009-06-01 00:20:53 UTC
  • mfrom: (1.1.16 upstream) (4.2.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090601002053-xzfgije0t9skg1rh
Tags: 4.6.1-1ubuntu1
* Merge from Debian unstable, remaining Ubuntu changes:
  - debian/control: use our Vcs-* fields
  - debian/patches:
    + 02_xubuntu_splash.patch: install the xubuntu session splash
    + 08_no_tips_on_startup.patch: don't show the tips screen on first log in
    + series: refreshed
  - enable GNOME services support:
    + debian/rules: pass --enable-gnome
    + debian/control: b-d on libgconf2-dev.
* debian/patches:
  - 07_fix-autostart-editor-crash.patch: dropped, fixed upstream another way
  - 09_xfce4-session-enabletcp-defaultvalue.patch: dropped, included upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
/* $Id: sm-layer.c 28142 2008-10-11 11:10:44Z kelnos $ */
 
1
/* $Id: sm-layer.c 29696 2009-04-02 08:45:53Z kelnos $ */
2
2
/*-
3
3
 * Copyright (c) 2003-2004 Benedikt Meurer <benny@xfce.org>
4
4
 * All rights reserved.
105
105
  char *network_idlist;
106
106
  char  error[2048];
107
107
 
108
 
  if (disable_tcp || !xfconf_channel_get_bool (channel, "/security/EnableTcp", TRUE))
 
108
  if (disable_tcp || !xfconf_channel_get_bool (channel, "/security/EnableTcp", FALSE))
109
109
    {
110
110
#ifdef HAVE__ICETRANSNOLISTEN
111
111
      extern void _IceTransNoListen (char *protocol);