[mate-session-manager] add mate-session-manager_systemd-session_id.patch
Wolfgang Ulbrich
raveit65 at fedoraproject.org
Sat Oct 19 17:10:11 UTC 2013
commit 121018ae1b183dc02138eadd3594b091caf06177
Author: raveit65 <chat-to-me at raveit.de>
Date: Sat Oct 19 19:10:06 2013 +0200
add mate-session-manager_systemd-session_id.patch
mate-session-manager_systemd-session_id.patch | 63 +++++++++++++++++++++++++
1 files changed, 63 insertions(+), 0 deletions(-)
---
diff --git a/mate-session-manager_systemd-session_id.patch b/mate-session-manager_systemd-session_id.patch
new file mode 100644
index 0000000..7468c1b
--- /dev/null
+++ b/mate-session-manager_systemd-session_id.patch
@@ -0,0 +1,63 @@
+From 2725ff7ec27f0158bc3d6bb118e5e5649180e474 Mon Sep 17 00:00:00 2001
+From: Scott Balneaves <sbalneav at ltsp.org>
+Date: Wed, 12 Jun 2013 14:18:36 +0000
+Subject: Systemd support: session_id is char*, not int
+
+---
+diff --git a/mate-session/gsm-systemd.c b/mate-session/gsm-systemd.c
+index dbe8ea0..6b263c7 100644
+--- a/mate-session/gsm-systemd.c
++++ b/mate-session/gsm-systemd.c
+@@ -547,7 +547,7 @@ gsm_systemd_set_session_idle (GsmSystemd *manager,
+ gboolean is_idle)
+ {
+ GError *error;
+- char *session_path;
++ char *session_path = NULL;
+ DBusMessage *message;
+ DBusMessage *reply;
+ DBusError dbus_error;
+@@ -564,6 +564,8 @@ gsm_systemd_set_session_idle (GsmSystemd *manager,
+
+ gsm_systemd_get_session_path (dbus_g_connection_get_connection (manager->priv->dbus_connection), &session_path);
+
++ g_return_if_fail (session_path != NULL);
++
+ g_debug ("Updating Systemd idle status: %d", is_idle);
+ message = dbus_message_new_method_call (SD_NAME,
+ session_path,
+@@ -600,7 +602,9 @@ gsm_systemd_can_switch_user (GsmSystemd *manager)
+ {
+ GError *error;
+ char *session_id = NULL;
++#ifdef HAVE_SYSTEMD
+ char *seat_id = NULL;
++#endif
+ int ret = 0;
+
+ error = NULL;
+@@ -864,9 +868,11 @@ gchar *
+ gsm_systemd_get_current_session_type (GsmSystemd *manager)
+ {
+ GError *gerror;
+- int session_id;
++ gchar *session_id;
+ gchar *session_class = NULL;
++#ifdef HAVE_SYSTEMD
+ int res;
++#endif
+
+ gerror = NULL;
+
+@@ -890,6 +896,8 @@ gsm_systemd_get_current_session_type (GsmSystemd *manager)
+ g_warning ("Could not get Systemd session class!");
+ return NULL;
+ }
++
++ g_free (session_id);
+ #endif
+
+ return session_class;
+--
+cgit
+
More information about the scm-commits
mailing list