1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
diff --git a/xfsettingsd/main.c b/xfsettingsd/main.c
index 23cbf6cb..92b6b8db 100644
--- a/xfsettingsd/main.c
+++ b/xfsettingsd/main.c
@@ -80,7 +80,6 @@ static guint owner_id;
struct t_data_set
{
- XfceSMClient *sm_client;
GObject *pointer_helper;
GObject *keyboards_helper;
GObject *shortcuts_helper;
@@ -144,19 +143,6 @@ on_name_acquired (GDBusConnection *connection,
s_data->workspaces_helper = g_object_new (XFCE_TYPE_WORKSPACES_HELPER, NULL);
s_data->gtk_decorations_helper = g_object_new (XFCE_TYPE_DECORATIONS_HELPER, NULL);
- /* connect to session always, even if we quit below. this way the
- * session manager won't wait for us to time out. */
- s_data->sm_client = xfce_sm_client_get ();
- xfce_sm_client_set_restart_style (s_data->sm_client, XFCE_SM_CLIENT_RESTART_IMMEDIATELY);
- xfce_sm_client_set_desktop_file (s_data->sm_client, XFSETTINGS_DESKTOP_FILE);
- xfce_sm_client_set_priority (s_data->sm_client, 20);
- g_signal_connect (G_OBJECT (s_data->sm_client), "quit", G_CALLBACK (gtk_main_quit), NULL);
- if (!xfce_sm_client_connect (s_data->sm_client, &error) && error)
- {
- g_printerr ("Failed to connect to session manager: %s\n", error->message);
- g_clear_error (&error);
- }
-
if (g_getenv ("XFSETTINGSD_NO_CLIPBOARD") == NULL)
{
s_data->clipboard_daemon = g_object_new (GSD_TYPE_CLIPBOARD_MANAGER, NULL);
@@ -229,7 +215,6 @@ main (gint argc, gchar **argv)
before we have a chance to fork.
g_option_context_add_group (context, gtk_get_option_group (FALSE));
*/
- g_option_context_add_group (context, xfce_sm_client_get_option_group (argc, argv));
g_option_context_set_ignore_unknown_options(context, TRUE);
/* parse options */
@@ -376,8 +361,6 @@ main (gint argc, gchar **argv)
xfconf_shutdown ();
- UNREF_GOBJECT (s_data.sm_client);
-
/* release the dbus name */
if (dbus_connection != NULL)
{
|