Attachment #182160 for bug #259138




        char               *response;

        g_assert (data->fd <= 0);
        
	if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS))
	  strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH);
	else if (g_file_test ("/tmp/.gdm_socket", G_FILE_TEST_EXISTS))
	  strcpy (addr.sun_path, "/tmp/.gdm_socket");
	else {
		gdm_shutdown_protocol_connection (data);
		return FALSE;	
	}        

        data->fd = socket (AF_UNIX, SOCK_STREAM, 0);
        if (data->fd < 0) {

                return FALSE;
        }

	if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS))
	  strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH);
	else
	  strcpy (addr.sun_path, "/tmp/.gdm_socket");

	addr.sun_family = AF_UNIX;

        if (connect (data->fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) {

        gdm_shutdown_protocol_connection (&gdm_protocol_data);
}

gboolean
gdm_available (void)
{
	if (!gdm_init_protocol_connection (&gdm_protocol_data))
		return FALSE;

	gdm_shutdown_protocol_connection (&gdm_protocol_data);
	return TRUE;
}

void
gdm_new_login (void)
{

Lines 46-51 Link Here

(-)gnome-panel-2.24.3-logout/gnome-panel/panel-gdm.h (+1 lines)
46	void gdm_set_logout_action (GdmLogoutAction action);	46	void gdm_set_logout_action (GdmLogoutAction action);
47	GdmLogoutAction gdm_get_logout_action (void);	47	GdmLogoutAction gdm_get_logout_action (void);
48	void gdm_new_login (void);	48	void gdm_new_login (void);
		49	gboolean gdm_available (void);
49		50
50	G_END_DECLS	51	G_END_DECLS
51		52

Lines 341-350 Link Here

(-)gnome-panel-2.24.3-logout/gnome-panel/panel-logout.c (-4 / +6 lines)
341	// FIXME need to verify that this response can be used	341	// FIXME need to verify that this response can be used
342	logout_dialog->priv->default_response = PANEL_LOGOUT_DIALOG_LOGOUT;	342	logout_dialog->priv->default_response = PANEL_LOGOUT_DIALOG_LOGOUT;
343		343
344	//FIXME is gdm running?	344	//FIXME need to have a more flexible test for availability
345	gtk_dialog_add_button (GTK_DIALOG (logout_dialog),	345	if (gdm_available())
346	_("_Switch User"),	346	gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
347	PANEL_LOGOUT_RESPONSE_SWITCH_USER);	347	_("_Switch User"),
		348	PANEL_LOGOUT_RESPONSE_SWITCH_USER);
		349
348	gtk_dialog_add_button (GTK_DIALOG (logout_dialog),	350	gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
349	GTK_STOCK_CANCEL,	351	GTK_STOCK_CANCEL,
350	GTK_RESPONSE_CANCEL);	352	GTK_RESPONSE_CANCEL);

Return to bug 259138

Lines 233-238 Link Here

(-)gnome-panel-2.24.3-logout/gnome-panel/panel-gdm.c (-5 / +19 lines)
233	char *response;	233	char *response;
234		234
235	g_assert (data->fd <= 0);	235	g_assert (data->fd <= 0);
		236
		237	if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS))
		238	strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH);
		239	else if (g_file_test ("/tmp/.gdm_socket", G_FILE_TEST_EXISTS))
		240	strcpy (addr.sun_path, "/tmp/.gdm_socket");
		241	else {
		242	gdm_shutdown_protocol_connection (data);
		243	return FALSE;
		244	}
236		245
237	data->fd = socket (AF_UNIX, SOCK_STREAM, 0);	246	data->fd = socket (AF_UNIX, SOCK_STREAM, 0);
238	if (data->fd < 0) {	247	if (data->fd < 0) {
Lines 242-252 Link Here
242	return FALSE;	251	return FALSE;
243	}	252	}
244		253
245	if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS))
246	strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH);
247	else
248	strcpy (addr.sun_path, "/tmp/.gdm_socket");
249
250	addr.sun_family = AF_UNIX;	254	addr.sun_family = AF_UNIX;
251		255
252	if (connect (data->fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) {	256	if (connect (data->fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) {
Lines 398-403 Link Here
398	gdm_shutdown_protocol_connection (&gdm_protocol_data);	402	gdm_shutdown_protocol_connection (&gdm_protocol_data);
399	}	403	}
400		404
		405	gboolean
		406	gdm_available (void)
		407	{
		408	if (!gdm_init_protocol_connection (&gdm_protocol_data))
		409	return FALSE;
		410
		411	gdm_shutdown_protocol_connection (&gdm_protocol_data);
		412	return TRUE;
		413	}
		414
401	void	415	void
402	gdm_new_login (void)	416	gdm_new_login (void)
403	{	417	{