rpms/glade3/F-10 glade3-3.4.5-anjuta-hang.patch, NONE, 1.1 glade3.spec, 1.14, 1.15

[Debarshi Ray]

Author: rishi

Update of /cvs/pkgs/rpms/glade3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6246

Modified Files:
	glade3.spec 
Added Files:
	glade3-3.4.5-anjuta-hang.patch 
Log Message:
* Mon Jan 05 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-2
- Added patch to prevent Anjuta from hanging on startup from GNOME that was
  mistakenly left out from the upstream tarball. Closes GNOME Bugzilla bug
  #531585, and Red Hat Bugzilla bug #478698.


glade3-3.4.5-anjuta-hang.patch:

--- NEW FILE glade3-3.4.5-anjuta-hang.patch ---
diff -urNp glade3-3.4.5.orig/gladeui/glade-widget.c glade3-3.4.5/gladeui/glade-widget.c
--- glade3-3.4.5.orig/gladeui/glade-widget.c	2009-01-04 23:58:05.000000000 +0530
+++ glade3-3.4.5/gladeui/glade-widget.c	2009-01-05 00:10:26.000000000 +0530
@@ -2142,14 +2142,15 @@ glade_widget_debug (GladeWidget *widget)
 	glade_widget_debug_real (widget, 0);
 }
 
-static gboolean
-glade_widget_show_idle (GladeWidget *widget)
+static void
+glade_widget_add_to_layout (GladeWidget *widget, GtkWidget *layout)
 {
-	/* This could be dangerous */ 
-	if (GLADE_IS_WIDGET (widget))
-		glade_widget_show (widget);
+	if (gtk_bin_get_child (GTK_BIN (layout)) != NULL)
+		gtk_container_remove (GTK_CONTAINER (layout), gtk_bin_get_child (GTK_BIN (layout)));
 
-	return FALSE;
+	gtk_container_add (GTK_CONTAINER (layout), GTK_WIDGET (widget->object));
+
+	gtk_widget_show_all (GTK_WIDGET (widget->object));
 }
 
 /**
@@ -2172,22 +2173,13 @@ glade_widget_show (GladeWidget *widget)
 		view = glade_design_view_get_from_project (glade_widget_get_project (widget));
 		layout = GTK_WIDGET (glade_design_view_get_layout (view));
 
-		/* This case causes a black window */
-		if (layout && !GTK_WIDGET_REALIZED (layout))
-		{
-			/* XXX Dangerous !!! give her a little kick */
-			g_idle_add (glade_widget_show_idle, widget);
+		if (!layout)
 			return;
-		}
-		else if (!layout)
-			return;
-		
-		if (gtk_bin_get_child (GTK_BIN (layout)) != NULL)
-			gtk_container_remove (GTK_CONTAINER (layout), gtk_bin_get_child (GTK_BIN (layout)));
 		
-		gtk_container_add (GTK_CONTAINER (layout), GTK_WIDGET (widget->object));
-
-		gtk_widget_show_all (GTK_WIDGET (widget->object));
+		if (GTK_WIDGET_REALIZED (layout))
+			glade_widget_add_to_layout (widget, layout);
+		else
+			g_signal_connect_data (layout, "map", (GCallback) glade_widget_add_to_layout, widget, NULL, G_CONNECT_AFTER | G_CONNECT_SWAPPED);
 
 	} else if (GTK_IS_WIDGET (widget->object))
 	{


Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-10/glade3.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- glade3.spec	16 Sep 2008 20:20:10 -0000	1.14
+++ glade3.spec	4 Jan 2009 19:26:36 -0000	1.15
@@ -6,13 +6,15 @@
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
 Version:	3.4.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://glade.gnome.org/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-desktop.patch
+# http://bugzilla.gnome.org/531585
+Patch0:		%{name}-%{version}-anjuta-hang.patch
+Patch1:		%{name}-%{version}-desktop.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -74,6 +76,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-static --enable-gtk-doc
@@ -190,6 +193,11 @@
 %{_includedir}/libgladeui-1.0/gladeui/*
 
 %changelog
+* Mon Jan 05 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-2
+- Added patch to prevent Anjuta from hanging on startup from GNOME that was
+  mistakenly left out from the upstream tarball. Closes GNOME Bugzilla bug
+  #531585, and Red Hat Bugzilla bug #478698.
+
 * Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-1
 - Version bump to 3.4.5.