rpms/gnome-volume-manager/devel gnome-volume-manager-2.22.0-check-screensaver.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 gnome-volume-manager.spec, 1.65, 1.66 sources, 1.21, 1.22 gnome-volume-manager-0.9.10.add-to-base.patch, 1.2, NONE gnome-volume-manager-0.9.10.photo-import-default.patch, 1.1, NONE gnome-volume-manager-0.9.10.small-fixes.patch, 1.1, NONE gnome-volume-manager-1.0.2-add-locking.patch, 1.1, NONE gnome-volume-manager-1.1.0-policy-after-explicit-mount-only.patch, 1.1, NONE gnome-volume-manager-1.1.0-rh-defaults.patch, 1.1, NONE gnome-volume-manager-1.1.0.addheader.patch, 1.1, NONE gnome-volume-manager-1.1.3-hal-api.patch, 1.1, NONE gnome-volume-manager-1.5.3-spew.patch, 1.1, NONE gnome-volume-manager-1.5.7-array-pointer-fix.patch, 1.1, NONE gnome-volume-manager-1.5.9-goption.patch, 1.1, NONE gnome-volume-manager-2.15.0-check-screensaver.patch, 1.1, NONE gnome-volume-manager-2.15.0.add-console-user-check.patch, 1.1, NONE gvm-1.5.13-support-encrypted-fs.patch, 1.1, NONE gvm-no-mount-ui-on-startup.patch, 1.1, NONE

Matthias Clasen (mclasen) fedora-extras-commits at redhat.com
Fri Dec 7 12:35:05 UTC 2007


Author: mclasen

Update of /cvs/extras/rpms/gnome-volume-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24087

Modified Files:
	.cvsignore gnome-volume-manager.spec sources 
Added Files:
	gnome-volume-manager-2.22.0-check-screensaver.patch 
Removed Files:
	gnome-volume-manager-0.9.10.add-to-base.patch 
	gnome-volume-manager-0.9.10.photo-import-default.patch 
	gnome-volume-manager-0.9.10.small-fixes.patch 
	gnome-volume-manager-1.0.2-add-locking.patch 
	gnome-volume-manager-1.1.0-policy-after-explicit-mount-only.patch 
	gnome-volume-manager-1.1.0-rh-defaults.patch 
	gnome-volume-manager-1.1.0.addheader.patch 
	gnome-volume-manager-1.1.3-hal-api.patch 
	gnome-volume-manager-1.5.3-spew.patch 
	gnome-volume-manager-1.5.7-array-pointer-fix.patch 
	gnome-volume-manager-1.5.9-goption.patch 
	gnome-volume-manager-2.15.0-check-screensaver.patch 
	gnome-volume-manager-2.15.0.add-console-user-check.patch 
	gvm-1.5.13-support-encrypted-fs.patch 
	gvm-no-mount-ui-on-startup.patch 
Log Message:
2.22.0


gnome-volume-manager-2.22.0-check-screensaver.patch:

--- NEW FILE gnome-volume-manager-2.22.0-check-screensaver.patch ---
diff -up gnome-volume-manager-2.22.0/src/manager.c.screensaver gnome-volume-manager-2.22.0/src/manager.c
--- gnome-volume-manager-2.22.0/src/manager.c.screensaver	2007-12-07 07:25:28.000000000 -0500
+++ gnome-volume-manager-2.22.0/src/manager.c	2007-12-07 07:30:19.000000000 -0500
@@ -62,6 +62,7 @@
 
 static struct gvm_configuration config;
 static DBusConnection *dbus_connection = NULL;
+static DBusConnection *dbus_connection_session = NULL;
 static char *gnome_mount = NULL;
 static LibHalContext *hal_ctx;
 
@@ -2122,6 +2123,42 @@ gvm_mount_options (GPtrArray *options, g
 	return TRUE;
 }
 
+static gboolean
+gvm_is_screensaver_running (gboolean *is_screensaver_running)
+{
+	DBusError error;
+	DBusMessage *msg;
+	DBusMessage *reply;
+	DBusMessageIter iter;
+
+	if (!(msg = dbus_message_new_method_call ("org.gnome.ScreenSaver", 
+						  "/",
+						  "org.gnome.ScreenSaver",
+						  "GetActive"))) {
+		dbg ("gvm_is_screensaver_running: could not create dbus message\n");
+		return FALSE;
+	}
+
+	dbus_error_init (&error);
+	if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection_session, msg, -1, &error))) {
+		dbg ("gvm_is_screensaver_running: %s\n", error.message);
+		dbus_message_unref (msg);
+		dbus_error_free (&error);
+		return FALSE;
+	}
+
+	dbus_message_iter_init (reply, &iter);
+	if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_BOOLEAN) {
+		dbg ("gvm_is_screensaver_running: Return value is not a bool");
+		dbus_message_unref (msg);
+		dbus_message_unref (reply);
+		return FALSE;
+	}
+	dbus_message_iter_get_basic (&iter, is_screensaver_running);
+	dbus_message_unref (reply);
+	dbus_message_unref (msg);
+	return TRUE;
+}
 
 /*
  * gvm_device_mount - mount the given device.
@@ -2132,6 +2169,14 @@ static gboolean
 gvm_device_mount (const char *udi, gboolean interactive)
 {
 	struct _MountPolicy *policy;
+	gboolean is_screensaver_running;
+
+	if (gvm_is_screensaver_running (&is_screensaver_running)) {
+		if (is_screensaver_running) {
+			dbg ("refusing to mount %s because screensaver is running\n", udi);
+			return FALSE;
+		}
+	}
 	
 	dbg ("mounting %s...\n", udi);
 	
@@ -3224,9 +3269,17 @@ gvm_dbus_init (void)
 		dbus_error_free (&error);
 		return FALSE;
 	}
+
+	if (!(dbus_connection_session = dbus_bus_get (DBUS_BUS_SESSION, &error))) {
+		dbg ("could not get session bus: %s\n", error.message);
+		dbus_error_free (&error);
+		return FALSE;
+	}
 	
 	dbus_connection_setup_with_g_main (dbus_connection, NULL);
 	dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE);
+
+	dbus_connection_setup_with_g_main (dbus_connection_session, NULL);
 	
 	dbus_connection_add_filter (dbus_connection, gvm_dbus_filter_function, NULL, NULL);
 	


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-volume-manager/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	7 Nov 2006 19:22:32 -0000	1.21
+++ .cvsignore	7 Dec 2007 12:34:31 -0000	1.22
@@ -1 +1 @@
-gnome-volume-manager-2.17.0.tar.bz2
+gnome-volume-manager-2.22.0.tar.bz2


Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- gnome-volume-manager.spec	23 Oct 2007 05:33:04 -0000	1.65
+++ gnome-volume-manager.spec	7 Dec 2007 12:34:31 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
-Version: 2.17.0
-Release: 10%{?dist}
+Version: 2.22.0
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 Source0: http://download.gnome.org/sources/gnome-volume-manager/2.17/gnome-volume-manager-%{version}.tar.bz2
@@ -9,10 +9,9 @@
 Source2: gthumb-import
 Source3: gnome-cdda-handler
 Source4: cdda-url-handler.schemas
-Patch0: gnome-volume-manager-0.9.10.add-to-base.patch
 Patch1: gnome-volume-manager-2.17.0-rh-defaults.patch
 Patch2: gnome-volume-manager-2.17.0-add-console-user-check.patch 
-Patch3: gnome-volume-manager-2.15.0-check-screensaver.patch
+Patch3: gnome-volume-manager-2.22.0-check-screensaver.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: libgnomeui-devel
 BuildRequires: libglade2-devel
@@ -48,10 +47,9 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .add-to-base
 %patch1 -p1 -b .rh-defaults
 %patch2 -p1 -b .add-console-user-check
-%patch3 -p0 -b .screensaver
+%patch3 -p1 -b .screensaver
 %build
 %configure 
 make
@@ -114,6 +112,9 @@
 %{_datadir}/gnome/autostart/gnome-volume-manager.desktop
 
 %changelog
+* Fri Dec  7 2007 Matthias Clasen <mclasen at redhat.com> - 2.22.0-1
+- Update to 2.22.0
+
 * Tue Oct 23 2007 Matthias Clasen <mclasen at redhat.com> - 2.17.0-10
 - Rebuild against new dbus-glib
 * Fri Oct 05 2007 - Bastien Nocera <bnocera at redhat.com> - 2.17.0-9


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-volume-manager/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	7 Nov 2006 19:22:32 -0000	1.21
+++ sources	7 Dec 2007 12:34:31 -0000	1.22
@@ -1 +1 @@
-104cec26e721e0bba69debd392367195  gnome-volume-manager-2.17.0.tar.bz2
+f84e2d72d494a5bbee8d2685f6ad7b11  gnome-volume-manager-2.22.0.tar.bz2


--- gnome-volume-manager-0.9.10.add-to-base.patch DELETED ---


--- gnome-volume-manager-0.9.10.photo-import-default.patch DELETED ---


--- gnome-volume-manager-0.9.10.small-fixes.patch DELETED ---


--- gnome-volume-manager-1.0.2-add-locking.patch DELETED ---


--- gnome-volume-manager-1.1.0-policy-after-explicit-mount-only.patch DELETED ---


--- gnome-volume-manager-1.1.0-rh-defaults.patch DELETED ---


--- gnome-volume-manager-1.1.0.addheader.patch DELETED ---


--- gnome-volume-manager-1.1.3-hal-api.patch DELETED ---


--- gnome-volume-manager-1.5.3-spew.patch DELETED ---


--- gnome-volume-manager-1.5.7-array-pointer-fix.patch DELETED ---


--- gnome-volume-manager-1.5.9-goption.patch DELETED ---


--- gnome-volume-manager-2.15.0-check-screensaver.patch DELETED ---


--- gnome-volume-manager-2.15.0.add-console-user-check.patch DELETED ---


--- gvm-1.5.13-support-encrypted-fs.patch DELETED ---


--- gvm-no-mount-ui-on-startup.patch DELETED ---




More information about the fedora-extras-commits mailing list