rpms/xteddy/devel xteddy-2.0.1-iconname.patch, NONE, 1.1 xteddy.spec, 1.2, 1.3

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/xteddy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23316

Modified Files:
	xteddy.spec 
Added Files:
	xteddy-2.0.1-iconname.patch 
Log Message:
* Sun Mar 08 2009 Lubomir Rintel <lkundrak at v3.sk> 2.0.1-4
- Fix startup crash


xteddy-2.0.1-iconname.patch:

--- NEW FILE xteddy-2.0.1-iconname.patch ---
Fix use of uninitialized value, which causes random crashes on startup.

Lubomir Rintel <lkundrak at v3.sk>

diff -up xteddy-2.0.1/xteddy.c.iconname xteddy-2.0.1/xteddy.c
--- xteddy-2.0.1/xteddy.c.iconname	2009-03-08 23:01:59.000000000 -0400
+++ xteddy-2.0.1/xteddy.c	2009-03-08 23:02:12.000000000 -0400
@@ -109,7 +109,7 @@ int main(int argc, char **argv)
   XSizeHints           size_hints;
   XWMHints             wm_hints;
   XClassHint           class_hints;
-  XTextProperty        windowName, iconName;
+  XTextProperty        windowName;
   int                  argnum;
   int                  use_wm, float_up, allow_quit;
   XEvent               report;
@@ -237,7 +237,7 @@ int main(int argc, char **argv)
   class_hints.res_name = progname;
   class_hints.res_class = "Xteddy";
   
-  XSetWMProperties(display, win, &windowName, &iconName,
+  XSetWMProperties(display, win, &windowName, NULL,
 		   argv, argc, &size_hints, &wm_hints, &class_hints);
 
   /* Select event types wanted */


Index: xteddy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xteddy/devel/xteddy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xteddy.spec	26 Feb 2009 12:08:49 -0000	1.2
+++ xteddy.spec	8 Mar 2009 23:15:22 -0000	1.3
@@ -1,14 +1,15 @@
 Name:           xteddy
 Version:        2.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tool to sit around silently, look cute, and make you smile
 
 Group:          Amusements/Games
 License:        GPL+
-URL:            http://webstaff.itn.liu.se/~stegu/xteddy/
+URL:            http://fam-tille.de/debian/xteddy.html
 Source0:        http://webstaff.itn.liu.se/~stegu/xteddy/%{name}-%{version}.tar.gz
-# Aleady submitted upstream by mail
+# Both submitted upstream by mail
 Patch0:         xteddy-2.0.1-visual.patch
+Patch1:         xteddy-2.0.1-iconname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  imlib-devel libpng-devel
@@ -22,6 +23,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .visual
+%patch1 -p1 -b .iconname
 
 
 %build
@@ -50,6 +52,9 @@
 
 
 %changelog
+* Sun Mar 08 2009 Lubomir Rintel <lkundrak at v3.sk> 2.0.1-4
+- Fix startup crash
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild