|
|
|
@ -1,22 +1,23 @@ |
|
|
|
From cae19300c8035b84c71f6ba5fb17d86add2465dd Mon Sep 17 00:00:00 2001 |
|
|
|
From ade647861a671eca584d25432722ac2661854748 Mon Sep 17 00:00:00 2001 |
|
|
|
From: Josselin Mouette <joss@malsain.org> |
|
|
|
From: Josselin Mouette <joss@malsain.org> |
|
|
|
Date: Mon, 21 Jun 2010 15:22:23 -0400 |
|
|
|
Date: Mon, 21 Jun 2010 15:22:23 -0400 |
|
|
|
Subject: [PATCH 08/19] Add "Remember Currently Running Applications" button |
|
|
|
Subject: [PATCH 08/19] Add "Remember Currently Running Applications" button |
|
|
|
|
|
|
|
|
|
|
|
This adds back session saving that's not at logout. |
|
|
|
This adds back session saving that's not at logout. |
|
|
|
--- |
|
|
|
--- |
|
|
|
capplet/gsm-properties-dialog.c | 63 +++++++++++- |
|
|
|
capplet/gsm-properties-dialog.c | 63 ++++++++- |
|
|
|
configure.ac | 1 + |
|
|
|
capplet/meson.build | 3 +- |
|
|
|
data/session-properties.ui | 12 +++ |
|
|
|
data/session-properties.ui | 12 ++ |
|
|
|
gnome-session/gsm-client.c | 10 ++ |
|
|
|
gnome-session/gsm-client.c | 10 ++ |
|
|
|
gnome-session/gsm-client.h | 6 ++ |
|
|
|
gnome-session/gsm-client.h | 6 + |
|
|
|
gnome-session/gsm-dbus-client.c | 14 +++ |
|
|
|
gnome-session/gsm-dbus-client.c | 14 ++ |
|
|
|
gnome-session/gsm-manager.c | 150 ++++++++++++++++++++++++++++- |
|
|
|
gnome-session/gsm-manager.c | 150 ++++++++++++++++++++- |
|
|
|
gnome-session/gsm-manager.h | 3 + |
|
|
|
gnome-session/gsm-manager.h | 3 + |
|
|
|
gnome-session/gsm-xsmp-client.c | 37 +++++++ |
|
|
|
gnome-session/gsm-xsmp-client.c | 37 +++++ |
|
|
|
gnome-session/gsm-xsmp-client.h | 3 +- |
|
|
|
gnome-session/gsm-xsmp-client.h | 3 +- |
|
|
|
gnome-session/org.gnome.SessionManager.xml | 8 ++ |
|
|
|
gnome-session/org.gnome.SessionManager.xml | 8 ++ |
|
|
|
11 files changed, 303 insertions(+), 4 deletions(-) |
|
|
|
meson.build | 1 + |
|
|
|
|
|
|
|
12 files changed, 305 insertions(+), 5 deletions(-) |
|
|
|
|
|
|
|
|
|
|
|
diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c |
|
|
|
diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c |
|
|
|
index 33812b8b..d2be778b 100644 |
|
|
|
index 33812b8b..d2be778b 100644 |
|
|
|
@ -221,72 +222,49 @@ index 33812b8b..d2be778b 100644 |
|
|
|
dialog->priv->tree_filter = tree_filter; |
|
|
|
dialog->priv->tree_filter = tree_filter; |
|
|
|
|
|
|
|
|
|
|
|
gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (tree_filter), |
|
|
|
gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (tree_filter), |
|
|
|
diff --git a/configure.ac b/configure.ac |
|
|
|
diff --git a/capplet/meson.build b/capplet/meson.build |
|
|
|
index 5182c09e..73e69bc7 100644 |
|
|
|
index 8dad9c80..ae6cb6b9 100644 |
|
|
|
--- a/configure.ac |
|
|
|
--- a/capplet/meson.build |
|
|
|
+++ b/configure.ac |
|
|
|
+++ b/capplet/meson.build |
|
|
|
@@ -51,60 +51,61 @@ if test "$enable_session_selector" = yes; then |
|
|
|
@@ -1,36 +1,37 @@ |
|
|
|
PKG_CHECK_MODULES(SESSION_SELECTOR, gtk+-3.0 gio-2.0) |
|
|
|
install_data( |
|
|
|
fi |
|
|
|
install_dir: session_bindir |
|
|
|
|
|
|
|
|
|
|
|
dnl ==================================================================== |
|
|
|
|
|
|
|
dnl Dependency Checks |
|
|
|
|
|
|
|
dnl ==================================================================== |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dnl Standard vertical stacks |
|
|
|
|
|
|
|
PKG_CHECK_MODULES(GIO, gio-2.0) |
|
|
|
|
|
|
|
PKG_CHECK_MODULES(GIOUNIX, gio-unix-2.0 >= $GLIB_REQUIRED) |
|
|
|
|
|
|
|
PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= $GTK3_REQUIRED) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
PKG_CHECK_MODULES(GNOME_SESSION, |
|
|
|
|
|
|
|
glib-2.0 >= $GLIB_REQUIRED |
|
|
|
|
|
|
|
gio-2.0 >= $GLIB_REQUIRED |
|
|
|
|
|
|
|
json-glib-1.0 >= $JSON_GLIB_REQUIRED |
|
|
|
|
|
|
|
gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED |
|
|
|
|
|
|
|
) |
|
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
dnl We can only support old upower |
|
|
|
deps = session_deps + [ |
|
|
|
dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383 |
|
|
|
glib_dep, |
|
|
|
PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no) |
|
|
|
gtk_dep, |
|
|
|
AS_IF([test x$have_old_upower = xyes], [ |
|
|
|
x11_dep, |
|
|
|
AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower]) |
|
|
|
sm_dep, |
|
|
|
]) |
|
|
|
- ice_dep |
|
|
|
AM_CONDITIONAL(HAVE_OLD_UPOWER, test x$have_old_upower = xyes) |
|
|
|
+ ice_dep, |
|
|
|
|
|
|
|
+ dbus_glib_dep |
|
|
|
PKG_CHECK_MODULES(SESSION_PROPERTIES, |
|
|
|
] |
|
|
|
glib-2.0 >= $GLIB_REQUIRED |
|
|
|
|
|
|
|
gtk+-3.0 >= $GTK3_REQUIRED |
|
|
|
cflags = [ |
|
|
|
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED |
|
|
|
'-DLOCALE_DIR="@0@"'.format(session_localedir), |
|
|
|
|
|
|
|
'-DGTKBUILDER_DIR="@0@"'.format(session_pkgdatadir) |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
sources = files( |
|
|
|
|
|
|
|
'../gnome-session/gsm-util.c', |
|
|
|
|
|
|
|
'gsm-app-dialog.c', |
|
|
|
|
|
|
|
'gsm-properties-dialog.c', |
|
|
|
|
|
|
|
'gsp-app.c', |
|
|
|
|
|
|
|
'gsp-app-manager.c', |
|
|
|
|
|
|
|
'gsp-keyfile.c', |
|
|
|
|
|
|
|
'main.c' |
|
|
|
) |
|
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
PKG_CHECK_MODULES(X11, x11) |
|
|
|
executable( |
|
|
|
PKG_CHECK_MODULES(SM, sm) |
|
|
|
'gnome-session-properties', |
|
|
|
PKG_CHECK_MODULES(ICE, ice) |
|
|
|
sources, |
|
|
|
PKG_CHECK_MODULES(XEXT, xext xau) |
|
|
|
include_directories: [ top_inc, include_directories('../gnome-session') ], |
|
|
|
|
|
|
|
dependencies: deps, |
|
|
|
PKG_CHECK_MODULES(GL_TEST, xcomposite gl glib-2.0 epoxy) |
|
|
|
c_args: cflags, |
|
|
|
PKG_CHECK_MODULES(GLES_TEST, egl glesv2) |
|
|
|
install: true, |
|
|
|
|
|
|
|
install_dir: session_bindir |
|
|
|
dnl ==================================================================== |
|
|
|
) |
|
|
|
dnl Check for gconf |
|
|
|
|
|
|
|
dnl ==================================================================== |
|
|
|
|
|
|
|
AC_ARG_ENABLE([gconf], |
|
|
|
|
|
|
|
AS_HELP_STRING([--enable-gconf], [Support gconf-based autostart]), |
|
|
|
|
|
|
|
[enable_gconf=$enableval], |
|
|
|
|
|
|
|
[enable_gconf=auto]) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if test x$enable_gconf != xno ; then |
|
|
|
|
|
|
|
PKG_CHECK_MODULES(GCONF, gconf-2.0, [have_gconf=yes], [have_gconf=no]) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if test x$enable_gconf = xyes -a x$have_gconf = xno ; then |
|
|
|
|
|
|
|
AC_MSG_ERROR([GConf support explicitly required, but gconf not found]) |
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if test x$have_gconf = xyes ; then |
|
|
|
|
|
|
|
AC_DEFINE([HAVE_GCONF], [1], [Define if we support gconf-based autostart]) |
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/data/session-properties.ui b/data/session-properties.ui |
|
|
|
diff --git a/data/session-properties.ui b/data/session-properties.ui |
|
|
|
index 47a30f78..b43759ff 100644 |
|
|
|
index 47a30f78..b43759ff 100644 |
|
|
|
--- a/data/session-properties.ui |
|
|
|
--- a/data/session-properties.ui |
|
|
|
@ -413,10 +391,10 @@ index 47a30f78..b43759ff 100644 |
|
|
|
<property name="can_focus">False</property> |
|
|
|
<property name="can_focus">False</property> |
|
|
|
<property name="spacing">12</property> |
|
|
|
<property name="spacing">12</property> |
|
|
|
diff --git a/gnome-session/gsm-client.c b/gnome-session/gsm-client.c |
|
|
|
diff --git a/gnome-session/gsm-client.c b/gnome-session/gsm-client.c |
|
|
|
index 75edbbff..7b78d9e1 100644 |
|
|
|
index 6828ad44..3f216b22 100644 |
|
|
|
--- a/gnome-session/gsm-client.c |
|
|
|
--- a/gnome-session/gsm-client.c |
|
|
|
+++ b/gnome-session/gsm-client.c |
|
|
|
+++ b/gnome-session/gsm-client.c |
|
|
|
@@ -514,49 +514,59 @@ gsm_client_query_end_session (GsmClient *client, |
|
|
|
@@ -514,50 +514,60 @@ gsm_client_query_end_session (GsmClient *client, |
|
|
|
g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE); |
|
|
|
g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE); |
|
|
|
|
|
|
|
|
|
|
|
return GSM_CLIENT_GET_CLASS (client)->impl_query_end_session (client, flags, error); |
|
|
|
return GSM_CLIENT_GET_CLASS (client)->impl_query_end_session (client, flags, error); |
|
|
|
@ -459,11 +437,12 @@ index 75edbbff..7b78d9e1 100644 |
|
|
|
+ |
|
|
|
+ |
|
|
|
GKeyFile * |
|
|
|
GKeyFile * |
|
|
|
gsm_client_save (GsmClient *client, |
|
|
|
gsm_client_save (GsmClient *client, |
|
|
|
|
|
|
|
GsmApp *app, |
|
|
|
GError **error) |
|
|
|
GError **error) |
|
|
|
{ |
|
|
|
{ |
|
|
|
g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE); |
|
|
|
g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE); |
|
|
|
|
|
|
|
|
|
|
|
return GSM_CLIENT_GET_CLASS (client)->impl_save (client, error); |
|
|
|
return GSM_CLIENT_GET_CLASS (client)->impl_save (client, app, error); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void |
|
|
|
void |
|
|
|
@ -477,10 +456,10 @@ index 75edbbff..7b78d9e1 100644 |
|
|
|
is_ok, do_last, cancel, reason); |
|
|
|
is_ok, do_last, cancel, reason); |
|
|
|
} |
|
|
|
} |
|
|
|
diff --git a/gnome-session/gsm-client.h b/gnome-session/gsm-client.h |
|
|
|
diff --git a/gnome-session/gsm-client.h b/gnome-session/gsm-client.h |
|
|
|
index cd7c06d8..f79896b3 100644 |
|
|
|
index 78cb15d8..19c9cd8d 100644 |
|
|
|
--- a/gnome-session/gsm-client.h |
|
|
|
--- a/gnome-session/gsm-client.h |
|
|
|
+++ b/gnome-session/gsm-client.h |
|
|
|
+++ b/gnome-session/gsm-client.h |
|
|
|
@@ -63,89 +63,95 @@ struct _GsmClient |
|
|
|
@@ -64,91 +64,97 @@ struct _GsmClient |
|
|
|
GObject parent; |
|
|
|
GObject parent; |
|
|
|
GsmClientPrivate *priv; |
|
|
|
GsmClientPrivate *priv; |
|
|
|
}; |
|
|
|
}; |
|
|
|
@ -515,6 +494,7 @@ index cd7c06d8..f79896b3 100644 |
|
|
|
+ guint flags, |
|
|
|
+ guint flags, |
|
|
|
+ GError **error); |
|
|
|
+ GError **error); |
|
|
|
GKeyFile * (*impl_save) (GsmClient *client, |
|
|
|
GKeyFile * (*impl_save) (GsmClient *client, |
|
|
|
|
|
|
|
GsmApp *app, |
|
|
|
GError **error); |
|
|
|
GError **error); |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
@ -560,6 +540,7 @@ index cd7c06d8..f79896b3 100644 |
|
|
|
+ guint flags, |
|
|
|
+ guint flags, |
|
|
|
+ GError **error); |
|
|
|
+ GError **error); |
|
|
|
GKeyFile *gsm_client_save (GsmClient *client, |
|
|
|
GKeyFile *gsm_client_save (GsmClient *client, |
|
|
|
|
|
|
|
GsmApp *app, |
|
|
|
GError **error); |
|
|
|
GError **error); |
|
|
|
|
|
|
|
|
|
|
|
gboolean gsm_client_stop (GsmClient *client, |
|
|
|
gboolean gsm_client_stop (GsmClient *client, |
|
|
|
@ -577,7 +558,7 @@ index cd7c06d8..f79896b3 100644 |
|
|
|
|
|
|
|
|
|
|
|
#endif /* __GSM_CLIENT_H__ */ |
|
|
|
#endif /* __GSM_CLIENT_H__ */ |
|
|
|
diff --git a/gnome-session/gsm-dbus-client.c b/gnome-session/gsm-dbus-client.c |
|
|
|
diff --git a/gnome-session/gsm-dbus-client.c b/gnome-session/gsm-dbus-client.c |
|
|
|
index dcf96f0b..050ea18f 100644 |
|
|
|
index 6e9b002b..5793f830 100644 |
|
|
|
--- a/gnome-session/gsm-dbus-client.c |
|
|
|
--- a/gnome-session/gsm-dbus-client.c |
|
|
|
+++ b/gnome-session/gsm-dbus-client.c |
|
|
|
+++ b/gnome-session/gsm-dbus-client.c |
|
|
|
@@ -300,60 +300,73 @@ gsm_dbus_client_get_property (GObject *object, |
|
|
|
@@ -300,60 +300,73 @@ gsm_dbus_client_get_property (GObject *object, |
|
|
|
@ -626,6 +607,7 @@ index dcf96f0b..050ea18f 100644 |
|
|
|
+ |
|
|
|
+ |
|
|
|
static GKeyFile * |
|
|
|
static GKeyFile * |
|
|
|
dbus_client_save (GsmClient *client, |
|
|
|
dbus_client_save (GsmClient *client, |
|
|
|
|
|
|
|
GsmApp *app, |
|
|
|
GError **error) |
|
|
|
GError **error) |
|
|
|
{ |
|
|
|
{ |
|
|
|
g_debug ("GsmDBusClient: saving client with id %s", |
|
|
|
g_debug ("GsmDBusClient: saving client with id %s", |
|
|
|
@ -653,8 +635,7 @@ index dcf96f0b..050ea18f 100644 |
|
|
|
return NULL; |
|
|
|
return NULL; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
static GsmClientRestartStyle |
|
|
|
@@ -394,60 +407,61 @@ static gboolean |
|
|
|
@@ -393,60 +406,61 @@ static gboolean |
|
|
|
|
|
|
|
dbus_client_end_session (GsmClient *client, |
|
|
|
dbus_client_end_session (GsmClient *client, |
|
|
|
GsmClientEndSessionFlag flags, |
|
|
|
GsmClientEndSessionFlag flags, |
|
|
|
GError **error) |
|
|
|
GError **error) |
|
|
|
@ -717,7 +698,7 @@ index dcf96f0b..050ea18f 100644 |
|
|
|
"bus-name", bus_name, |
|
|
|
"bus-name", bus_name, |
|
|
|
NULL); |
|
|
|
NULL); |
|
|
|
diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c |
|
|
|
diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c |
|
|
|
index e2fad3b1..825a6846 100644 |
|
|
|
index 4bb81e04..ede4186a 100644 |
|
|
|
--- a/gnome-session/gsm-manager.c |
|
|
|
--- a/gnome-session/gsm-manager.c |
|
|
|
+++ b/gnome-session/gsm-manager.c |
|
|
|
+++ b/gnome-session/gsm-manager.c |
|
|
|
@@ -54,60 +54,61 @@ |
|
|
|
@@ -54,60 +54,61 @@ |
|
|
|
@ -997,7 +978,7 @@ index e2fad3b1..825a6846 100644 |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
error = NULL; |
|
|
|
error = NULL; |
|
|
|
gsm_session_save (manager->priv->clients, &error); |
|
|
|
gsm_session_save (manager->priv->clients, manager->priv->apps, &error); |
|
|
|
|
|
|
|
|
|
|
|
if (error) { |
|
|
|
if (error) { |
|
|
|
g_warning ("Error saving session: %s", error->message); |
|
|
|
g_warning ("Error saving session: %s", error->message); |
|
|
|
@ -1315,7 +1296,7 @@ index bc440cb0..4d14aa34 100644 |
|
|
|
|
|
|
|
|
|
|
|
#endif /* __GSM_MANAGER_H */ |
|
|
|
#endif /* __GSM_MANAGER_H */ |
|
|
|
diff --git a/gnome-session/gsm-xsmp-client.c b/gnome-session/gsm-xsmp-client.c |
|
|
|
diff --git a/gnome-session/gsm-xsmp-client.c b/gnome-session/gsm-xsmp-client.c |
|
|
|
index 9358f94c..2846d9b3 100644 |
|
|
|
index 8a30926f..cbecd68c 100644 |
|
|
|
--- a/gnome-session/gsm-xsmp-client.c |
|
|
|
--- a/gnome-session/gsm-xsmp-client.c |
|
|
|
+++ b/gnome-session/gsm-xsmp-client.c |
|
|
|
+++ b/gnome-session/gsm-xsmp-client.c |
|
|
|
@@ -39,60 +39,61 @@ |
|
|
|
@@ -39,60 +39,61 @@ |
|
|
|
@ -1465,7 +1446,7 @@ index 9358f94c..2846d9b3 100644 |
|
|
|
desktop_file_path = |
|
|
|
desktop_file_path = |
|
|
|
gsm_util_find_desktop_file_for_app_name (program_name, |
|
|
|
gsm_util_find_desktop_file_for_app_name (program_name, |
|
|
|
TRUE, FALSE); |
|
|
|
TRUE, FALSE); |
|
|
|
@@ -955,100 +980,112 @@ xsmp_get_unix_process_id (GsmClient *client) |
|
|
|
@@ -964,100 +989,112 @@ xsmp_get_unix_process_id (GsmClient *client) |
|
|
|
gboolean res; |
|
|
|
gboolean res; |
|
|
|
|
|
|
|
|
|
|
|
g_debug ("GsmXSMPClient: getting pid"); |
|
|
|
g_debug ("GsmXSMPClient: getting pid"); |
|
|
|
@ -1719,6 +1700,72 @@ index 580ec356..29eb0990 100644 |
|
|
|
<doc:term>0</doc:term> |
|
|
|
<doc:term>0</doc:term> |
|
|
|
<doc:definition>Normal.</doc:definition> |
|
|
|
<doc:definition>Normal.</doc:definition> |
|
|
|
</doc:item> |
|
|
|
</doc:item> |
|
|
|
|
|
|
|
diff --git a/meson.build b/meson.build |
|
|
|
|
|
|
|
index 9a16d5b1..24221bb6 100644 |
|
|
|
|
|
|
|
--- a/meson.build |
|
|
|
|
|
|
|
+++ b/meson.build |
|
|
|
|
|
|
|
@@ -72,60 +72,61 @@ if enable_deprecation_flags |
|
|
|
|
|
|
|
endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
compiler_flags = [] |
|
|
|
|
|
|
|
if session_debug |
|
|
|
|
|
|
|
test_cflags = [ |
|
|
|
|
|
|
|
'-Werror=format=2', |
|
|
|
|
|
|
|
'-Werror=implicit-function-declaration', |
|
|
|
|
|
|
|
'-Werror=init-self', |
|
|
|
|
|
|
|
'-Werror=missing-include-dirs', |
|
|
|
|
|
|
|
'-Werror=missing-prototypes', |
|
|
|
|
|
|
|
'-Werror=pointer-arith', |
|
|
|
|
|
|
|
'-Werror=return-type', |
|
|
|
|
|
|
|
'-Wnested-externs', |
|
|
|
|
|
|
|
'-Wstrict-prototypes' |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
compiler_flags += cc.get_supported_arguments(test_cflags) |
|
|
|
|
|
|
|
endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
add_project_arguments(common_flags + compiler_flags, language: 'c') |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
glib_req_version = '>= 2.46.0' |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gio_dep = dependency('gio-2.0', version: glib_req_version) |
|
|
|
|
|
|
|
glib_dep = dependency('glib-2.0', version: glib_req_version) |
|
|
|
|
|
|
|
gtk_dep = dependency('gtk+-3.0', version: '>= 3.18.0') |
|
|
|
|
|
|
|
xtrans_dep = dependency('xtrans') |
|
|
|
|
|
|
|
ice_dep = dependency('ice') |
|
|
|
|
|
|
|
sm_dep = dependency('sm') |
|
|
|
|
|
|
|
x11_dep = dependency('x11') |
|
|
|
|
|
|
|
+dbus_glib_dep = dependency('dbus-glib-1') |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
session_deps = [ |
|
|
|
|
|
|
|
gio_dep, |
|
|
|
|
|
|
|
glib_dep, |
|
|
|
|
|
|
|
dependency('gnome-desktop-3.0', version: '>= 3.18.0'), |
|
|
|
|
|
|
|
dependency('json-glib-1.0', version: '>= 0.10') |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
session_bin_deps = session_deps + [ |
|
|
|
|
|
|
|
xtrans_dep, |
|
|
|
|
|
|
|
ice_dep, |
|
|
|
|
|
|
|
sm_dep |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Check for session selector GTK+ UI |
|
|
|
|
|
|
|
enable_session_selector = get_option('session_selector') |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Check for session tracking backend |
|
|
|
|
|
|
|
session_tracking = 'null backend' |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
enable_systemd = get_option('systemd') |
|
|
|
|
|
|
|
enable_systemd_journal = get_option('systemd_journal') |
|
|
|
|
|
|
|
enable_consolekit = get_option('consolekit') |
|
|
|
|
|
|
|
if enable_systemd or enable_consolekit |
|
|
|
|
|
|
|
session_bin_deps += dependency('gio-unix-2.0', version: glib_req_version) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Check for systemd |
|
|
|
|
|
|
|
if enable_systemd |
|
|
|
|
|
|
|
libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false) |
|
|
|
|
|
|
|
session_bin_deps += libsystemd_dep |
|
|
|
-- |
|
|
|
-- |
|
|
|
2.14.2 |
|
|
|
2.17.0 |
|
|
|
|
|
|
|
|
|
|
|
|
guibuilder_pel7x64builder0
6 years ago