Tue Jan 15 14:33:55 UTC 2008

Author: mclasen

Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14326

Modified Files:
	.cvsignore gnome-session.spec sources 
Added Files:
	gnome-session-2.21.5-user-share.patch 
Removed Files:
	gnome-session-2.0.5-dithering.patch 
	gnome-session-2.0.5-login.patch 
	gnome-session-2.12.0-shaped.patch 
	gnome-session-2.13.92-user-share.patch 
	gnome-session-2.15.91-desensitize-invalid-buttons.patch 
	gnome-session-2.16.0-shaped.patch 
	gnome-session-2.17.2-http-proxy.patch 
	gnome-session-2.9.4-gnome-common.patch 
Log Message:
update patches


gnome-session-2.21.5-user-share.patch:

--- NEW FILE gnome-session-2.21.5-user-share.patch ---
diff -up /dev/null gnome-session-2.21.5/gnome-session/gsm-user-share.h
--- /dev/null	2008-01-15 08:30:50.560008905 -0500
+++ gnome-session-2.21.5/gnome-session/gsm-user-share.h	2008-01-15 09:14:18.000000000 -0500
@@ -0,0 +1,6 @@
+#ifndef GSM_USER_SHARE_H
+#define GSM_USER_SHARE_H
+
+void gsm_user_share_start (void);
+
+#endif /* GSM_USER_SHARE_H */
diff -up gnome-session-2.21.5/gnome-session/Makefile.am.user-share gnome-session-2.21.5/gnome-session/Makefile.am
--- gnome-session-2.21.5/gnome-session/Makefile.am.user-share	2008-01-14 17:42:46.000000000 -0500
+++ gnome-session-2.21.5/gnome-session/Makefile.am	2008-01-15 09:14:18.000000000 -0500
@@ -23,6 +23,7 @@ STANDARD_PROPERTIES_CFLAGS =            
 	-DPREFIX=\""$(prefix)"\"                                \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"                        \
 	-DLIBDIR=\""$(libdir)"\"                                \
+	-DLIBEXECDIR=\""$(libexecdir)"\"                        \
 	-DDATADIR=\""$(datadir)"\"                              \
 	$(NULL)
 
@@ -82,6 +83,8 @@ gnome_session_SOURCES =		\
 	gsm-dbus.h		\
 	gsm-keyring.c		\
 	gsm-keyring.h		\
+	gsm-user-share.c	\
+	gsm-user-share.h	\
 	gsm-gsd.c		\
 	gsm-gsd.h		\
 	gsm-protocol.c		\
diff -up /dev/null gnome-session-2.21.5/gnome-session/gsm-user-share.c
--- /dev/null	2008-01-15 08:30:50.560008905 -0500
+++ gnome-session-2.21.5/gnome-session/gsm-user-share.c	2008-01-15 09:14:18.000000000 -0500
@@ -0,0 +1,38 @@
+#include <config.h>
+
+#include <glib.h>
+#include <gconf/gconf-client.h>
+
+#include "gsm-user-share.h"
+
+#define FILE_SHARING_ENABLED "/desktop/gnome/file_sharing/enabled"
+
+void
+gsm_user_share_start (void)
+{
+    GConfClient *client;
+    gboolean enabled;
+    char *argv[2];
+    int i;
+
+    client = gconf_client_get_default ();
+    enabled = gconf_client_get_bool (client,
+				     FILE_SHARING_ENABLED,
+				     NULL);
+    g_object_unref (client);
+    
+    if (enabled) {
+        i = 0;
+	argv[i++] = LIBEXECDIR"/gnome-user-share";
+	argv[i++] = NULL;
+	
+	g_spawn_async (NULL,
+		       argv,
+		       NULL,
+		       G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
+		       NULL,
+		       NULL,
+		       NULL,
+		       NULL);
+    }
+}
diff -up gnome-session-2.21.5/gnome-session/main.c.user-share gnome-session-2.21.5/gnome-session/main.c
--- gnome-session-2.21.5/gnome-session/main.c.user-share	2008-01-14 18:21:52.000000000 -0500
+++ gnome-session-2.21.5/gnome-session/main.c	2008-01-15 09:24:53.000000000 -0500
@@ -51,6 +51,7 @@
 #include "gsm-sound.h"
 #include "gsm-gsd.h"
 #include "gsm-keyring.h"
+#include "gsm-user-share.h"
 #include "gsm-at-startup.h"
 #include "gsm-remote-desktop.h"
 
@@ -778,6 +779,8 @@ main (int argc, char *argv[])
 
   gsm_sound_login ();
 
+  gsm_user_share_start ();
+
   gsm_remote_desktop_start ();
 
   if (splashing)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	27 Nov 2007 05:50:27 -0000	1.46
+++ .cvsignore	15 Jan 2008 14:33:20 -0000	1.47
@@ -1 +1 @@
-gnome-session-2.20.2.tar.bz2
+gnome-session-2.21.5.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- gnome-session.spec	27 Nov 2007 05:50:27 -0000	1.144
+++ gnome-session.spec	15 Jan 2008 14:33:20 -0000	1.145
@@ -11,10 +11,10 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.20.2
+Version: 2.21.5
 Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-session/2.20/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-session/2.21/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
 Source2: gnome.desktop
 License: GPLv2+
@@ -43,7 +43,7 @@
 Patch2: gnome-session-enable-sound-by-default.patch
 
 # Launch gnome-user-share on login if enabled
-Patch7: gnome-session-2.13.92-user-share.patch
+Patch7: gnome-session-2.21.5-user-share.patch
 
 # too much crashing
 Patch9: gnome-session-2.13.4-no-crashes.patch
@@ -192,6 +192,9 @@
 %doc %{_datadir}/man/man*/*
 
 %changelog
+* Tue Jan 15 2008  Matthias Clasen <mclasen at redhat.com> - 2.21.5-1
+- Update to 2.21.5
+
 * Tue Nov 27 2007  Matthias Clasen <mclasen at redhat.com> - 2.20.2-1
 - Update to 2.20.2 (translation updates)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	27 Nov 2007 05:50:27 -0000	1.46
+++ sources	15 Jan 2008 14:33:20 -0000	1.47
@@ -1 +1 @@
-4dba25eb6ddb1a25d70fe3107ce23ed8  gnome-session-2.20.2.tar.bz2
+8f044122c0ecd071fa3d56bc83ef52fe  gnome-session-2.21.5.tar.bz2


--- gnome-session-2.0.5-dithering.patch DELETED ---


--- gnome-session-2.0.5-login.patch DELETED ---


--- gnome-session-2.12.0-shaped.patch DELETED ---


--- gnome-session-2.13.92-user-share.patch DELETED ---


--- gnome-session-2.15.91-desensitize-invalid-buttons.patch DELETED ---


--- gnome-session-2.16.0-shaped.patch DELETED ---


--- gnome-session-2.17.2-http-proxy.patch DELETED ---


--- gnome-session-2.9.4-gnome-common.patch DELETED ---


