rpms/glade3/F-10 glade3-3.4.5-edit-menuitem.patch, NONE, 1.1 glade3.spec, 1.17, 1.18

[Debarshi Ray]

Author: rishi

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

Modified Files:
	glade3.spec 
Added Files:
	glade3-3.4.5-edit-menuitem.patch 
Log Message:
* Sun Apr 12 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-4
- Backported fix to prevent a crash when editing a GtkMenuItem.(GNOME Bugzilla
  #533471)


glade3-3.4.5-edit-menuitem.patch:

--- NEW FILE glade3-3.4.5-edit-menuitem.patch ---
diff -urNp glade3-3.4.5.orig/gladeui/glade-base-editor.c glade3-3.4.5/gladeui/glade-base-editor.c
--- glade3-3.4.5.orig/gladeui/glade-base-editor.c	2009-04-12 02:41:26.000000000 +0530
+++ glade3-3.4.5/gladeui/glade-base-editor.c	2009-04-12 02:42:55.000000000 +0530
@@ -377,7 +377,7 @@ static gboolean
 glade_base_editor_update_properties_idle (gpointer data)
 {
 	GladeBaseEditor *editor = (GladeBaseEditor *)data;
-	glade_base_editor_treeview_cursor_changed (NULL, editor);
+	glade_base_editor_treeview_cursor_changed (editor->priv->treeview, editor);
 	editor->priv->properties_idle = 0;
 	return FALSE;
 }
@@ -1146,7 +1146,7 @@ glade_base_editor_change_type (GladeBase
 	}
 
 	/* Set the name */
-	glade_widget_set_name (gchild_new, name);
+	glade_command_set_name (gchild_new, name);
 	
 	if (GTK_IS_WIDGET (child_new))
 		gtk_widget_show_all (GTK_WIDGET (child_new));
diff -urNp glade3-3.4.5.orig/gladeui/glade-project.c glade3-3.4.5/gladeui/glade-project.c
--- glade3-3.4.5.orig/gladeui/glade-project.c	2009-04-12 02:41:26.000000000 +0530
+++ glade3-3.4.5/gladeui/glade-project.c	2009-04-12 02:48:22.000000000 +0530
@@ -1030,6 +1030,7 @@ glade_project_release_widget_name (Glade
 
 	g_return_if_fail (GLADE_IS_PROJECT (project));
 	g_return_if_fail (GLADE_IS_WIDGET (glade_widget));
+	g_return_if_fail (widget_name);
 
 	do
 	{


Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-10/glade3.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- glade3.spec	26 Feb 2009 21:08:05 -0000	1.17
+++ glade3.spec	11 Apr 2009 22:22:40 -0000	1.18
@@ -6,7 +6,7 @@
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
 Version:	3.4.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://glade.gnome.org/
@@ -15,6 +15,8 @@
 # http://bugzilla.gnome.org/531585
 Patch0:		%{name}-%{version}-anjuta-hang.patch
 Patch1:		%{name}-%{version}-desktop.patch
+# http://bugzilla.gnome.org/533471
+Patch2:		%{name}-%{version}-edit-menuitem.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -77,6 +79,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --disable-static --enable-gtk-doc
@@ -193,6 +196,10 @@
 %{_includedir}/libgladeui-1.0/gladeui
 
 %changelog
+* Sun Apr 12 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-4
+- Backported fix to prevent a crash when editing a GtkMenuItem.(GNOME Bugzilla
+  #533471)
+
 * Sat Jan 31 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-3
 - Fixed unowned directories in libgladeui-devel. (Red Hat Bugzilla #483311)
 
@@ -208,6 +215,7 @@
 * Wed Apr 19 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.4-1
 - Version bump to 3.4.4.
   * Duplicate widget names not allowed in a project.
+  * Fixed crash when adding items to a GtkComboBox. (GNOME Bugzilla #528511)
   * Translation updates: sq, tr, bg, da, es, en_GB, ml, pt_BR and hi.
   * http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/glade3-3.4.4.news