rpms/geany/F-11 fix-button-pixmaps.patch, NONE, 1.1 geany.spec, 1.22, 1.23

[Jonathan G. Underwood]

Author: jgu

Update of /cvs/extras/rpms/geany/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27413

Modified Files:
	geany.spec 
Added Files:
	fix-button-pixmaps.patch 
Log Message:
* Sat Jun 20 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.17-3
- Add patch to fix missing button pixmaps


fix-button-pixmaps.patch:

--- NEW FILE fix-button-pixmaps.patch ---
diff --git a/src/ui_utils.c b/src/ui_utils.c
index 96159a7..b4be76d 100644
--- a/src/ui_utils.c
+++ b/src/ui_utils.c
@@ -1777,6 +1777,7 @@ static void create_config_files_menu(void)
 static void add_stock_items(void)
 {
 	GtkIconSet *icon_set;
+	GtkIconSource *icon_source;
 	GtkIconFactory *factory = gtk_icon_factory_new();
 	GdkPixbuf *pb;
 	gsize i, len;
@@ -1791,11 +1792,15 @@ static void add_stock_items(void)
 	for (i = 0; i < len; i++)
 	{
 		pb = ui_new_pixbuf_from_stock(items[i].stock_id);
-		icon_set = gtk_icon_set_new_from_pixbuf(pb);
+		icon_set = gtk_icon_set_new();
+		icon_source = gtk_icon_source_new();
+		gtk_icon_source_set_pixbuf(icon_source, pb);
+		gtk_icon_set_add_source (icon_set, icon_source);
 
 		gtk_icon_factory_add(factory, items[i].stock_id, icon_set);
 
 		gtk_icon_set_unref(icon_set);
+		gtk_icon_source_free (icon_source);
 		g_object_unref(pb);
 	}
 	gtk_stock_add((GtkStockItem *) items, len);


Index: geany.spec
===================================================================
RCS file: /cvs/extras/rpms/geany/F-11/geany.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- geany.spec	19 Jun 2009 23:47:39 -0000	1.22
+++ geany.spec	20 Jun 2009 12:00:48 -0000	1.23
@@ -1,6 +1,6 @@
 Name:      geany
 Version:   0.17
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -19,6 +19,9 @@ Source6:   http://download.geany.org/con
 # Patch to add a tango icon for the Save All button. Already upstream
 Patch0:    save-all-tango.patch
 
+# Patch to fix missing button pixmaps
+Patch1:	   fix-button-pixmaps.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils, gettext, gtk2-devel, glib2-devel, pango-devel, intltool
@@ -54,6 +57,7 @@ Geany plug-ins. You do not need to insta
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version}
@@ -96,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Sat Jun 20 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.17-3
+- Add patch to fix missing button pixmaps
+
 * Fri Jun 19 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.17-2
 - Add patch to give a tango Save All button