Commit 9dcf648c authored by William Jon McCann's avatar William Jon McCann Committed by William Jon McCann

Don't print null strings - solaris crashes. Patch from Brian Cameron

2007-09-08  William Jon McCann  <mccann@jhu.edu>

	* daemon/gdm-greeter-server.c: (greeter_server_message_handler),
	(connection_filter_function):
	* daemon/gdm-session-relay.c: (session_relay_message_handler),
	(connection_filter_function):
	* daemon/gdm-session.c: (session_message_handler),
	(connection_filter_function):
	Don't print null strings - solaris crashes.
	Patch from Brian Cameron <brian.cameron@sun.com>


svn path=/branches/mccann-gobject/; revision=5233
parent 8dcb33ff
2007-09-08 William Jon McCann <mccann@jhu.edu>
* daemon/gdm-greeter-server.c: (greeter_server_message_handler),
(connection_filter_function):
* daemon/gdm-session-relay.c: (session_relay_message_handler),
(connection_filter_function):
* daemon/gdm-session.c: (session_message_handler),
(connection_filter_function):
Don't print null strings - solaris crashes.
Patch from Brian Cameron <brian.cameron@sun.com>
2007-09-05 William Jon McCann <mccann@jhu.edu>
* configure.ac:
......
......@@ -529,12 +529,16 @@ greeter_server_message_handler (DBusConnection *connection,
DBusMessage *message,
void *user_data)
{
g_debug ("greeter_server_message_handler: destination=%s obj_path=%s interface=%s method=%s",
dbus_message_get_destination (message),
dbus_message_get_path (message),
dbus_message_get_interface (message),
dbus_message_get_member (message));
const char *dbus_destination = dbus_message_get_destination (message);
const char *dbus_path = dbus_message_get_path (message);
const char *dbus_interface = dbus_message_get_interface (message);
const char *dbus_member = dbus_message_get_member (message);
g_debug ("greeter_server_message_handler: destination=%s obj_path=%s interface=%s method=%s",
dbus_destination ? dbus_destination : "(null)",
dbus_path ? dbus_path : "(null)",
dbus_interface ? dbus_interface : "(null)",
dbus_member ? dbus_member : "(null)");
if (dbus_message_is_method_call (message, "org.freedesktop.DBus", "AddMatch")) {
DBusMessage *reply;
......@@ -580,17 +584,17 @@ connection_filter_function (DBusConnection *connection,
void *user_data)
{
GdmGreeterServer *greeter_server = GDM_GREETER_SERVER (user_data);
const char *path;
path = dbus_message_get_path (message);
const char *dbus_path = dbus_message_get_path (message);
const char *dbus_interface = dbus_message_get_interface (message);
const char *dbus_message = dbus_message_get_member (message);
g_debug ("obj_path=%s interface=%s method=%s",
dbus_message_get_path (message),
dbus_message_get_interface (message),
dbus_message_get_member (message));
dbus_path ? dbus_path : "(null)",
dbus_interface ? dbus_interface : "(null)",
dbus_message ? dbus_message : "(null)");
if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected")
&& strcmp (path, DBUS_PATH_LOCAL) == 0) {
&& strcmp (dbus_path, DBUS_PATH_LOCAL) == 0) {
g_debug ("Disconnected");
......
......@@ -533,12 +533,16 @@ session_relay_message_handler (DBusConnection *connection,
DBusMessage *message,
void *user_data)
{
g_debug ("session_relay_message_handler: destination=%s obj_path=%s interface=%s method=%s",
dbus_message_get_destination (message),
dbus_message_get_path (message),
dbus_message_get_interface (message),
dbus_message_get_member (message));
const char *dbus_destination = dbus_message_get_destination (message);
const char *dbus_path = dbus_message_get_path (message);
const char *dbus_interface = dbus_message_get_interface (message);
const char *dbus_member = dbus_message_get_member (message);
g_debug ("session_relay_message_handler: destination=%s obj_path=%s interface=%s method=%s",
dbus_destination ? dbus_destination : "(null)",
dbus_path ? dbus_path : "(null)",
dbus_interface ? dbus_interface : "(null)",
dbus_member ? dbus_member : "(null)");
if (dbus_message_is_method_call (message, "org.freedesktop.DBus", "AddMatch")) {
DBusMessage *reply;
......@@ -583,18 +587,18 @@ connection_filter_function (DBusConnection *connection,
DBusMessage *message,
void *user_data)
{
GdmSessionRelay *session_relay = GDM_SESSION_RELAY (user_data);
const char *path;
path = dbus_message_get_path (message);
GdmSessionRelay *session_relay = GDM_SESSION_RELAY (user_data);
const char *dbus_path = dbus_message_get_path (message);
const char *dbus_interface = dbus_message_get_interface (message);
const char *dbus_message = dbus_message_get_member (message);
g_debug ("obj_path=%s interface=%s method=%s",
dbus_message_get_path (message),
dbus_message_get_interface (message),
dbus_message_get_member (message));
dbus_path ? dbus_path : "(null)",
dbus_interface ? dbus_interface : "(null)",
dbus_message ? dbus_message : "(null)");
if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected")
&& strcmp (path, DBUS_PATH_LOCAL) == 0) {
&& strcmp (dbus_path, DBUS_PATH_LOCAL) == 0) {
g_debug ("Disconnected");
......
......@@ -1069,12 +1069,16 @@ session_message_handler (DBusConnection *connection,
DBusMessage *message,
void *user_data)
{
g_debug ("session_message_handler: destination=%s obj_path=%s interface=%s method=%s",
dbus_message_get_destination (message),
dbus_message_get_path (message),
dbus_message_get_interface (message),
dbus_message_get_member (message));
const char *dbus_destination = dbus_message_get_destination (message);
const char *dbus_path = dbus_message_get_path (message);
const char *dbus_interface = dbus_message_get_interface (message);
const char *dbus_member = dbus_message_get_member (message);
g_debug ("session_message_handler: destination=%s obj_path=%s interface=%s method=%s",
dbus_destination ? dbus_destination : "(null)",
dbus_path ? dbus_path : "(null)",
dbus_interface ? dbus_interface : "(null)",
dbus_member ? dbus_member : "(null)");
if (dbus_message_is_method_call (message, "org.freedesktop.DBus", "AddMatch")) {
DBusMessage *reply;
......@@ -1149,18 +1153,18 @@ connection_filter_function (DBusConnection *connection,
DBusMessage *message,
void *user_data)
{
GdmSession *session = GDM_SESSION (user_data);
const char *path;
path = dbus_message_get_path (message);
GdmSession *session = GDM_SESSION (user_data);
const char *dbus_path = dbus_message_get_path (message);
const char *dbus_interface = dbus_message_get_interface (message);
const char *dbus_message = dbus_message_get_member (message);
g_debug ("obj_path=%s interface=%s method=%s",
dbus_message_get_path (message),
dbus_message_get_interface (message),
dbus_message_get_member (message));
dbus_path ? dbus_path : "(null)",
dbus_interface ? dbus_interface : "(null)",
dbus_message ? dbus_message : "(null)");
if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected")
&& strcmp (path, DBUS_PATH_LOCAL) == 0) {
&& strcmp (dbus_path, DBUS_PATH_LOCAL) == 0) {
g_debug ("Disconnected");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment