mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2025-12-31 19:20:12 +01:00
10fe37f582
* tools/dbus-launch.c (print_variables): if no syntax is given, don't print something that's sort-of-half-sh-syntax, just print a plain key-value pairs thing. * tools/dbus-launch-x11.c: use machine ID rather than hostname for the local machine representation (but still have the hostname in the display). Remove the hostname from the display if it is localhost. Change session files to be named ~/.dbus/session-bus/machine-display. Change X atoms to be underscore-prefixed so nobody whines about ICCCM compliance. Otherwise name them the same as the env variables. Change session file format to include key-value pairs and an explanatory comment. Keys are the same as the env variables. (set_address_in_x11): X property format can't depend on sizeof(pid_t) on a particular machine, fix to always be 32 bits * tools/dbus-launch.c: make --autolaunch take a machine id argument. If --autolaunch is used with a program to run, complain for now (but add a FIXME). Also, don't look for existing bus if there's a program to run (but add a FIXME). * dbus/dbus-sysdeps-unix.c (_dbus_get_autolaunch_address): pass machine uuid to dbus-launch (avoids linking dbus-launch to libdbus just to get this, and avoids duplicating uuid-reading code). * tools/dbus-launch.1: clarify various things
58 lines
1.6 KiB
C
58 lines
1.6 KiB
C
/* -*- mode: C; c-file-style: "gnu" -*- */
|
|
/* dbus-launch.h dbus-launch utility
|
|
*
|
|
* Copyright (C) 2006 Thiago Macieira <thiago@kde.org>
|
|
*
|
|
* Licensed under the Academic Free License version 2.1
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
#ifndef DBUS_LAUNCH_H
|
|
#define DBUS_LAUNCH_H
|
|
|
|
#include <config.h>
|
|
#include <sys/types.h>
|
|
|
|
#ifndef TRUE
|
|
#define TRUE (1)
|
|
#endif
|
|
|
|
#ifndef FALSE
|
|
#define FALSE (0)
|
|
#endif
|
|
|
|
#undef MAX
|
|
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
|
|
|
|
#define MAX_ADDR_LEN 512
|
|
|
|
/* defined in dbus-launch.c */
|
|
void verbose (const char *format, ...);
|
|
char *xstrdup (const char *str);
|
|
void kill_bus_and_exit (int exitcode);
|
|
|
|
const char* get_machine_uuid (void);
|
|
|
|
#ifdef DBUS_BUILD_X11
|
|
/* defined in dbus-launch-x11.c */
|
|
int x11_init (void);
|
|
int x11_get_address (char **paddress, pid_t *pid, long *wid);
|
|
int x11_save_address (char *address, pid_t pid, long *wid);
|
|
void x11_handle_event (void);
|
|
#endif
|
|
|
|
#endif
|