GNOME.org
 

gnome-power-manager r3181 - in trunk: . src

Author: rhughes
Date: Tue Jan 27 12:26:08 2009
New Revision: 3181
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=3181&view=rev

Log:
2009-01-27  Richard Hughes  <richard hughsie com>

* src/Makefile.am:
* src/gpm-session.c: (gpm_session_logout), (gpm_session_get_idle),
(gpm_session_get_inhibited),
(gpm_session_presence_status_changed_cb), (gpm_session_is_idle),
(gpm_session_is_inhibited), (gpm_session_inhibit_changed_cb),
(gpm_session_class_init), (gpm_session_init),
(gpm_session_finalize), (gpm_session_new):
* src/gpm-session.h:
Add a new GObject to interface with gnome-session.


Added:
   trunk/src/gpm-session.c
   trunk/src/gpm-session.h
Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Jan 27 12:26:08 2009
@@ -103,6 +103,8 @@
 	gpm-dpms.c					\
 	gpm-idle.h					\
 	gpm-idle.c					\
+	gpm-session.h					\
+	gpm-session.c					\
 	gpm-load.h					\
 	gpm-load.c					\
 	gpm-prefs.h					\
@@ -188,6 +190,8 @@
 	gpm-common.c					\
 	gpm-screensaver.h				\
 	gpm-screensaver.c				\
+	gpm-session.h					\
+	gpm-session.c					\
 	gpm-networkmanager.h				\
 	gpm-networkmanager.c				\
 	gpm-stock-icons.h				\
@@ -263,6 +267,8 @@
 	gpm-phone.c					\
 	gpm-idle.h					\
 	gpm-idle.c					\
+	gpm-session.h					\
+	gpm-session.c					\
 	gpm-load.h					\
 	gpm-load.c					\
 	gpm-marshal.h					\

Added: trunk/src/gpm-session.c
==============================================================================
--- (empty file)
+++ trunk/src/gpm-session.c	Tue Jan 27 12:26:08 2009
@@ -0,0 +1,322 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2008 Richard Hughes <richard hughsie com>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * 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 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <dbus/dbus-glib.h>
+
+#include "gpm-session.h"
+#include "gpm-common.h"
+#include "egg-debug.h"
+#include "egg-dbus-proxy.h"
+
+static void     gpm_session_finalize   (GObject		*object);
+
+#define GPM_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_SESSION, GpmSessionPrivate))
+
+#define GPM_SESSION_MANAGER_SERVICE			"org.gnome.Session"
+#define GPM_SESSION_MANAGER_PATH			"/org/gnome/Session"
+#define GPM_SESSION_MANAGER_INTERFACE			"org.gnome.Session"
+#define GPM_SESSION_MANAGER_PRESENCE_PATH		"/org/gnome/Session/Presence"
+#define GPM_SESSION_MANAGER_PRESENCE_INTERFACE		"org.gnome.Session.Presence"
+#define GPM_DBUS_PROPERTIES_INTERFACE			"org.freedesktop.DBus.Properties"
+
+typedef enum {
+	GPM_SESSION_STATUS_ENUM_AVAILABLE = 0,
+	GPM_SESSION_STATUS_ENUM_INVISIBLE,
+	GPM_SESSION_STATUS_ENUM_BUSY,
+	GPM_SESSION_STATUS_ENUM_IDLE,
+	GPM_SESSION_STATUS_ENUM_UNKNOWN
+} GpmSessionStatusEnum;
+
+typedef enum {
+	GPM_SESSION_INHIBIT_MASK_LOGOUT = 1,
+	GPM_SESSION_INHIBIT_MASK_SWITCH = 2,
+	GPM_SESSION_INHIBIT_MASK_SUSPEND = 4,
+	GPM_SESSION_INHIBIT_MASK_IDLE = 8
+} GpmSessionInhibitMask;
+
+struct GpmSessionPrivate
+{
+	DBusGProxy		*proxy;
+	DBusGProxy		*proxy_presence;
+	DBusGProxy		*proxy_prop;
+	gboolean		 is_idle_old;
+	gboolean		 is_inhibited_old;
+};
+
+enum {
+	IDLE_CHANGED,
+	INHIBITED_CHANGED,
+	LAST_SIGNAL
+};
+
+static guint signals [LAST_SIGNAL] = { 0 };
+static gpointer gpm_session_object = NULL;
+
+G_DEFINE_TYPE (GpmSession, gpm_session, G_TYPE_OBJECT)
+
+/**
+ * gpm_session_logout:
+ **/
+gboolean
+gpm_session_logout (GpmSession *session)
+{
+	g_return_val_if_fail (GPM_IS_SESSION (session), FALSE);
+	/* we have to use no reply, as the SM calls into g-p-m to get the can_suspend property */
+	dbus_g_proxy_call_no_reply (session->priv->proxy, "Shutdown", G_TYPE_INVALID);
+	return TRUE;
+}
+
+/**
+ * gpm_session_get_idle:
+ **/
+gboolean
+gpm_session_get_idle (GpmSession *session)
+{
+	g_return_val_if_fail (GPM_IS_SESSION (session), FALSE);
+	return session->priv->is_idle_old;
+}
+
+/**
+ * gpm_session_get_inhibited:
+ **/
+gboolean
+gpm_session_get_inhibited (GpmSession *session)
+{
+	g_return_val_if_fail (GPM_IS_SESSION (session), FALSE);
+	return session->priv->is_inhibited_old;
+}
+
+/**
+ * gpm_session_presence_status_changed_cb:
+ **/
+static void
+gpm_session_presence_status_changed_cb (DBusGProxy *proxy, guint status, GpmSession *session)
+{
+	gboolean is_idle;
+	is_idle = (status == GPM_SESSION_STATUS_ENUM_IDLE);
+	if (is_idle != session->priv->is_idle_old) {
+		egg_debug ("emitting idle-changed : (%i)", is_idle);
+		g_signal_emit (session, signals [IDLE_CHANGED], 0, is_idle);
+		session->priv->is_idle_old = is_idle;
+	}
+}
+
+/**
+ * gpm_session_is_idle:
+ **/
+static gboolean
+gpm_session_is_idle (GpmSession *session)
+{
+	gboolean ret;
+	gboolean is_idle;
+	GError *error = NULL;
+	GValue *value;
+
+	/* find out if this change altered the inhibited state */
+	ret = dbus_g_proxy_call (session->priv->proxy_prop, "Get", &error,
+				 G_TYPE_STRING, GPM_SESSION_MANAGER_PRESENCE_INTERFACE,
+				 G_TYPE_STRING, "status",
+				 G_TYPE_INVALID,
+				 G_TYPE_VALUE, &value,
+				 G_TYPE_INVALID);
+	if (!ret) {
+		egg_warning ("failed to get idle status: %s", error->message);
+		g_error_free (error);
+		is_idle = FALSE;
+		goto out;
+	}
+	is_idle = (g_value_get_uint (value) == GPM_SESSION_STATUS_ENUM_IDLE);
+out:
+	return is_idle;
+}
+
+/**
+ * gpm_session_is_inhibited:
+ **/
+static gboolean
+gpm_session_is_inhibited (GpmSession *session)
+{
+	gboolean ret;
+	gboolean is_inhibited;
+	GError *error = NULL;
+
+	/* find out if this change altered the inhibited state */
+	ret = dbus_g_proxy_call (session->priv->proxy, "IsInhibited", &error,
+				 G_TYPE_UINT, GPM_SESSION_INHIBIT_MASK_IDLE,
+				 G_TYPE_INVALID,
+				 G_TYPE_BOOLEAN, &is_inhibited,
+				 G_TYPE_INVALID);
+	if (!ret) {
+		egg_warning ("failed to get inhibit status: %s", error->message);
+		g_error_free (error);
+		is_inhibited = FALSE;
+	}
+	return is_inhibited;
+}
+
+/**
+ * gpm_session_inhibit_changed_cb:
+ **/
+static void
+gpm_session_inhibit_changed_cb (DBusGProxy *proxy, const gchar *id, GpmSession *session)
+{
+	gboolean is_inhibited;
+
+	is_inhibited = gpm_session_is_inhibited (session);
+	if (is_inhibited != session->priv->is_inhibited_old) {
+		egg_debug ("emitting inhibited-changed : (%i)", is_inhibited);
+		g_signal_emit (session, signals [INHIBITED_CHANGED], 0, is_inhibited);
+		session->priv->is_inhibited_old = is_inhibited;
+	}
+}
+
+/**
+ * gpm_session_class_init:
+ * @klass: This class instance
+ **/
+static void
+gpm_session_class_init (GpmSessionClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	object_class->finalize = gpm_session_finalize;
+	g_type_class_add_private (klass, sizeof (GpmSessionPrivate));
+
+	signals [IDLE_CHANGED] =
+		g_signal_new ("idle-changed",
+			      G_TYPE_FROM_CLASS (object_class),
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (GpmSessionClass, idle_changed),
+			      NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN,
+			      G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+	signals [INHIBITED_CHANGED] =
+		g_signal_new ("inhibited-changed",
+			      G_TYPE_FROM_CLASS (object_class),
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (GpmSessionClass, inhibited_changed),
+			      NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN,
+			      G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+}
+
+/**
+ * gpm_session_init:
+ * @session: This class instance
+ **/
+static void
+gpm_session_init (GpmSession *session)
+{
+	DBusGConnection *connection;
+	GError *error = NULL;
+
+	session->priv = GPM_SESSION_GET_PRIVATE (session);
+	session->priv->is_idle_old = FALSE;
+	session->priv->is_inhibited_old = FALSE;
+
+	connection = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
+
+	/* get org.gnome.Session interface */
+	session->priv->proxy = dbus_g_proxy_new_for_name_owner (connection, GPM_SESSION_MANAGER_SERVICE,
+								GPM_SESSION_MANAGER_PATH,
+								GPM_SESSION_MANAGER_INTERFACE, &error);
+	if (session->priv->proxy == NULL) {
+		egg_warning ("DBUS error: %s", error->message);
+		g_error_free (error);
+		return;
+	}
+
+	/* get org.gnome.Session.Presence interface */
+	session->priv->proxy_presence = dbus_g_proxy_new_for_name_owner (connection, GPM_SESSION_MANAGER_SERVICE,
+									 GPM_SESSION_MANAGER_PRESENCE_PATH,
+									 GPM_SESSION_MANAGER_PRESENCE_INTERFACE, &error);
+	if (session->priv->proxy_presence == NULL) {
+		egg_warning ("DBUS error: %s", error->message);
+		g_error_free (error);
+		return;
+	}
+
+	/* get properties interface */
+	session->priv->proxy_prop = dbus_g_proxy_new_for_name_owner (connection, GPM_SESSION_MANAGER_SERVICE,
+								     GPM_SESSION_MANAGER_PRESENCE_PATH,
+								     GPM_DBUS_PROPERTIES_INTERFACE, &error);
+	if (session->priv->proxy_prop == NULL) {
+		egg_warning ("DBUS error: %s", error->message);
+		g_error_free (error);
+		return;
+	}
+
+	/* get StatusChanged */
+	dbus_g_proxy_add_signal (session->priv->proxy_presence, "StatusChanged", G_TYPE_INVALID);
+	dbus_g_proxy_connect_signal (session->priv->proxy_presence, "StatusChanged", G_CALLBACK (gpm_session_presence_status_changed_cb), session, NULL);
+
+	/* get InhibitorAdded */
+	dbus_g_proxy_add_signal (session->priv->proxy, "InhibitorAdded", G_TYPE_INVALID);
+	dbus_g_proxy_connect_signal (session->priv->proxy, "InhibitorAdded", G_CALLBACK (gpm_session_inhibit_changed_cb), session, NULL);
+
+	/* get InhibitorRemoved */
+	dbus_g_proxy_add_signal (session->priv->proxy, "InhibitorRemoved", G_TYPE_INVALID);
+	dbus_g_proxy_connect_signal (session->priv->proxy, "InhibitorRemoved", G_CALLBACK (gpm_session_inhibit_changed_cb), session, NULL);
+
+	/* coldplug */
+	session->priv->is_inhibited_old = gpm_session_is_inhibited (session);
+	session->priv->is_idle_old = gpm_session_is_idle (session);
+	egg_debug ("idle: %i, inhibited: %i", session->priv->is_idle_old, session->priv->is_inhibited_old);
+}
+
+/**
+ * gpm_session_finalize:
+ * @object: This class instance
+ **/
+static void
+gpm_session_finalize (GObject *object)
+{
+	GpmSession *session;
+	g_return_if_fail (object != NULL);
+	g_return_if_fail (GPM_IS_SESSION (object));
+
+	session = GPM_SESSION (object);
+	session->priv = GPM_SESSION_GET_PRIVATE (session);
+
+	g_object_unref (session->priv->proxy);
+	g_object_unref (session->priv->proxy_presence);
+	g_object_unref (session->priv->proxy_prop);
+
+	G_OBJECT_CLASS (gpm_session_parent_class)->finalize (object);
+}
+
+/**
+ * gpm_session_new:
+ * Return value: new GpmSession instance.
+ **/
+GpmSession *
+gpm_session_new (void)
+{
+	if (gpm_session_object != NULL) {
+		g_object_ref (gpm_session_object);
+	} else {
+		gpm_session_object = g_object_new (GPM_TYPE_SESSION, NULL);
+		g_object_add_weak_pointer (gpm_session_object, &gpm_session_object);
+	}
+	return GPM_SESSION (gpm_session_object);
+}

Added: trunk/src/gpm-session.h
==============================================================================
--- (empty file)
+++ trunk/src/gpm-session.h	Tue Jan 27 12:26:08 2009
@@ -0,0 +1,62 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2008 Richard Hughes <richard hughsie com>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * 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 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GPM_SESSION_H
+#define __GPM_SESSION_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define GPM_TYPE_SESSION		(gpm_session_get_type ())
+#define GPM_SESSION(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), GPM_TYPE_SESSION, GpmSession))
+#define GPM_SESSION_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GPM_TYPE_SESSION, GpmSessionClass))
+#define GPM_IS_SESSION(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GPM_TYPE_SESSION))
+#define GPM_IS_SESSION_CLASS(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), GPM_TYPE_SESSION))
+#define GPM_SESSION_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GPM_TYPE_SESSION, GpmSessionClass))
+
+typedef struct GpmSessionPrivate GpmSessionPrivate;
+
+typedef struct
+{
+	GObject			 parent;
+	GpmSessionPrivate	*priv;
+} GpmSession;
+
+typedef struct
+{
+	GObjectClass	parent_class;
+	void		(* idle_changed)		(GpmSession	*session,
+					    		 gboolean	 is_idle);
+	void		(* inhibited_changed)		(GpmSession	*session,
+					    		 gboolean	 is_inhibited);
+} GpmSessionClass;
+
+GType		 gpm_session_get_type			(void);
+GpmSession	*gpm_session_new			(void);
+
+gboolean	 gpm_session_logout			(GpmSession	*session);
+gboolean	 gpm_session_get_idle			(GpmSession	*session);
+gboolean	 gpm_session_get_inhibited		(GpmSession	*session);
+
+G_END_DECLS
+
+#endif	/* __GPM_SESSION_H */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]