rpms/cheese/F-13 no-webcam.patch,NONE,1.1 cheese.spec,1.76,1.77

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/cheese/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25538

Modified Files:
	cheese.spec 
Added Files:
	no-webcam.patch 
Log Message:
use an existing icon


no-webcam.patch:
 cheese-widget.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE no-webcam.patch ---
diff -up cheese-2.29.92/libcheese/cheese-widget.c.no-webcam cheese-2.29.92/libcheese/cheese-widget.c
--- cheese-2.29.92/libcheese/cheese-widget.c.no-webcam	2010-03-16 13:51:03.281478874 -0400
+++ cheese-2.29.92/libcheese/cheese-widget.c	2010-03-16 13:51:07.649806018 -0400
@@ -75,8 +75,8 @@ cheese_widget_load_pixbuf (GtkWidget  *w
   theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget));
 
   /* FIXME special case "no-webcam" and actually use the icon_name */
-  pixbuf = gtk_icon_theme_load_icon (theme, "error",
-                                     size, 0, error);
+  pixbuf = gtk_icon_theme_load_icon (theme, "dialog-error",
+                                     size, GTK_ICON_LOOKUP_USE_BUILTIN | GTK_ICON_LOOKUP_FORCE_SIZE, error);
   return pixbuf;
 }
 


Index: cheese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/F-13/cheese.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- cheese.spec	9 Mar 2010 15:10:12 -0000	1.76
+++ cheese.spec	16 Mar 2010 17:56:58 -0000	1.77
@@ -1,13 +1,15 @@
 Name:           cheese
 Version:        2.29.92
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Application for taking pictures and movies from a webcam
 
 Group:          Amusements/Graphics
 License:        GPLv2+
 URL:            http://projects.gnome.org/cheese/
+#VCS: git:git://git.gnome.org/cheese
 Source0:        http://download.gnome.org/sources/cheese/2.29/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#
+Patch0:         no-webcam.patch
 
 BuildRequires: gtk2-devel >= 2.19.1
 BuildRequires: dbus-devel
@@ -61,6 +63,7 @@ for writing applications that require a 
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-webcam
 
 %build
 %configure --disable-static
@@ -164,6 +167,9 @@ fi
 %{_libdir}/pkgconfig/cheese-gtk.pc
 
 %changelog
+* Tue Mar 16 2010 Matthias Clasen <mclasen at redhat.com> 2.29.92-2
+- Use an existing icon
+
 * Tue Mar 09 2010 Bastien Nocera <bnocera at redhat.com> 2.29.92-1
 - Update to 2.29.92