rpms/fast-user-switch-applet/devel fast-user-switch-applet-2.17.4-socket-check.patch, NONE, 1.1 fast-user-switch-applet-2.17.4-bug-buddy.patch, 1.1, 1.2 fast-user-switch-applet.spec, 1.12, 1.13

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/fast-user-switch-applet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8850

Modified Files:
	fast-user-switch-applet-2.17.4-bug-buddy.patch 
	fast-user-switch-applet.spec 
Added Files:
	fast-user-switch-applet-2.17.4-socket-check.patch 
Log Message:
- Add bugzilla information to the .server file
- Fix a bug in the gdm socket check


fast-user-switch-applet-2.17.4-socket-check.patch:
 gdm-queue.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE fast-user-switch-applet-2.17.4-socket-check.patch ---
--- fast-user-switch-applet-2.17.4/src/gdm-queue.c.socket-check	2007-03-30 16:09:50.000000000 -0400
+++ fast-user-switch-applet-2.17.4/src/gdm-queue.c	2007-03-30 16:10:35.000000000 -0400
@@ -201,7 +201,7 @@
 
   if (stat (GDM_NEW_SOCKET_FILENAME, &file_stat) == 0)
     strcpy (addr.sun_path, GDM_NEW_SOCKET_FILENAME);
-  if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0)
+  else if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0)
     strcpy (addr.sun_path, GDM_OLD_SOCKET_FILENAME);
   else
     return FALSE;
@@ -265,7 +265,7 @@
 
         if (stat (GDM_NEW_SOCKET_FILENAME, &file_stat) == 0)
           strcpy (addr.sun_path, GDM_NEW_SOCKET_FILENAME);
-        if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0)
+        else if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0)
           strcpy (addr.sun_path, GDM_OLD_SOCKET_FILENAME);
         else
           g_error ("Can't find gdm socket!");

fast-user-switch-applet-2.17.4-bug-buddy.patch:
 GNOME_FastUserSwitchApplet.server.in.in |   10 ++++++++++
 Makefile.am                             |    2 +-
 Makefile.in                             |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

Index: fast-user-switch-applet-2.17.4-bug-buddy.patch
===================================================================
RCS file: /cvs/dist/rpms/fast-user-switch-applet/devel/fast-user-switch-applet-2.17.4-bug-buddy.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fast-user-switch-applet-2.17.4-bug-buddy.patch	30 Mar 2007 19:55:06 -0000	1.1
+++ fast-user-switch-applet-2.17.4-bug-buddy.patch	30 Mar 2007 20:10:54 -0000	1.2
@@ -1,5 +1,5 @@
---- fast-user-switch-applet-2.17.4/data/GNOME_FastUserSwitchApplet.server.in.in.bug-buddy	2007-03-30 15:54:14.000000000 -0400
-+++ fast-user-switch-applet-2.17.4/data/GNOME_FastUserSwitchApplet.server.in.in	2007-03-30 15:53:42.000000000 -0400
+--- fast-user-switch-applet-2.17.4/data/GNOME_FastUserSwitchApplet.server.in.in.bug-buddy	2007-01-29 12:59:27.000000000 -0500
++++ fast-user-switch-applet-2.17.4/data/GNOME_FastUserSwitchApplet.server.in.in	2007-03-30 16:02:49.000000000 -0400
 @@ -8,6 +8,11 @@
      </oaf_attribute>
      <oaf_attribute name="name" type="string" _value="User Switcher Applet Factory"/>
@@ -23,3 +23,25 @@
 +    <oaf_attribute name="bugzilla:other_binaries" type="string" value="fast-user-switch-applet"/>
    </oaf_server>
  </oaf_info>
+--- fast-user-switch-applet-2.17.4/data/Makefile.in.bug-buddy	2007-03-30 16:03:10.000000000 -0400
++++ fast-user-switch-applet-2.17.4/data/Makefile.in	2007-03-30 16:04:14.000000000 -0400
+@@ -549,7 +549,7 @@
+ 
+ 
+ $(server_in_files): $(server_in_files:.server.in=.server.in.in)
+-	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
++	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
+ 
+ @INTLTOOL_SERVER_RULE@
+ 
+--- fast-user-switch-applet-2.17.4/data/Makefile.am.bug-buddy	2007-03-30 16:03:04.000000000 -0400
++++ fast-user-switch-applet-2.17.4/data/Makefile.am	2007-03-30 16:04:20.000000000 -0400
+@@ -14,7 +14,7 @@
+ 	$(server_in_files:.server.in=.server)
+ 
+ $(server_in_files): $(server_in_files:.server.in=.server.in.in)
+-	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
++	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
+ 
+ @INTLTOOL_SERVER_RULE@
+ 


Index: fast-user-switch-applet.spec
===================================================================
RCS file: /cvs/dist/rpms/fast-user-switch-applet/devel/fast-user-switch-applet.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fast-user-switch-applet.spec	30 Mar 2007 19:55:06 -0000	1.12
+++ fast-user-switch-applet.spec	30 Mar 2007 20:10:54 -0000	1.13
@@ -12,8 +12,11 @@
 Patch2:		startx.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=421090
 Patch3:		no-session.patch
-#
-Patch4		fast-user-switch-applet-2.17.4-bug-buddy.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=424615
+Patch4:		fast-user-switch-applet-2.17.4-bug-buddy.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=412541 
+Patch5:		fast-user-switch-applet-2.17.4-socket-check.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
@@ -46,6 +49,7 @@
 %patch2 -p1 -b .startx
 %patch3 -p1 -b .no-session
 %patch4 -p1 -b .bug-buddy
+%patch5 -p1 -b .socket-check
 
 %build
 %configure --disable-scrollkeeper \
@@ -103,6 +107,7 @@
 %changelog
 * Fri Mar 30 2007 Matthias Clasen <mclasen at redhat.com> 2.17.4-4
 - Add bugzilla information to the .server file
+- Fix a bug in the gdm socket check 
 
 * Wed Mar 28 2007 Matthias Clasen <mclasen at redhat.com> 2.17.4-3
 - Fix the startx patch to actually work when gdm is present