GNOME.org
 

gnome-session r4692 - in trunk: . gnome-session po tools

Author: lucasr
Date: Fri May 16 21:52:32 2008
New Revision: 4692
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4692&view=rev

Log:
2008-05-17  Lucas Rocha  <lucasr gnome org>

	Port gnome-session-save tool to new code base.

	* tools/gnome-session-save.c: tool source code.
	* configure.in, Makefile.am, tools/Makefile.am: add tools to build.
	* gnome-session/org.gnome.SessionManagement.xml,
	gnome-session/dbus.c (gsm_dbus_server_set_name): new SetName D-Bus
	method which should be used to set the name of current session.
	* gnome-session/session.[ch] (gsm_session_set_name): new GsmSession
	method for setting session name.


Added:
   trunk/tools/
   trunk/tools/Makefile.am
   trunk/tools/gnome-session-save.c
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/gnome-session/dbus.c
   trunk/gnome-session/org.gnome.SessionManagement.xml
   trunk/gnome-session/session.c
   trunk/gnome-session/session.h
   trunk/po/POTFILES.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri May 16 21:52:32 2008
@@ -2,6 +2,7 @@
 	egg			\
 	gnome-session		\
 	capplet			\
+	tools			\
 	compat			\
 	splash			\
 	po			\

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri May 16 21:52:32 2008
@@ -247,6 +247,7 @@
 AC_OUTPUT([
 Makefile
 compat/Makefile
+tools/Makefile
 capplet/Makefile
 gnome-session/Makefile
 egg/Makefile

Modified: trunk/gnome-session/dbus.c
==============================================================================
--- trunk/gnome-session/dbus.c	(original)
+++ trunk/gnome-session/dbus.c	Fri May 16 21:52:32 2008
@@ -153,6 +153,10 @@
 static gboolean gsm_dbus_server_shutdown (GsmDBusServer  *dbus,
 					  GError        **error);
 
+static gboolean gsm_dbus_server_set_name (GsmDBusServer  *dbus,
+                                          const char     *session_name,
+					  GError        **error);
+
 #include "dbus-glue.h"
 
 G_DEFINE_TYPE (GsmDBusServer, gsm_dbus_server, G_TYPE_OBJECT)
@@ -272,6 +276,24 @@
   return TRUE;
 }
 
+static gboolean
+gsm_dbus_server_set_name (GsmDBusServer  *dbus,
+                          const char     *session_name,
+			  GError        **error)
+{
+  if (gsm_session_get_phase (global_session) != GSM_SESSION_PHASE_RUNNING)
+    {
+      g_set_error (error, GSM_DBUS_ERROR,
+		   GSM_DBUS_ERROR_NOT_IN_RUNNING,
+		   "SetName interface is only available during the Running phase");
+      return FALSE;
+    }
+
+  gsm_session_set_name (global_session, session_name);
+
+  return TRUE;
+}
+
 static GsmDBusServer *global_dbus_server;
 
 void

Modified: trunk/gnome-session/org.gnome.SessionManagement.xml
==============================================================================
--- trunk/gnome-session/org.gnome.SessionManagement.xml	(original)
+++ trunk/gnome-session/org.gnome.SessionManagement.xml	Fri May 16 21:52:32 2008
@@ -15,6 +15,8 @@
       <arg name="fatal" type="b" direction="in"/>
     </method>
 
+    <!-- Running phase interfaces -->
+
     <method name="Shutdown">
     </method>
 
@@ -22,5 +24,9 @@
       <arg name="mode" type="i" direction="in"/>
     </method>
 
+    <method name="SetName">
+      <arg name="name" type="s" direction="in"/>
+    </method>
+
   </interface>
 </node>

Modified: trunk/gnome-session/session.c
==============================================================================
--- trunk/gnome-session/session.c	(original)
+++ trunk/gnome-session/session.c	Fri May 16 21:52:32 2008
@@ -66,6 +66,8 @@
 					gpointer   data);
 
 struct _GsmSession {
+  char *name;
+
   /* Startup/resumed apps */
   GSList *apps;
   GHashTable *apps_by_name;
@@ -118,6 +120,8 @@
   char **autostart_dirs;
   int i;
 
+  session->name = NULL;
+
   session->clients = NULL;
   session->condition_clients = NULL;
 
@@ -149,6 +153,22 @@
   return session;
 }
 
+/**
+ * gsm_session_set_name:
+ * @session: session instance 
+ * @name: name of the session 
+ *
+ * Sets the name of a running session.
+ **/
+void
+gsm_session_set_name (GsmSession *session, const char *name)
+{
+  if (session->name)
+    g_free (session->name);
+
+  session->name = g_strdup (name);
+}
+
 static void
 append_app (GsmSession *session, GsmApp *app)
 {

Modified: trunk/gnome-session/session.h
==============================================================================
--- trunk/gnome-session/session.h	(original)
+++ trunk/gnome-session/session.h	Fri May 16 21:52:32 2008
@@ -67,6 +67,9 @@
 
 GsmSession      *gsm_session_new               (gboolean    failsafe);
 
+void             gsm_session_set_name          (GsmSession *session,
+                                                const char *name);
+
 void             gsm_session_start             (GsmSession *session);
 
 GsmSessionPhase  gsm_session_get_phase         (GsmSession *session);

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Fri May 16 21:52:32 2008
@@ -15,6 +15,7 @@
 capplet/main.c
 capplet/ui.c
 capplet/commands.c
+tools/gnome-session-save.c
 splash/gnome-login-sound.c
 splash/gnome-session-splash.c
 

Added: trunk/tools/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/tools/Makefile.am	Fri May 16 21:52:32 2008
@@ -0,0 +1,17 @@
+bin_PROGRAMS = gnome-session-save
+
+INCLUDES =					\
+	$(WARN_CFLAGS)				\
+	$(GNOME_SESSION_CFLAGS)			\
+	$(DBUS_GLIB_CFLAGS)			\
+	$(GCONF_FLAGS)				\
+	-DLOCALE_DIR=\""$(datadir)/locale"\"
+
+gnome_session_save_LDADD =			\
+	-lSM -lICE				\
+	$(GNOME_SESSION_LIBS)			\
+	$(DBUS_GLIB_LIBS)			\
+	$(GCONF_LIBS)
+
+gnome_session_save_SOURCES =			\
+	gnome-session-save.c

Added: trunk/tools/gnome-session-save.c
==============================================================================
--- (empty file)
+++ trunk/tools/gnome-session-save.c	Fri May 16 21:52:32 2008
@@ -0,0 +1,283 @@
+/* save-session.c - Small program to talk to session manager.
+
+   Copyright (C) 1998 Tom Tromey
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, 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, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <string.h>
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#include <libgnomeui/gnome-client.h>
+#include <libgnomeui/gnome-ui-init.h>
+
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
+
+#include <X11/SM/SMlib.h>
+
+#define GSM_SERVICE_DBUS   "org.gnome.SessionManager"
+#define GSM_PATH_DBUS      "/org/gnome/SessionManager"
+#define GSM_INTERFACE_DBUS "org.gnome.SessionManager"
+
+/* True if killing.  */
+static gboolean zap = FALSE;
+
+/* True if we should use dialog boxes */
+static gboolean gui = FALSE; 
+
+/* True if we should do the requested action without confirmation */
+static gboolean silent = FALSE; 
+
+static char *session_name = NULL;
+
+static IceConn ice_conn = NULL;
+
+static const GOptionEntry options[] = {
+  {"session-name", 's', 0, G_OPTION_ARG_STRING, &session_name, N_("Set the current session name"), N_("NAME")},
+  {"kill", '\0', 0, G_OPTION_ARG_NONE, &zap, N_("Kill session"), NULL},
+  {"gui",  '\0', 0, G_OPTION_ARG_NONE, &gui, N_("Use dialog boxes for errors"), NULL},
+  {"silent", '\0', 0, G_OPTION_ARG_NONE, &silent, N_("Do not require confirmation"), NULL},
+  {NULL}
+};
+
+static int exit_status = 0;
+
+static void
+ping_reply (IceConn ice_conn, IcePointer clientData)
+{
+  gtk_main_quit ();
+}
+
+static void
+ice_ping (void)
+{
+  /* We can't exit immediately, because the trash mode above
+   * might be discarded. So we do the equivalent of an XSync.
+   */
+  if (ice_conn)
+    IcePing (ice_conn, ping_reply, NULL);
+  else
+    g_warning ("save complete, but we don't have an ice connection.");
+}
+
+static void
+save_complete (GnomeClient* client, gpointer data)
+{
+  /* We could expose more of the arguments to the user if we wanted
+     to.  Some of them aren't particularly useful.  Interestingly,
+     there is no way to request a shutdown without a save.  */
+  gnome_client_request_save (client, GNOME_SAVE_BOTH, zap,
+			     silent ? GNOME_INTERACT_NONE : GNOME_INTERACT_ANY,
+			     0, 1);
+
+  ice_ping ();
+}
+
+static void
+die_cb (GnomeClient *client, gpointer data)
+{
+  ice_ping ();
+}
+
+static void
+cancelled_cb (GnomeClient *client, gpointer data)
+{
+  ice_ping ();
+}
+
+static void
+display_error (const char *message)
+{
+  if (gui && !silent) 
+    {
+      GtkWidget *dialog;
+      
+      dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR,
+				       GTK_BUTTONS_OK, message);
+
+      gtk_dialog_run (GTK_DIALOG (dialog));
+      gtk_widget_destroy (dialog);
+    } 
+  else
+    {
+      g_printerr ("%s\n", message);
+    }
+}
+
+
+/*
+ * we do this so we can pick up our IceConnection to do a ping on
+ */
+static void
+ice_connection_watch (IceConn connection, IcePointer client_data,
+		      Bool opening, IcePointer *watch_data)
+{
+  if (opening)
+    {
+      if (!ice_conn)
+	ice_conn = connection;
+      else
+	g_message ("Second ICE connection opened: ignoring.");
+    }
+  else
+    {
+      if (ice_conn == connection)
+	  ice_conn = NULL;
+      else
+	g_message ("Second ICE connection closed: ignoring.");
+    }
+}
+
+static DBusGProxy *
+get_bus_proxy (DBusGConnection *connection)
+{
+  DBusGProxy *bus_proxy;
+
+  bus_proxy = dbus_g_proxy_new_for_name (connection,
+                                         GSM_SERVICE_DBUS,
+                                         GSM_PATH_DBUS,
+                                         GSM_INTERFACE_DBUS);
+
+  return bus_proxy;
+}
+
+static DBusGConnection *
+get_session_bus (void)
+{
+  DBusGConnection *bus;
+  GError *error = NULL;
+
+  bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+
+  if (bus == NULL) 
+    {
+      g_warning ("Couldn't connect to session bus: %s", error->message);
+      g_error_free (error);
+    }
+
+  return bus;
+}
+
+static void
+set_session_name (GnomeClient *client,
+                  const char  *session_name)
+{
+  DBusGConnection *bus;
+  DBusGProxy *bus_proxy = NULL;
+  GError *error = NULL;
+  gboolean res;
+
+  bus = get_session_bus ();
+
+  if (bus == NULL) 
+    {
+      display_error (_("Could not connect to the session manager"));
+      goto out;
+    }
+
+  bus_proxy = get_bus_proxy (bus);
+  dbus_g_connection_unref (bus);
+
+  if (bus_proxy == NULL) 
+    {
+      display_error (_("Could not connect to the session manager"));
+      goto out;
+    }
+
+  res = dbus_g_proxy_call (bus_proxy,
+                           "SetName",
+                           &error,
+                           G_TYPE_STRING, session_name,
+                           G_TYPE_INVALID, G_TYPE_INVALID);
+
+  if (!res) 
+    {
+      if (error) 
+        {
+          g_warning ("Failed to set session name '%s': %s", 
+                     session_name, error->message);
+          g_error_free (error);
+        } 
+      else 
+        {
+          g_warning ("Failed to set session name '%s'", 
+                     session_name);
+        }
+
+      goto out;
+    }
+
+out:
+  if (bus_proxy)
+    g_object_unref (bus_proxy);
+}
+
+int
+main (int argc, char *argv[])
+{
+  GnomeClient *client;
+  GOptionContext *goption_context;
+
+  /* Initialize the i18n stuff */
+  bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  textdomain (GETTEXT_PACKAGE);
+
+  IceAddConnectionWatch (ice_connection_watch, NULL);
+
+  goption_context = g_option_context_new (N_(" - Save the current session"));
+  g_option_context_set_translation_domain (goption_context, GETTEXT_PACKAGE);
+  g_option_context_add_main_entries (goption_context, options, GETTEXT_PACKAGE);
+
+  gnome_program_init ("gnome-session-save", VERSION, 
+                      LIBGNOMEUI_MODULE, argc, argv,
+		      GNOME_PARAM_GOPTION_CONTEXT, goption_context,
+		      NULL);
+
+  gtk_window_set_default_icon_name (GTK_STOCK_SAVE);
+
+  client = gnome_master_client ();
+
+  if (!GNOME_CLIENT_CONNECTED (client))
+    {
+      display_error (_("Could not connect to the session manager"));
+      return 1;
+    }
+	
+  gnome_client_set_restart_style (client, GNOME_RESTART_NEVER);
+
+  if (session_name)
+    set_session_name (client, session_name);
+
+  /* Wait until our request is acknowledged:
+   * gnome-session queues requests but does not honour them if the
+   * requesting client is dead when the save starts. */
+  g_signal_connect (client, "save_complete",
+		    G_CALLBACK (save_complete), GINT_TO_POINTER (1));
+  g_signal_connect (client, "die",
+		    G_CALLBACK (die_cb), GINT_TO_POINTER (2));
+  g_signal_connect (client, "shutdown_cancelled",
+		    G_CALLBACK (cancelled_cb), GINT_TO_POINTER (3));
+
+  gtk_main ();
+
+  return exit_status;
+}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]