From 9b75d5137aea0a54d8e04f55e31d63e5fa250fc8 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Fri, 20 Dec 2013 11:28:53 -0500
Subject: [PATCH 11/19] Tie session selector to properties dialog
---
capplet/gsm-properties-dialog.c | 30 +++++-
configure.ac | 3 +-
data/session-selector.ui | 2 +-
tools/Makefile.am | 1 +
tools/gnome-session-selector.c | 211 ++++++++++++++++++++++++++++++++--------
5 files changed, 200 insertions(+), 47 deletions(-)
diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
index d2be778b..51fa5106 100644
--- a/capplet/gsm-properties-dialog.c
+++ b/capplet/gsm-properties-dialog.c
@@ -471,88 +471,114 @@ session_saved_message (GsmPropertiesDialog *dialog,
{
GtkLabel *label;
gchar *markup;
label = GTK_LABEL (gtk_builder_get_object (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME));
if (is_error)
markup = g_markup_printf_escaped ("<span foreground=\"red\">%s</span>", msg);
else
markup = g_markup_escape_text (msg, -1);
gtk_label_set_markup (label, markup);
g_free (markup);
}
static void
session_saved_cb (DBusGProxy *proxy,
DBusGProxyCall *call_id,
void *user_data)
{
gboolean res;
GsmPropertiesDialog *dialog = user_data;
res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID);
if (res)
session_saved_message (dialog, _("Your session has been saved."), FALSE);
else
session_saved_message (dialog, _("Failed to save session"), TRUE);
g_object_unref (proxy);
}
static void
-on_save_session_clicked (GtkWidget *widget,
- GsmPropertiesDialog *dialog)
+save_session_directly (GsmPropertiesDialog *dialog)
{
DBusGConnection *conn;
DBusGProxy *proxy;
DBusGProxyCall *call;
conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
if (conn == NULL) {
session_saved_message (dialog, _("Could not connect to the session bus"), TRUE);
return;
}
proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS);
if (proxy == NULL) {
session_saved_message (dialog, _("Could not connect to the session manager"), TRUE);
return;
}
call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID);
if (call == NULL) {
session_saved_message (dialog, _("Failed to save session"), TRUE);
g_object_unref (proxy);
return;
}
}
static void
+save_session_from_selector (GsmPropertiesDialog *dialog,
+ const char *program_path)
+{
+ char *command_line = g_strdup_printf ("%s --action save", program_path);
+
+ g_spawn_command_line_sync (command_line, NULL, NULL, NULL, NULL);
+
+ g_free (command_line);
+}
+
+static void
+on_save_session_clicked (GtkWidget *widget,
+ GsmPropertiesDialog *dialog)
+{
+ char *program_path;
+
+ program_path = g_find_program_in_path ("gnome-session-selector");
+
+ if (program_path != NULL) {
+ save_session_from_selector (dialog, program_path);
+ g_free (program_path);
+ } else {
+ save_session_directly (dialog);
+ }
+}
+
+static void
setup_dialog (GsmPropertiesDialog *dialog)
{
GtkTreeView *treeview;
GtkWidget *button;
GtkTreeModel *tree_filter;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
GtkTreeSelection *selection;
GtkTargetList *targetlist;
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL);
dialog->priv->list_store = gtk_list_store_new (NUMBER_OF_COLUMNS,
G_TYPE_BOOLEAN,
G_TYPE_BOOLEAN,
G_TYPE_ICON,
G_TYPE_STRING,
G_TYPE_OBJECT,
G_TYPE_STRING);
tree_filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (dialog->priv->list_store),
NULL);
g_object_unref (dialog->priv->list_store);
dialog->priv->tree_filter = tree_filter;
gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (tree_filter),
STORE_COL_VISIBLE);
treeview = GTK_TREE_VIEW (gtk_builder_get_object (dialog->priv->xml,
diff --git a/configure.ac b/configure.ac
index 04a25fc8..ccbbf970 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,91 +21,90 @@ LT_PREREQ([2.2.6])
LT_INIT([dlopen disable-static])
GNOME_MAINTAINER_MODE_DEFINES
GNOME_COMPILE_WARNINGS([maximum])
AC_ARG_ENABLE(deprecation_flags,
[AS_HELP_STRING([--enable-deprecation-flags],
[use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],,
[enable_deprecation_flags=no])
if test "x$enable_deprecation_flags" = "xyes"; then
DISABLE_DEPRECATED_CFLAGS=$DISABLE_DEPRECATED
AC_SUBST([DISABLE_DEPRECATED_CFLAGS])
fi
GLIB_REQUIRED=2.46.0
GTK3_REQUIRED=3.18.0
DBUS_GLIB_REQUIRED=0.76
UPOWER_REQUIRED=0.9.0
JSON_GLIB_REQUIRED=0.10
GNOME_DESKTOP_REQUIRED=3.18.0
AC_ARG_ENABLE(session-selector, AS_HELP_STRING([--enable-session-selector],
[enable building a custom session selector dialog]),
enable_session_selector=$enableval,enable_session_selector=no)
AM_CONDITIONAL(BUILD_SESSION_SELECTOR,
[test "$enable_session_selector" = yes])
if test "$enable_session_selector" = yes; then
- PKG_CHECK_MODULES(SESSION_SELECTOR, gtk+-3.0 gio-2.0)
+ PKG_CHECK_MODULES(SESSION_SELECTOR, gtk+-3.0 gio-2.0 dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
fi
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
dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383
PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
AS_IF([test x$have_old_upower = xyes], [
AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower])
])
AM_CONDITIONAL(HAVE_OLD_UPOWER, test x$have_old_upower = xyes)
PKG_CHECK_MODULES(SESSION_PROPERTIES,
glib-2.0 >= $GLIB_REQUIRED
gtk+-3.0 >= $GTK3_REQUIRED
- dbus-glib-1 >= $DBUS_GLIB_REQUIRED
)
PKG_CHECK_MODULES(X11, x11)
PKG_CHECK_MODULES(SM, sm)
PKG_CHECK_MODULES(ICE, ice)
PKG_CHECK_MODULES(XEXT, xext xau)
PKG_CHECK_MODULES(GL_TEST, xcomposite gl glib-2.0 epoxy)
PKG_CHECK_MODULES(GLES_TEST, egl glesv2)
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])
PKG_CHECK_MODULES(GCONF, gconf-2.0, [have_gconf=yes], [have_gconf=no])
if test x$enable_gconf = xauto ; then
enable_gconf=$have_gconf
elif 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$enable_gconf = xyes ; then
AC_DEFINE([HAVE_GCONF], [1], [Define if we support gconf-based autostart])
fi
diff --git a/data/session-selector.ui b/data/session-selector.ui
index 1c55712d..1534a746 100644
--- a/data/session-selector.ui
+++ b/data/session-selector.ui
@@ -20,61 +20,61 @@
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="label_xalign">0.5</property>
<property name="shadow_type">out</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="border_width">12</property>
<child>
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkInfoBar" id="info-bar">
<property name="visible">True</property>
<property name="message-type">other</property>
<child internal-child="content_area">
<object class="GtkHBox" id="info-bar-content_area">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">0</property>
<child>
<object class="GtkLabel" id="info-label">
<property name="visible">True</property>
<property name="xalign">0.0</property>
<property name="yalign">0.5</property>
- <property name="label" translatable="yes">Please select a custom session to run</property>
+ <property name="label" translatable="yes">Please select a custom session to use</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d3b8bf3f..d6784d1b 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -68,37 +68,38 @@ gnome_session_check_accelerated_gl_helper_CPPFLAGS = \
gnome_session_check_accelerated_gl_helper_LDADD = \
$(GL_TEST_LIBS) \
$(X11_LIBS)
gnome_session_check_accelerated_SOURCES = \
gnome-session-check-accelerated-common.h \
gnome-session-check-accelerated.c
gnome_session_check_accelerated_CPPFLAGS = \
-DLIBEXECDIR=\""$(libexecdir)"\" \
$(AM_CPPFLAGS) \
$(GTK3_CFLAGS) \
$(GL_TEST_CFLAGS)
gnome_session_check_accelerated_LDADD = \
$(GTK3_LIBS) \
$(X11_LIBS) \
$(GL_TEST_LIBS)
if BUILD_SESSION_SELECTOR
gnome_session_selector_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(GNOME_SESSION_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
-DGTKBUILDER_DIR=\""$(pkgdatadir)"\" \
-DLOCALE_DIR=\""$(datadir)/locale"\" \
$(DISABLE_DEPRECATED_CFLAGS)
gnome_session_selector_LDADD = \
+ $(DBUS_GLIB_CFLAGS) \
$(SESSION_SELECTOR_LIBS)
gnome_session_selector_SOURCES = \
gnome-session-selector.c
endif
-include $(top_srcdir)/git.mk
diff --git a/tools/gnome-session-selector.c b/tools/gnome-session-selector.c
index d7584ffb..8f37eca4 100644
--- a/tools/gnome-session-selector.c
+++ b/tools/gnome-session-selector.c
@@ -7,126 +7,133 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Written by: Matthias Clasen <mclasen@redhat.com>
*/
#include "config.h"
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <glib.h>
#include <gtk/gtk.h>
#include <gio/gio.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
+
+#define GSM_SERVICE_DBUS "org.gnome.SessionManager"
+#define GSM_PATH_DBUS "/org/gnome/SessionManager"
+#define GSM_INTERFACE_DBUS "org.gnome.SessionManager"
+
#define GSM_MANAGER_SCHEMA "org.gnome.SessionManager"
#define KEY_AUTOSAVE_ONE_SHOT "auto-save-session-one-shot"
static GtkBuilder *builder;
static GtkWidget *session_list;
static GtkListStore *store;
static GtkTreeModelSort *sort_model;
+static char *info_text;
static void select_session (const char *name);
+static gboolean make_session_current (const char *name);
static char *
get_session_path (const char *name)
{
return g_build_filename (g_get_user_config_dir (), "gnome-session", name, NULL);
}
static char *
find_new_session_name (void)
{
char *name;
char *path;
int i;
for (i = 1; i < 20; i++) {
name = g_strdup_printf (_("Session %d"), i);
path = get_session_path (name);
if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
g_free (path);
return name;
}
g_free (path);
g_free (name);
}
return NULL;
}
static gboolean
is_valid_session_name (const char *name)
{
GtkTreeIter iter;
char *n;
- const char *info_text;
char *warning_text;
gboolean user_tried_dot;
gboolean user_tried_slash;
GtkWidget *info_bar;
GtkWidget *label;
if (name[0] == 0) {
return FALSE;
}
if (name[0] == '.') {
user_tried_dot = TRUE;
} else {
user_tried_dot = FALSE;
}
if (strchr (name, '/') != NULL) {
user_tried_slash = TRUE;
} else {
user_tried_slash = FALSE;
}
- info_text = _("Please select a custom session to run");
warning_text = NULL;
if (user_tried_dot && user_tried_slash) {
warning_text = g_strdup_printf ("%s\n<small><b>Note:</b> <i>%s</i></small>",
info_text,
_("Session names are not allowed to start with ‘.’ or contain ‘/’ characters"));
} else if (user_tried_dot) {
warning_text = g_strdup_printf ("%s\n<small><b>Note:</b> <i>%s</i></small>",
info_text,
_("Session names are not allowed to start with ‘.’"));
} else if (user_tried_slash) {
warning_text = g_strdup_printf ("%s\n<small><b>Note:</b> <i>%s</i></small>",
info_text,
_("Session names are not allowed to contain ‘/’ characters"));
}
gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter);
do {
gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, 0, &n, -1);
if (strcmp (n, name) == 0) {
char *message;
message = g_strdup_printf (_("A session named ‘%s’ already exists"), name);
warning_text = g_strdup_printf ("%s\n<small><b>Note:</b> <i>%s</i></small>", info_text, message);
g_free (message);
g_free (n);
break;
}
g_free (n);
} while (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter));
info_bar = (GtkWidget *) gtk_builder_get_object (builder, "info-bar");
@@ -182,517 +189,637 @@ populate_session_list (GtkWidget *session_list)
default_name = NULL;
if (readlink (saved_session, last_session, PATH_MAX - 1) > 0) {
default_name = g_path_get_basename (last_session);
}
while ((name = g_dir_read_name (dir)) != NULL) {
if (strcmp (name, "saved-session") == 0)
continue;
gtk_list_store_insert_with_values (store, &iter, 100, 0, name, -1);
if (g_strcmp0 (default_name, name) == 0) {
GtkTreeSelection *selection;
GtkTreeIter child_iter;
gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &child_iter, &iter);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (session_list));
gtk_tree_selection_select_iter (selection, &child_iter);
}
}
g_free (default_name);
g_dir_close (dir);
out:
g_free (saved_session);
g_free (path);
}
static char *
+get_last_session (void)
+{
+ char *saved_session;
+ char last_session[PATH_MAX] = "";
+ char *name = NULL;
+
+ saved_session = get_session_path ("saved-session");
+
+ if (readlink (saved_session, last_session, PATH_MAX - 1) > 0) {
+ name = g_path_get_basename (last_session);
+ }
+
+ g_free (saved_session);
+
+ return name;
+}
+
+static char *
get_selected_session (void)
{
GtkTreeSelection *selection;
GtkTreeModel *model;
GtkTreeIter iter;
gchar *name;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (session_list));
if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
gtk_tree_model_get (model, &iter, 0, &name, -1);
return name;
}
return NULL;
}
static void
remove_session (const char *name)
{
char *path1, *path2;
char *n, *path;
const char *d;
GDir *dir;
GError *error;
path1 = get_session_path ("saved-session");
path2 = get_session_path (name);
error = NULL;
n = g_file_read_link (path1, &error);
if (n == NULL) {
g_warning ("Failed to read link: %s", error->message);
g_error_free (error);
}
else if (strcmp (n, name) == 0) {
unlink (path1);
}
g_free (n);
dir = g_dir_open (path2, 0, NULL);
while ((d = g_dir_read_name (dir)) != NULL) {
path = g_build_filename (path2, d, NULL);
unlink (path);
g_free (path);
}
g_dir_close (dir);
remove (path2);
g_free (path1);
g_free (path2);
}
+static gboolean
+make_session_current (const char *name)
+{
+ char *path1;
+ gboolean ret = TRUE;
+
+ path1 = g_build_filename (g_get_user_config_dir (), "gnome-session", "saved-session", NULL);
+
+ unlink (path1);
+ if (symlink (name, path1) < 0) {
+ g_warning ("Failed to make session '%s' current", name);
+ ret = FALSE;
+ }
+
+ g_free (path1);
+
+ return ret;
+}
+
static void
on_remove_session_clicked (GtkButton *button,
gpointer data)
{
GtkTreeSelection *selection;
GtkTreeModel *model;
GtkTreeIter iter;
char *name;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (session_list));
if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
GtkTreeIter child_iter;
gtk_tree_model_get (model, &iter, 0, &name, -1);
remove_session (name);
g_free (name);
gtk_tree_model_sort_convert_iter_to_child_iter (GTK_TREE_MODEL_SORT (model), &child_iter, &iter);
gtk_list_store_remove (GTK_LIST_STORE (store), &child_iter);
if (!gtk_tree_selection_get_selected (selection, NULL, NULL)) {
gtk_tree_model_get_iter_first (model, &iter);
gtk_tree_model_get (model, &iter, 0, &name, -1);
select_session (name);
+ make_session_current (name);
g_free (name);
}
}
}
static void
begin_rename (void)
{
GtkTreePath *path;
GtkTreeViewColumn *column;
GList *cells;
gtk_widget_grab_focus (session_list);
gtk_tree_view_get_cursor (GTK_TREE_VIEW (session_list),
&path, &column);
cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column));
if (cells != NULL) {
GtkCellRenderer *cell;
cell = (GtkCellRenderer *) cells->data;
g_list_free (cells);
g_object_set (cell, "editable", TRUE, NULL);
gtk_tree_view_set_cursor_on_cell (GTK_TREE_VIEW (session_list), path,
column, cell, TRUE);
}
gtk_tree_path_free (path);
}
static void
on_rename_session_clicked (GtkButton *button,
gpointer data)
{
begin_rename ();
}
static void
on_continue_clicked (GtkButton *button,
gpointer data)
{
char *name;
name = get_selected_session ();
g_free (name);
gtk_main_quit ();
}
static void
create_session (const char *name)
{
char *path;
GtkTreeIter iter;
path = get_session_path (name);
- if (mkdir (path, 0755) < 0) {
+ if (g_mkdir_with_parents (path, 0755) < 0) {
g_warning ("Failed to create directory %s", path);
}
else {
char *marker;
gtk_list_store_insert_with_values (store, &iter, 100, 0, name, -1);
marker = g_build_filename (path, ".new-session", NULL);
creat (marker, 0600);
g_free (marker);
}
g_free (path);
}
static gboolean
rename_session (const char *old_name,
const char *new_name)
{
char *old_path, *new_path;
int result;
if (g_strcmp0 (old_name, new_name) == 0) {
return TRUE;
}
if (!is_valid_session_name (new_name)) {
return FALSE;
}
old_path = get_session_path (old_name);
new_path = get_session_path (new_name);
result = g_rename (old_path, new_path);
if (result < 0) {
g_warning ("Failed to rename session from '%s' to '%s': %m", old_name, new_name);
+ } else {
+ char *last_session;
+ last_session = get_last_session ();
+ if (g_strcmp0 (old_name, last_session) == 0) {
+ make_session_current (new_name);
+ }
+ g_free (last_session);
}
g_free (old_path);
g_free (new_path);
-
return result == 0;
}
static gboolean
-make_session_current (const char *name)
-{
- char *path1;
- gboolean ret = TRUE;
-
- path1 = g_build_filename (g_get_user_config_dir (), "gnome-session", "saved-session", NULL);
-
- unlink (path1);
- if (symlink (name, path1) < 0) {
- g_warning ("Failed to make session '%s' current", name);
- ret = FALSE;
- }
-
- g_free (path1);
-
- return ret;
-}
-
-static gboolean
create_and_select_session (const char *name)
{
gchar *path;
if (name[0] == 0 || name[0] == '.' || strchr (name, '/')) {
g_warning ("Invalid session name");
return FALSE;
}
path = g_build_filename (g_get_user_config_dir (), "gnome-session", name, NULL);
if (!g_file_test (path, G_FILE_TEST_IS_DIR)) {
- if (mkdir (path, 0755) < 0) {
+ if (g_mkdir_with_parents (path, 0755) < 0) {
g_warning ("Failed to create directory %s", path);
g_free (path);
return FALSE;
}
}
g_free (path);
return make_session_current (name);
}
static void
select_session (const char *name)
{
GtkTreeIter iter;
char *n;
- make_session_current (name);
-
/* now select it in the list */
gtk_tree_model_get_iter_first (GTK_TREE_MODEL (sort_model), &iter);
do {
gtk_tree_model_get (GTK_TREE_MODEL (sort_model), &iter, 0, &n, -1);
if (strcmp (n, name) == 0) {
GtkTreePath *path;
path = gtk_tree_model_get_path (GTK_TREE_MODEL (sort_model), &iter);
gtk_tree_view_set_cursor (GTK_TREE_VIEW (session_list), path, NULL, FALSE);
gtk_tree_path_free (path);
g_free (n);
break;
}
g_free (n);
} while (gtk_tree_model_iter_next (GTK_TREE_MODEL (sort_model), &iter));
}
static void
-on_new_session_clicked (GtkButton *button,
- gpointer data)
+create_session_and_begin_rename (void)
{
gchar *name;
name = find_new_session_name ();
create_session (name);
select_session (name);
begin_rename ();
}
static void
+on_new_session_clicked (GtkButton *button,
+ gpointer data)
+{
+ create_session_and_begin_rename ();
+}
+
+static void
on_selection_changed (GtkTreeSelection *selection,
gpointer data)
{
char *name;
name = get_selected_session ();
if (name == NULL) {
return;
}
- make_session_current (name);
-
g_free (name);
}
static void
update_remove_button (void)
{
GtkWidget *button;
button = (GtkWidget *)gtk_builder_get_object (builder, "remove-session");
if (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) > 1) {
gtk_widget_set_sensitive (button, TRUE);
} else {
gtk_widget_set_sensitive (button, FALSE);
}
}
static void
on_row_edited (GtkCellRendererText *cell,
const char *path_string,
const char *new_name,
gpointer data)
{
GtkTreePath *path;
GtkTreeIter sort_iter, items_iter;
char *old_name;
gboolean was_renamed;
path = gtk_tree_path_new_from_string (path_string);
gtk_tree_model_get_iter (GTK_TREE_MODEL (sort_model), &sort_iter, path);
gtk_tree_model_get (GTK_TREE_MODEL (sort_model), &sort_iter, 0, &old_name, -1);
was_renamed = rename_session (old_name, new_name);
if (was_renamed) {
gtk_tree_model_sort_convert_iter_to_child_iter (sort_model, &items_iter, &sort_iter);
gtk_list_store_set (store, &items_iter, 0, g_strdup (new_name), -1);
g_free (old_name);
- make_session_current (new_name);
} else {
begin_rename ();
}
gtk_tree_path_free (path);
g_object_set (cell, "editable", FALSE, NULL);
}
static void
on_row_deleted (GtkTreeModel *model,
GtkTreePath *path,
gpointer data)
{
update_remove_button ();
}
static void
on_row_inserted (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data)
{
update_remove_button ();
}
static void
on_row_activated (GtkTreeView *tree_view,
GtkTreePath *path,
GtkTreeViewColumn *column,
gpointer data)
{
- char *name;
-
- name = get_selected_session ();
- g_free (name);
-
gtk_main_quit ();
}
static void
auto_save_next_session (void)
{
GSettings *settings;
settings = g_settings_new (GSM_MANAGER_SCHEMA);
g_settings_set_boolean (settings, KEY_AUTOSAVE_ONE_SHOT, TRUE);
g_object_unref (settings);
}
static void
auto_save_next_session_if_needed (void)
{
char *marker;
marker = g_build_filename (g_get_user_config_dir (),
"gnome-session", "saved-session",
".new-session", NULL);
if (g_file_test (marker, G_FILE_TEST_EXISTS)) {
auto_save_next_session ();
unlink (marker);
}
g_free (marker);
}
+static void
+save_session (void)
+{
+ DBusGConnection *conn;
+ DBusGProxy *proxy;
+ GError *error;
+
+ conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
+ if (conn == NULL) {
+ g_warning ("Could not connect to the session bus");
+ return;
+ }
+
+ proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS);
+ if (proxy == NULL) {
+ g_warning ("Could not connect to the session manager");
+ return;
+ }
+
+ error = NULL;
+ if (!dbus_g_proxy_call (proxy, "SaveSession", &error, G_TYPE_INVALID, G_TYPE_INVALID)) {
+ g_warning ("Failed to save session: %s", error->message);
+ g_error_free (error);
+ return;
+ }
+
+ g_object_unref (proxy);
+}
+
static int
compare_sessions (GtkTreeModel *model,
GtkTreeIter *a,
GtkTreeIter *b,
gpointer data)
{
char *name_a, *name_b;
int result;
gtk_tree_model_get (model, a, 0, &name_a, -1);
gtk_tree_model_get (model, b, 0, &name_b, -1);
result = g_utf8_collate (name_a, name_b);
g_free (name_a);
g_free (name_b);
return result;
}
static void
on_map (GtkWidget *widget,
gpointer data)
{
gdk_window_focus (gtk_widget_get_window (widget), GDK_CURRENT_TIME);
}
int
main (int argc, char *argv[])
{
GtkWidget *window;
GtkWidget *widget;
+ GtkWidget *label;
GtkCellRenderer *cell;
GtkTreeViewColumn *column;
GtkTreeSelection *selection;
GError *error;
+ char *selected_session;
+
+ static char *action = NULL;
+ static char **remaining_args = NULL;
+ static GOptionEntry entries[] = {
+ {"action", '\0', 0, G_OPTION_ARG_STRING, &action, N_("What to do with session selection (save|load|print)"), NULL},
+{ G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &remaining_args, N_("[session-name]"), NULL}
+ };
+
+ if (action == NULL) {
+ if (getenv ("SESSION_MANAGER") != NULL)
+ action = "print";
+ else
+ action = "load";
+ }
- if (getenv ("SESSION_MANAGER") != NULL)
+ if (getenv ("SESSION_MANAGER") != NULL && strcmp (action, "load") == 0) {
+ g_warning ("Cannot load new session when session currently loaded");
return 1;
+ }
+
+ if (getenv ("SESSION_MANAGER") == NULL && strcmp (action, "save") == 0) {
+ g_warning ("Can only save session when session loaded");
+ return 1;
+ }
+
+ if (strcmp (action, "load") != 0 && strcmp (action, "save") != 0 && strcmp (action, "print") != 0) {
+ g_warning ("'%s' is not a supported action. Supported actions are load, save, and print.\n", action);
+ return 1;
+ }
- gtk_init (&argc, &argv);
- if (argc > 1) {
- g_print ("create and select session\n");
- if (!create_and_select_session (argv[1]))
+ error = NULL;
+ gtk_init_with_args (&argc, &argv,
+ NULL, entries, GETTEXT_PACKAGE, &error);
+
+ if (remaining_args != NULL) {
+ if (g_strv_length (remaining_args) > 1) {
+ g_warning ("gnome-session-selector takes at most one session argument");
+ return 1;
+ }
+
+ if (!create_and_select_session (remaining_args[0]))
return 1;
else
return 0;
}
builder = gtk_builder_new ();
gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
error = NULL;
if (!gtk_builder_add_from_file (builder, GTKBUILDER_DIR "/" "session-selector.ui", &error)) {
g_warning ("Could not load file 'session-selector.ui': %s", error->message);
exit (1);
}
window = (GtkWidget *) gtk_builder_get_object (builder, "main-window");
store = (GtkListStore *) gtk_builder_get_object (builder, "session-store");
sort_model = (GtkTreeModelSort *) gtk_builder_get_object (builder, "sort-model");
gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sort_model),
0, compare_sessions, NULL, NULL);
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model),
0, GTK_SORT_ASCENDING);
g_signal_connect (store, "row-deleted", G_CALLBACK (on_row_deleted), NULL);
g_signal_connect (store, "row-inserted", G_CALLBACK (on_row_inserted), NULL);
session_list = (GtkWidget *) gtk_builder_get_object (builder, "session-list");
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (session_list));
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
populate_session_list (session_list);
cell = gtk_cell_renderer_text_new ();
g_signal_connect (cell, "edited", G_CALLBACK (on_row_edited), NULL);
column = gtk_tree_view_column_new_with_attributes ("", cell, "text", 0, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (session_list), GTK_TREE_VIEW_COLUMN (column));
g_signal_connect (session_list, "row-activated", G_CALLBACK (on_row_activated), NULL);
g_signal_connect (selection, "changed",
G_CALLBACK (on_selection_changed), NULL);
widget = (GtkWidget *) gtk_builder_get_object (builder, "new-session");
g_signal_connect (widget, "clicked", G_CALLBACK (on_new_session_clicked), NULL);
widget = (GtkWidget *) gtk_builder_get_object (builder, "remove-session");
g_signal_connect (widget, "clicked", G_CALLBACK (on_remove_session_clicked), NULL);
widget = (GtkWidget *) gtk_builder_get_object (builder, "rename-session");
g_signal_connect (widget, "clicked", G_CALLBACK (on_rename_session_clicked), NULL);
widget = (GtkWidget *) gtk_builder_get_object (builder, "continue-button");
g_signal_connect (widget, "clicked", G_CALLBACK (on_continue_clicked), NULL);
g_signal_connect (window, "map", G_CALLBACK (on_map), NULL);
gtk_widget_show (window);
+ if (g_strcmp0 (action, "load") == 0) {
+ info_text = _("Please select a custom session to run");
+ } else if (g_strcmp0 (action, "print") == 0) {
+ info_text = _("Please select a session to use");
+ } else if (g_strcmp0 (action, "save") == 0) {
+ info_text = _("Please select a session to save to");
+ }
+
+ label = (GtkWidget*) gtk_builder_get_object (builder, "info-label");
+ gtk_label_set_markup (GTK_LABEL (label), info_text);
+
+ selected_session = get_selected_session ();
+
+ if (selected_session == NULL) {
+ create_session_and_begin_rename ();
+ } else {
+ g_free (selected_session);
+ }
+
gtk_main ();
- auto_save_next_session_if_needed ();
+ selected_session = get_selected_session ();
+
+ if (g_strcmp0 (action, "load") == 0) {
+ make_session_current (selected_session);
+ auto_save_next_session_if_needed ();
+ } else if (g_strcmp0 (action, "save") == 0) {
+ char *last_session;
+
+ last_session = get_last_session ();
+ make_session_current (selected_session);
+ save_session ();
+ if (last_session != NULL)
+ make_session_current (last_session);
+ } else if (g_strcmp0 (action, "print") == 0) {
+ g_print ("%s\n", selected_session);
+ }
+ g_free (selected_session);
return 0;
}
--
2.12.0