rpms/geany/F-11 geany-0.17-button-pixmaps.patch, NONE, 1.1 geany.spec, 1.25, 1.26 fix-button-pixmaps.patch, 1.1, NONE geany-0.17-debug.patch, 1.1, NONE save-all-tango.patch, 1.1, NONE

[Jonathan G. Underwood]

Author: jgu

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

Modified Files:
	geany.spec 
Added Files:
	geany-0.17-button-pixmaps.patch 
Removed Files:
	fix-button-pixmaps.patch geany-0.17-debug.patch 
	save-all-tango.patch 
Log Message:
* Sat Jun 20 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.17-6
- Add new patch to fix button pixmaps
- Remove debug patch and previous patch to fix button pixmaps
- Remove tango icon patch


geany-0.17-button-pixmaps.patch:

--- NEW FILE geany-0.17-button-pixmaps.patch ---
diff -up geany-0.17/src/main.c.button-pixmaps geany-0.17/src/main.c
--- geany-0.17/src/main.c.button-pixmaps	2009-06-20 18:10:04.000000000 +0100
+++ geany-0.17/src/main.c	2009-06-20 18:11:07.000000000 +0100
@@ -274,6 +274,8 @@ static void main_init(void)
 	ui_prefs.recent_projects_queue		= g_queue_new();
 	main_status.opening_session_files	= FALSE;
 
+	ui_init_stock_items();
+
 	main_widgets.window = create_window1();
 	/* add recent files to the File menu */
 	ui_widgets.recent_files_menuitem = ui_lookup_widget(main_widgets.window, "recent_files1");
diff -up geany-0.17/src/ui_utils.c.button-pixmaps geany-0.17/src/ui_utils.c
--- geany-0.17/src/ui_utils.c.button-pixmaps	2009-06-20 18:11:22.000000000 +0100
+++ geany-0.17/src/ui_utils.c	2009-06-20 18:13:08.000000000 +0100
@@ -1771,7 +1771,7 @@ static void create_config_files_menu(voi
 }
 
 
-static void add_stock_items(void)
+void ui_init_stock_items(void)
 {
 	GtkIconSet *icon_set;
 	GtkIconFactory *factory = gtk_icon_factory_new();
@@ -1803,8 +1803,6 @@ static void add_stock_items(void)
 
 void ui_init(void)
 {
-	add_stock_items();
-
 	ui_widgets.statusbar = ui_lookup_widget(main_widgets.window, "statusbar");
 	ui_widgets.print_page_setup = ui_lookup_widget(main_widgets.window, "page_setup1");
 
diff -up geany-0.17/src/ui_utils.h.button-pixmaps geany-0.17/src/ui_utils.h
--- geany-0.17/src/ui_utils.h.button-pixmaps	2009-06-20 18:13:37.000000000 +0100
+++ geany-0.17/src/ui_utils.h	2009-06-20 18:16:12.000000000 +0100
@@ -205,6 +205,8 @@ void ui_entry_add_clear_icon(GtkWidget *
 
 void ui_init(void);
 
+void ui_init_stock_items(void);
+
 void ui_add_config_file_menu_item(const gchar *real_path, const gchar *label,
 		GtkContainer *parent);
 


Index: geany.spec
===================================================================
RCS file: /cvs/extras/rpms/geany/F-11/geany.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- geany.spec	20 Jun 2009 15:00:41 -0000	1.25
+++ geany.spec	20 Jun 2009 17:19:47 -0000	1.26
@@ -1,6 +1,6 @@
 Name:      geany
 Version:   0.17
-Release:   5%{?dist}
+Release:   6%{?dist}
 Summary:   A fast and lightweight IDE using GTK2
 
 Group:     Development/Tools
@@ -17,13 +17,7 @@ Source5:   http://download.geany.org/con
 Source6:   http://download.geany.org/contrib/tags/standard.css.tags
 
 # 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
-
-# Debug patch
-Patch2:	   geany-0.17-debug.patch
+Patch0:    geany-0.17-button-pixmaps.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,8 +54,6 @@ Geany plug-ins. You do not need to insta
 %setup -q
 
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1 -b .debug
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version}
@@ -104,6 +96,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/geany.pc
 
 %changelog
+* Sat Jun 20 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.17-6
+- Add new patch to fix button pixmaps
+- Remove debug patch and previous patch to fix button pixmaps
+- Remove tango icon patch
+
 * Sat Jun 20 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.17-5
 - Fix spec file typo
 


--- fix-button-pixmaps.patch DELETED ---


--- geany-0.17-debug.patch DELETED ---


--- save-all-tango.patch DELETED ---