diff --git a/.gitignore b/.gitignore index 94c0e11..3715729 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /mate-session-manager-1.9.3.tar.xz /mate-session-manager-1.9.90.tar.xz /mate-session-manager-1.10.0.tar.xz +/mate-session-manager-1.10.1.tar.xz diff --git a/mate-session-manager.spec b/mate-session-manager.spec index 58689d0..815ab48 100644 --- a/mate-session-manager.spec +++ b/mate-session-manager.spec @@ -1,13 +1,10 @@ Name: mate-session-manager -Version: 1.10.0 +Version: 1.10.1 Release: 1%{?dist} Summary: MATE Desktop session manager License: GPLv2+ URL: http://mate-desktop.org -Source0: http://pub.mate-desktop.org/releases/1.9/%{name}-%{version}.tar.xz - -# https://github.com/mate-desktop/mate-session-manager/pull/80 -Patch0: mate-session-manager_ckeck-for-running-DM-for-user-switching.patch +Source0: http://pub.mate-desktop.org/releases/1.10/%{name}-%{version}.tar.xz BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils @@ -39,8 +36,6 @@ full-featured user session. %prep %setup -q -%patch0 -p1 -b .user-switching - %build %configure \ --disable-static \ @@ -100,6 +95,10 @@ fi %changelog +* Fri Jun 12 2015 Wolfgang Ulbrich - 1.10.1.1 +- update to 1.10.1 release +- removed upstreamed patches + * Tue Apr 07 2015 Wolfgang Ulbrich - 1.10.0-1 - update to 1.10.0 release diff --git a/mate-session-manager_ckeck-for-running-DM-for-user-switching.patch b/mate-session-manager_ckeck-for-running-DM-for-user-switching.patch deleted file mode 100644 index 4359b8c..0000000 --- a/mate-session-manager_ckeck-for-running-DM-for-user-switching.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c -index 2a4d140..11af41b 100644 ---- a/mate-session/gsm-manager.c -+++ b/mate-session/gsm-manager.c -@@ -1034,18 +1034,21 @@ cancel_end_session (GsmManager *manager) - } - - static gboolean --is_program_in_path (const char *program) -+process_is_running (const char * name) - { -- char *tmp = g_find_program_in_path (program); -- if (tmp != NULL) -- { -- g_free (tmp); -- return TRUE; -- } -- else -- { -- return FALSE; -- } -+ int num_processes; -+ char * command = g_strdup_printf ("pidof %s | wc -l", name); -+ FILE *fp = popen(command, "r"); -+ fscanf(fp, "%d", &num_processes); -+ pclose(fp); -+ g_free (command); -+ -+ if (num_processes > 0) { -+ return TRUE; -+ } -+ else { -+ return FALSE; -+ } - } - - static void -@@ -1054,6 +1057,7 @@ manager_switch_user (GsmManager *manager) - GError *error; - gboolean res; - char *command; -+ const gchar *xdg_seat_path = g_getenv ("XDG_SEAT_PATH"); - - /* We have to do this here and in request_switch_user() because this - * function can be called at a later time, not just directly after -@@ -1063,7 +1067,7 @@ manager_switch_user (GsmManager *manager) - return; - } - -- if (is_program_in_path (MDM_FLEXISERVER_COMMAND)) { -+ if (process_is_running("mdm")) { - /* MDM */ - command = g_strdup_printf ("%s %s", - MDM_FLEXISERVER_COMMAND, -@@ -1079,7 +1083,7 @@ manager_switch_user (GsmManager *manager) - g_error_free (error); - } - } -- else if (is_program_in_path (GDM_FLEXISERVER_COMMAND)) { -+ else if (process_is_running("gdm") || process_is_running("gdm3")) { - /* GDM */ - command = g_strdup_printf ("%s %s", - GDM_FLEXISERVER_COMMAND, -@@ -1095,38 +1099,35 @@ manager_switch_user (GsmManager *manager) - g_error_free (error); - } - } -- else { -+ else if (xdg_seat_path != NULL) { - /* LightDM */ -- const gchar *xdg_seat_path = g_getenv ("XDG_SEAT_PATH"); -- if (xdg_seat_path != NULL) { -- GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START; -- GDBusProxy *proxy = NULL; -- error = NULL; -+ GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START; -+ GDBusProxy *proxy = NULL; -+ error = NULL; - -- proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM, -- flags, -- NULL, -- "org.freedesktop.DisplayManager", -- xdg_seat_path, -- "org.freedesktop.DisplayManager.Seat", -- NULL, -- &error); -- if (proxy != NULL) { -- g_dbus_proxy_call_sync (proxy, -- "SwitchToGreeter", -- g_variant_new ("()"), -- G_DBUS_CALL_FLAGS_NONE, -- -1, -- NULL, -- NULL); -- g_object_unref (proxy); -- } -- else { -- g_debug ("GsmManager: Unable to start LightDM greeter: %s", error->message); -- g_error_free (error); -- } -+ proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM, -+ flags, -+ NULL, -+ "org.freedesktop.DisplayManager", -+ xdg_seat_path, -+ "org.freedesktop.DisplayManager.Seat", -+ NULL, -+ &error); -+ if (proxy != NULL) { -+ g_dbus_proxy_call_sync (proxy, -+ "SwitchToGreeter", -+ g_variant_new ("()"), -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, -+ NULL, -+ NULL); -+ g_object_unref (proxy); - } -- } -+ else { -+ g_debug ("GsmManager: Unable to start LightDM greeter: %s", error->message); -+ g_error_free (error); -+ } -+ } - } - - static gboolean - diff --git a/sources b/sources index fcb2915..97ad21a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1415ec705baa71290d7596b6637b1285 mate-session-manager-1.10.0.tar.xz +d4b54724532af2bd0fd93bcf047934f5 mate-session-manager-1.10.1.tar.xz