3 files changed, 64 insertions, 0 deletions

diff --git a/sysutils/nitrogen/files/patch-data-icon-theme-installer b/sysutils/nitrogen/files/patch-data-icon-theme-installer
new file mode 100644
index 000000000000..ba76ba65c353
--- /dev/null
+++ b/sysutils/nitrogen/files/patch-data-icon-theme-installer
@@ -0,0 +1,17 @@
+--- data/icon-theme-installer.orig	Sun Dec 31 16:59:08 2006
++++ data/icon-theme-installer	Tue Jul  3 21:45:35 2007
+@@ -101,12 +101,12 @@
+ 	exit 1
+ fi
+ 
+-if test ! -x $(echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '); then
++if test ! -x $(which $(echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' ')); then
+ 	echo "Cannot find '$MKINSTALLDIRS_EXEC'; You probably want to pass -m \$(mkinstalldirs)"
+ 	exit 1
+ fi
+ 
+-if test ! -x $(echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '); then
++if test ! -x $(which $(echo "$INSTALL_DATA_EXEC" | cut -f1 -d' ')); then
+ 	echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)"
+ 	exit 1
+ fi
diff --git a/sysutils/nitrogen/files/patch-src-NWindow.cc b/sysutils/nitrogen/files/patch-src-NWindow.cc
new file mode 100644
index 000000000000..c635ac99970a
--- /dev/null
+++ b/sysutils/nitrogen/files/patch-src-NWindow.cc
@@ -0,0 +1,20 @@
+--- src/NWindow.cc.orig	Sat May 12 05:12:25 2007
++++ src/NWindow.cc	Wed Jul  4 17:07:08 2007
+@@ -155,9 +155,16 @@
+ void NWindow::setup_select_boxes() {
+ 		
+ 	Glib::RefPtr<Gtk::IconTheme> icontheme = Gtk::IconTheme::get_default();
++	Glib::RefPtr<Gtk::IconTheme> gnomeicontheme = Gtk::IconTheme::create();
+ 	Glib::RefPtr<Gdk::Pixbuf> icon, genericicon;
+ 
+-	genericicon = icontheme->load_icon("image-x-generic", 16, Gtk::ICON_LOOKUP_NO_SVG);
++	gnomeicontheme->set_custom_theme("gnome");
++
++	try {
++		genericicon = icontheme->load_icon("image-x-generic", 16, Gtk::ICON_LOOKUP_NO_SVG);
++	} catch (...) {
++		genericicon = gnomeicontheme->load_icon("image-x-generic", 16, Gtk::ICON_LOOKUP_NO_SVG);
++	}
+ 
+ 	// modes
+ 	try {
diff --git a/sysutils/nitrogen/files/patch-src-Thumbview.cc b/sysutils/nitrogen/files/patch-src-Thumbview.cc
new file mode 100644
index 000000000000..0b4dec6254ed
--- /dev/null
+++ b/sysutils/nitrogen/files/patch-src-Thumbview.cc
@@ -0,0 +1,27 @@
+--- src/Thumbview.cc.orig	Tue Jan 30 04:01:36 2007
++++ src/Thumbview.cc	Wed Jul  4 17:10:44 2007
+@@ -56,6 +56,11 @@
+  * Constructor, sets up gtk stuff, inits data and queues
+  */
+ Thumbview::Thumbview() : dir("") {
++	Glib::RefPtr<Gtk::IconTheme> icontheme = Gtk::IconTheme::get_default();
++	Glib::RefPtr<Gtk::IconTheme> gnomeicontheme = Gtk::IconTheme::create();
++
++	gnomeicontheme->set_custom_theme("gnome");
++
+ 	set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+ 	set_shadow_type (Gtk::SHADOW_IN);
+ 
+@@ -96,7 +101,11 @@
+ 	// store->set_sort_column (short_filename, Gtk::SORT_ASCENDING);
+ 
+ 	// load loading image
+-	this->loading_image = Gtk::IconTheme::get_default()->load_icon("image-loading", 64, Gtk::ICON_LOOKUP_FORCE_SVG);
++	try {
++		this->loading_image = icontheme->load_icon("image-loading", 64, Gtk::ICON_LOOKUP_FORCE_SVG);
++	} catch (...) {
++		this->loading_image = gnomeicontheme->load_icon("image-loading", 64, Gtk::ICON_LOOKUP_FORCE_SVG);
++	}
+ 
+ 	// make our async queues
+ 	this->aqueue_createthumbs = g_async_queue_new();