rpms/gnome-desktop/F-11 you-never-find-a-haystack-in-a-needle.patch, NONE, 1.1 gnome-desktop.spec, 1.210, 1.211

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26308

Modified Files:
	gnome-desktop.spec 
Added Files:
	you-never-find-a-haystack-in-a-needle.patch 
Log Message:
Fix 'unkown' monitor names


you-never-find-a-haystack-in-a-needle.patch:

--- NEW FILE you-never-find-a-haystack-in-a-needle.patch ---
--- gnome-desktop-2.26.1/libgnome-desktop/display-name.c	2009-04-13 18:00:20.000000000 -0400
+++ hacked/libgnome-desktop/display-name.c	2009-04-29 10:41:35.182718339 -0400
@@ -205,10 +205,11 @@
     const char *vendor;
     int width_mm, height_mm, inches;
 
+    g_print ("output name %s, vendor %s\n", output_name, info ? info->manufacturer_code : "nada");
     if (output_name &&
-	(strstr ("lvds", output_name)	||
-	 strstr ("LVDS", output_name)	||
-	 strstr ("Lvds", output_name)))
+	(strstr (output_name, "lvds")	||
+	 strstr (output_name, "LVDS")	||
+	 strstr (output_name, "Lvds")))
     {
 	vendor = _("Laptop");
     }


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-11/gnome-desktop.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- gnome-desktop.spec	28 Apr 2009 23:48:26 -0000	1.210
+++ gnome-desktop.spec	29 Apr 2009 14:49:01 -0000	1.211
@@ -12,11 +12,13 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.26.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.26/%{name}-%{version}.tar.bz2
 # fixed upstream
 Patch0: give-me-back-my-rotations.patch
+# fixed upstream
+Patch1: you-never-find-a-haystack-in-a-needle.patch
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +77,7 @@ libgnomedesktop.
 %prep
 %setup -q
 %patch0 -p1 -b .rotations
+%patch1 -p1 -b .unknown-monitors
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" --disable-scrollkeeper
@@ -120,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed Apr 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-3
+- Fix needle/haystack confusion causing most monitors to be 'Unknown'
+
 * Tue Apr 28 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-2
 - Fix a case of disappearing rotations (#497515)