10 files changed, 234 insertions, 0 deletions

diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 12540b3a053c..18d5292cb508 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgnomeui
 PORTVERSION=	2.10.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
diff --git a/x11-toolkits/libgnomeui/files/patch-file-chooser::gtkfilesystemgnomevfs.c b/x11-toolkits/libgnomeui/files/patch-file-chooser::gtkfilesystemgnomevfs.c
new file mode 100644
index 000000000000..9afa5350522e
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-file-chooser::gtkfilesystemgnomevfs.c
@@ -0,0 +1,24 @@
+--- file-chooser/gtkfilesystemgnomevfs.c.orig	Sun Mar 20 20:58:22 2005
++++ file-chooser/gtkfilesystemgnomevfs.c	Sun Mar 20 20:59:03 2005
+@@ -2536,13 +2536,20 @@
+   GtkFileSystemGnomeVFS *system_vfs;
+   GConfValue *value;
+ 
++  GDK_THREADS_ENTER();
++
+   system_vfs = GTK_FILE_SYSTEM_GNOME_VFS (data);
+ 
+   if (strcmp (gconf_entry_get_key (entry), BOOKMARKS_KEY) != 0)
+-    return;
++    {
++      GDK_THREADS_LEAVE();
++      return;
++    }
+ 
+   value = gconf_entry_get_value (entry);
+   set_bookmarks_from_value (system_vfs, value, TRUE);
++
++  GDK_THREADS_LEAVE();
+ }
+ #endif
+ 
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app-helper.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app-helper.c
new file mode 100644
index 000000000000..87c3856f1ce1
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app-helper.c
@@ -0,0 +1,74 @@
+--- libgnomeui/gnome-app-helper.c.orig	Sun Mar 20 20:46:17 2005
++++ libgnomeui/gnome-app-helper.c	Sun Mar 20 20:49:57 2005
+@@ -435,6 +435,8 @@
+                 new_setting = gconf_value_get_bool(value);
+         }
+ 
++	GDK_THREADS_ENTER();
++
+         if (new_setting && (mi->image == NULL)) {
+                 GtkWidget *pixmap;
+                 GnomeUIPixmapType pixmap_type;
+@@ -457,6 +459,8 @@
+         } else if (!new_setting && (mi->image != NULL)) {
+ 		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), NULL);
+         }
++
++	GDK_THREADS_LEAVE();
+ }
+ 
+ /* Note that this function is also used for toolbars, don't assume
+@@ -1320,6 +1324,8 @@
+ 	if (entry->value->type != GCONF_VALUE_BOOL)
+ 		return;
+ 
++	GDK_THREADS_ENTER();
++
+ 	menu = GTK_WIDGET (user_data);
+ 	
+ 	if (gconf_value_get_bool (entry->value)) {
+@@ -1329,6 +1335,7 @@
+ 
+ 		if (tearoff) {
+ 			/* Do nothing */
++			GDK_THREADS_LEAVE();
+ 			return;
+ 		}
+ 		
+@@ -1345,6 +1352,7 @@
+ 
+ 		if (!tearoff) {
+ 			/* Do nothing */
++			GDK_THREADS_LEAVE();
+ 			return;
+ 		}
+ 		
+@@ -1352,6 +1360,8 @@
+ 		gtk_widget_destroy (tearoff);
+ 		g_object_set_data (G_OBJECT (menu), "gnome-app-tearoff", NULL);
+ 	}
++
++	GDK_THREADS_LEAVE();
+ }
+ 
+ 
+@@ -2467,7 +2477,9 @@
+                 }
+         }
+ 
++	GDK_THREADS_ENTER();
+         gtk_toolbar_set_style(toolbar, style);
++	GDK_THREADS_LEAVE();
+ }
+ 
+ static void
+@@ -2511,7 +2523,9 @@
+ 			style = GTK_TOOLBAR_BOTH;
+         }
+ 
++	GDK_THREADS_ENTER();
+         gtk_toolbar_set_style(toolbar, style);
++	GDK_THREADS_LEAVE();
+ }
+ 
+ static void
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app.c
new file mode 100644
index 000000000000..aae4e39f80ab
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app.c
@@ -0,0 +1,12 @@
+--- libgnomeui/gnome-app.c.orig	Sun Mar 20 20:51:20 2005
++++ libgnomeui/gnome-app.c	Sun Mar 20 20:52:01 2005
+@@ -269,7 +269,9 @@
+ 		detachable = gconf_value_get_bool (entry->value);
+ 		
+ 		/* Update */
++		GDK_THREADS_ENTER();
+ 		bonobo_dock_item_set_locked (item, !detachable);
++		GDK_THREADS_LEAVE();
+ 	}
+ }
+ 
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-entry.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-entry.c
new file mode 100644
index 000000000000..e83891c08a3a
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-entry.c
@@ -0,0 +1,25 @@
+--- libgnomeui/gnome-entry.c.orig	Sun Mar 20 20:54:19 2005
++++ libgnomeui/gnome-entry.c	Sun Mar 20 20:54:20 2005
+@@ -419,6 +419,8 @@
+ {
+ 	GnomeEntry *gentry;
+ 
++	GDK_THREADS_ENTER();
++
+ 	gentry = GNOME_ENTRY (user_data);
+ 
+ 	/* If we're getting a notification from saving our own
+@@ -427,10 +429,13 @@
+ 	if (gentry->_priv->saving_history) {
+ 		gentry->_priv->saving_history = FALSE;
+ 
++		GDK_THREADS_LEAVE();
+ 		return;
+ 	}
+ 
+ 	gnome_entry_load_history (gentry);
++
++	GDK_THREADS_LEAVE();
+ }
+ 
+ /* FIXME: Make this static */
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-gconf-ui.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-gconf-ui.c
new file mode 100644
index 000000000000..5713fbd49d15
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-gconf-ui.c
@@ -0,0 +1,20 @@
+--- libgnomeui/gnome-gconf-ui.c.orig	Sun Mar 20 20:38:41 2005
++++ libgnomeui/gnome-gconf-ui.c	Sun Mar 20 20:39:51 2005
+@@ -148,6 +148,8 @@
+         g_return_val_if_fail(eid.client != NULL, FALSE);
+         g_return_val_if_fail(pending_errors != NULL, FALSE);
+ 
++        GDK_THREADS_ENTER();
++
+         if (current_dialog == NULL) {
+                 GtkWidget *dialog;
+                 gboolean have_overridden = FALSE;
+@@ -245,6 +247,8 @@
+ 
+         gtk_window_present (GTK_WINDOW (current_dialog));
+         
++        GDK_THREADS_LEAVE();
++
+         return FALSE;
+ }
+ 
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ice.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ice.c
new file mode 100644
index 000000000000..160e5ad9b834
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ice.c
@@ -0,0 +1,20 @@
+--- libgnomeui/gnome-ice.c.orig	Sun Mar 20 20:33:56 2005
++++ libgnomeui/gnome-ice.c	Sun Mar 20 20:34:21 2005
+@@ -54,6 +54,8 @@
+   IceConn connection = (IceConn) data;
+   IceProcessMessagesStatus status;
+ 
++  GDK_THREADS_ENTER();
++
+   status = IceProcessMessages (connection, NULL, NULL);
+ 
+   if (status == IceProcessMessagesIOError)
+@@ -73,6 +75,8 @@
+ 	  IceCloseConnection (connection);
+ 	}
+     }
++
++  GDK_THREADS_LEAVE();
+ 
+   return TRUE;
+ }
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-icon-sel.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-icon-sel.c
new file mode 100644
index 000000000000..d096e0818dc3
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-icon-sel.c
@@ -0,0 +1,20 @@
+--- libgnomeui/gnome-icon-sel.c.orig	Sun Mar 20 20:40:05 2005
++++ libgnomeui/gnome-icon-sel.c	Sun Mar 20 20:42:24 2005
+@@ -353,6 +353,8 @@
+ 		return FALSE;
+ 	}
+ 
++	GDK_THREADS_ENTER();
++
+ 	append_an_icon (gis, list->data);
+ 
+ 	g_free (list->data);
+@@ -367,6 +369,8 @@
+ 				       (double)gis->_priv->load_i / gis->_priv->load_file_count);
+ 
+ 	gis->_priv->load_i ++;
++
++	GDK_THREADS_LEAVE();
+ 
+ 	return TRUE;
+ }
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-pixmap-entry.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-pixmap-entry.c
new file mode 100644
index 000000000000..46fc0489b807
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-pixmap-entry.c
@@ -0,0 +1,25 @@
+--- libgnomeui/gnome-pixmap-entry.c.orig	Sun Mar 20 20:34:49 2005
++++ libgnomeui/gnome-pixmap-entry.c	Sun Mar 20 20:38:30 2005
+@@ -237,6 +237,8 @@
+ {
+ 	GSList *li,*tmp;
+ 
++	GDK_THREADS_ENTER();
++
+ 	tmp = changed_pentries;
+ 	changed_pentries = NULL;
+ 	if(tmp) {
+@@ -244,9 +246,13 @@
+ 			refresh_preview(li->data);
+ 		}
+ 		g_slist_free(tmp);
++
++		GDK_THREADS_LEAVE();
+ 		return TRUE;
+ 	}
+ 	change_timeout = 0;
++
++	GDK_THREADS_LEAVE();
+ 
+ 	return FALSE;
+ }
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ui-init.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ui-init.c
new file mode 100644
index 000000000000..a38f7005215e
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ui-init.c
@@ -0,0 +1,13 @@
+--- libgnomeui/gnome-ui-init.c.orig	Sun Mar 20 20:56:32 2005
++++ libgnomeui/gnome-ui-init.c	Sun Mar 20 20:56:36 2005
+@@ -492,8 +492,10 @@
+                                 gnome_gconf_get_bool ("/desktop/gnome/sound/event_sounds"));
+ 
+         if (new_use_event_sounds && !use_event_sounds) {
++                GDK_THREADS_ENTER();
+                 initialize_gtk_signal_relay ();
+                 initialize_gnome_signal_relay ();
++                GDK_THREADS_LEAVE();
+ 	}
+ 
+         use_event_sounds = new_use_event_sounds;