[gtk-chtheme/el6] Icon added in the desktop menu.

[Damien Durand]

commit 6e192261cf5f24095cd43adef47f46fd0763f7e8
Author: damien <damien at rhel.localdomain>
Date:   Fri Mar 30 10:17:57 2012 +0200

    Icon added in the desktop menu.

 gtk-chtheme-0.3.1-fix.patch |   23 +++++++++++++++++++++++
 gtk-chtheme.desktop         |    1 +
 gtk-chtheme.png             |  Bin 0 -> 1298 bytes
 gtk-chtheme.spec            |   16 +++++++++++++++-
 4 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/gtk-chtheme-0.3.1-fix.patch b/gtk-chtheme-0.3.1-fix.patch
new file mode 100644
index 0000000..b623f64
--- /dev/null
+++ b/gtk-chtheme-0.3.1-fix.patch
@@ -0,0 +1,23 @@
+diff -up gtk-chtheme-0.3.1/about_dialog.c.fix gtk-chtheme-0.3.1/about_dialog.c
+--- gtk-chtheme-0.3.1/about_dialog.c.fix	2012-03-22 14:24:17.502746629 -0400
++++ gtk-chtheme-0.3.1/about_dialog.c	2012-03-22 14:24:20.537719693 -0400
+@@ -39,7 +39,6 @@ void show_about_dialog(void) {
+ 	GtkWidget* about_dlg = gtk_dialog_new();
+ 	gtk_window_set_title(GTK_WINDOW(about_dlg), "About");
+ 	gtk_window_set_resizable(GTK_WINDOW(about_dlg), FALSE);
+-	gtk_dialog_set_has_separator(GTK_DIALOG(about_dlg), FALSE);
+ 	gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(about_dlg)->vbox), 20);
+ 	
+ 	GtkWidget* about = GTK_WIDGET(gtk_label_new_from_pango_markup((ABOUT), GTK_JUSTIFY_CENTER));
+diff -up gtk-chtheme-0.3.1/theme_sel.c.fix gtk-chtheme-0.3.1/theme_sel.c
+--- gtk-chtheme-0.3.1/theme_sel.c.fix	2012-03-22 14:20:43.743651593 -0400
++++ gtk-chtheme-0.3.1/theme_sel.c	2012-03-22 14:23:34.217131165 -0400
+@@ -110,7 +110,7 @@ GtkWidget *create_theme_sel(void)
+ 		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ 	gtk_container_add(GTK_CONTAINER(sw), theme_list);
+ 
+-	gtk_timeout_add(0, (GtkFunction)theme_list_focus, theme_list);
++	g_timeout_add(0, (GSourceFunc)theme_list_focus, theme_list);
+ 
+ 	return sw;
+ }
diff --git a/gtk-chtheme.desktop b/gtk-chtheme.desktop
index 0c98297..84264c2 100644
--- a/gtk-chtheme.desktop
+++ b/gtk-chtheme.desktop
@@ -3,6 +3,7 @@ Name=gtk-chtheme
 GenericName=GTK Change Theme
 Comment=Change your Gtk+ 2.0 theme
 Exec=gtk-chtheme
+Icon=gtk-chtheme
 Terminal=false
 Type=Application
 Categories=DesktopSettings;Utility;GTK;
diff --git a/gtk-chtheme.png b/gtk-chtheme.png
new file mode 100644
index 0000000..082a730
Binary files /dev/null and b/gtk-chtheme.png differ
diff --git a/gtk-chtheme.spec b/gtk-chtheme.spec
index 119ee84..7c8ccea 100644
--- a/gtk-chtheme.spec
+++ b/gtk-chtheme.spec
@@ -1,6 +1,6 @@
 Name:		gtk-chtheme
 Version:	0.3.1
-Release:	9%{dist}
+Release:	11%{dist}
 Summary:	Gtk+ 2.0 theme preview and selection made slick
 
 Group:		User Interface/Desktops
@@ -8,8 +8,10 @@ License:	GPLv2+
 URL:		http://plasmasturm.org/programs/gtk-chtheme/
 Source0:	http://plasmasturm.org/code/%{name}/%{name}-%{version}.tar.bz2
 Source1:	%{name}.desktop
+Source2:	%{name}.png
 Patch0:		%{name}-nostrip.patch
 Patch1:		%{name}-0.3.1-new-api.patch
+Patch2:		gtk-chtheme-0.3.1-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel desktop-file-utils
@@ -24,6 +26,7 @@ A large variety of widgets provides a comprehensive demonstration.
 %setup -q
 %patch0 -p0 -b .orig
 %patch1 -p1 -b .orig
+%patch2 -p1 -b .fix
 
 %build
 make %{?_smp_mflags}
@@ -32,6 +35,10 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
 
+# We add an icon for the desktop menu
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+cp %{SOURCE2} %{buildroot}%{_datadir}/pixmaps
+
 desktop-file-install					\
 	--dir=%{buildroot}%{_datadir}/applications	\
 	%{SOURCE1}
@@ -46,10 +53,17 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING
 %{_bindir}/%{name}
+%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/%{name}.desktop
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Fri Mar 30 2012 Damien Durand <splinux25 at gmail.com> - 0.3.1-11
+- We added an icon for the desktop menu
+
+* Thu Mar 22 2012 Tom Callaway <spot at fedoraproject.org> - 0.3.1-10
+- fix compile
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild