glade3 r2181 - in trunk: . gladeui plugins/gtk+

[tvb svn gnome org]

Author: tvb
Date: Mon Apr  6 16:39:24 2009
New Revision: 2181
URL: http://svn.gnome.org/viewvc/glade3?rev=2181&view=rev

Log:
	
	* NEWS, configure.ac: Rolling 3.6.1
	
	* gladeui/glade-command.c: Fix win32 crasher (bug 575206) again (seems
	I missed it was klass->name that was null, fixed it so it would never
	be null, and added g_assert() where the crash was.

	* gladeui/glade-widget.c: Fix broken hash table maintenence in 
	glade_widget_remove_property() (bug 575885).



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.ac
   trunk/gladeui/glade-editor.h
   trunk/gladeui/glade-project.h
   trunk/gladeui/glade-signal-editor.h
   trunk/gladeui/glade-utils.h
   trunk/plugins/gtk+/glade-button-editor.c
   trunk/plugins/gtk+/glade-gtk.c
   trunk/plugins/gtk+/glade-store-editor.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Apr  6 16:39:24 2009
@@ -1,4 +1,21 @@
 ===========
+Glade 3.6.1
+===========
+	- Fixed win32 crasher (bug 575206)
+	- Fixed crasher on internal widget selection
+	- Fixed libglade regression (libglade needs specific
+	  ordering of properties, atk props, signals and accelerators)
+	- Fixed MSYS/MinGW build (Bug 576851 â Damon Register)
+	- Disable loading and displaying of 'data' property on GtkTreeStore
+	  (only GtkListStore understands the 'data' construct).
+	- Properly initialize a GValue on stack (bug 577822 - Felix Riemann)
+
+New and updated translations
+============================
+	-  Petr Kovar, Andre Klapper (cs)
+	-  Djihed Afifi (ar)
+
+===========
 Glade 3.6.0
 ===========
 	- Fixed bugs 574260, 573513, 573453, 574706, 567809 (Juan Pablo Ugarte, Ryu Jinno, myself)

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Apr  6 16:39:24 2009
@@ -4,7 +4,7 @@
 
 m4_define(glade_major_version, 3)
 m4_define(glade_minor_version, 6)
-m4_define(glade_micro_version, 0)
+m4_define(glade_micro_version, 1)
 m4_define(glade_version, glade_major_version.glade_minor_version.glade_micro_version)
 
 AC_INIT([glade3], [glade_version],
@@ -47,7 +47,7 @@
 # If any interfaces have been added since the last public release, then increment GLADE_AGE.
 # If any interfaces have been removed since the last public release, then set GLADE_AGE to 0.
 # Reference: http://www.gnu.org/software/libtool/manual.html#Versioning
-GLADE_REVISION=2
+GLADE_REVISION=3
 GLADE_CURRENT=9
 GLADE_AGE=0
 GLADE_CURRENT_MINUS_AGE=`expr $GLADE_CURRENT - $GLADE_AGE`

Modified: trunk/gladeui/glade-editor.h
==============================================================================
--- trunk/gladeui/glade-editor.h	(original)
+++ trunk/gladeui/glade-editor.h	Mon Apr  6 16:39:24 2009
@@ -107,9 +107,6 @@
 
 	gboolean show_info; /* Whether or not to show an informational button
 			     */
-	gboolean show_context_info; /* Whether or not to show an informational
-				     * button for each property and signal.
-				     */
 };
 
 struct _GladeEditorClass
@@ -144,12 +141,8 @@
 
 void         glade_editor_show_info          (GladeEditor *editor);
 
-void         glade_editor_show_context_info  (GladeEditor *editor);
-
 void         glade_editor_hide_info          (GladeEditor *editor);
 
-void         glade_editor_hide_context_info  (GladeEditor *editor);
-
 void         glade_editor_search_doc_search  (GladeEditor *editor,
 					      const gchar *book,
 					      const gchar *page,

Modified: trunk/gladeui/glade-project.h
==============================================================================
--- trunk/gladeui/glade-project.h	(original)
+++ trunk/gladeui/glade-project.h	Mon Apr  6 16:39:24 2009
@@ -179,9 +179,6 @@
 
 void          glade_project_verify_project_for_ui (GladeProject  *project);
 
-gboolean      glade_project_is_loaded_factory_file (GladeProject       *project, 
-						    const gchar        *stock_id);
-
 GList        *glade_project_required_libs          (GladeProject       *project);
 
 void          glade_project_set_naming_policy      (GladeProject       *project,

Modified: trunk/gladeui/glade-signal-editor.h
==============================================================================
--- trunk/gladeui/glade-signal-editor.h	(original)
+++ trunk/gladeui/glade-signal-editor.h	Mon Apr  6 16:39:24 2009
@@ -97,18 +97,16 @@
 
 void glade_signal_editor_load_widget (GladeSignalEditor *editor, GladeWidget *widget);
 
-gboolean
-glade_signal_editor_handler_editing_started_default_impl (GladeSignalEditor *editor,
-							  gchar *signal_name,
-							  GtkTreeIter *iter,
-							  GtkCellEditable *editable,
-							  gpointer user_data);
-gboolean
-glade_signal_editor_userdata_editing_started_default_impl (GladeSignalEditor *editor,
-							   gchar *signal_name,
-							   GtkTreeIter *iter,
-							   GtkCellEditable *editable,
-							   gpointer user_data);
+gboolean glade_signal_editor_handler_editing_started_default_impl (GladeSignalEditor *editor,
+								   gchar *signal_name,
+								   GtkTreeIter *iter,
+								   GtkCellEditable *editable,
+								   gpointer user_data);
+gboolean glade_signal_editor_userdata_editing_started_default_impl (GladeSignalEditor *editor,
+								    gchar *signal_name,
+								    GtkTreeIter *iter,
+								    GtkCellEditable *editable,
+								    gpointer user_data);
 
 G_END_DECLS
 

Modified: trunk/gladeui/glade-utils.h
==============================================================================
--- trunk/gladeui/glade-utils.h	(original)
+++ trunk/gladeui/glade-utils.h	Mon Apr  6 16:39:24 2009
@@ -125,10 +125,6 @@
 
 time_t            glade_util_get_file_mtime        (const gchar *filename, GError **error);
 
-
-gboolean        glade_util_version_lesser_than     (gdouble a, gdouble b);            
-
-
 gchar            *glade_util_filename_to_icon_name (const gchar *value);
 
 gchar            *glade_util_icon_name_to_filename (const gchar *value);

Modified: trunk/plugins/gtk+/glade-button-editor.c
==============================================================================
--- trunk/plugins/gtk+/glade-button-editor.c	(original)
+++ trunk/plugins/gtk+/glade-button-editor.c	Mon Apr  6 16:39:24 2009
@@ -223,7 +223,7 @@
 	GladeProperty     *property;
 	GladeWidget       *gchild = NULL;
 	GtkWidget         *child, *button;
-	GValue             value;
+	GValue             value = { 0, };
 	gboolean           use_appearance = FALSE;
 
 	if (button_editor->loading || !button_editor->loaded_widget)

Modified: trunk/plugins/gtk+/glade-gtk.c
==============================================================================
--- trunk/plugins/gtk+/glade-gtk.c	(original)
+++ trunk/plugins/gtk+/glade-gtk.c	Mon Apr  6 16:39:24 2009
@@ -10169,7 +10169,9 @@
         GWA_GET_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
 
 	glade_gtk_store_read_columns (widget, node);
-	glade_gtk_store_read_data (widget, node);
+
+	if (GTK_IS_LIST_STORE (widget->object))
+		glade_gtk_store_read_data (widget, node);
 }
 
 /*--------------------------- GtkCellRenderer ---------------------------------*/

Modified: trunk/plugins/gtk+/glade-store-editor.c
==============================================================================
--- trunk/plugins/gtk+/glade-store-editor.c	(original)
+++ trunk/plugins/gtk+/glade-store-editor.c	Mon Apr  6 16:39:24 2009
@@ -204,29 +204,33 @@
 	gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (eprop), FALSE, FALSE, 4);
 
 
-	/* -------------- The data area here -------------- */
-	/* Label item in frame label widget on top.. */
-	eprop = glade_widget_adaptor_create_eprop_by_name (adaptor, "data", FALSE, TRUE);
-	store_editor->properties = g_list_prepend (store_editor->properties, eprop);
-	frame = gtk_frame_new (NULL);
-	gtk_frame_set_label_widget (GTK_FRAME (frame), eprop->item_label);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
-	gtk_box_pack_start (GTK_BOX (store_editor), frame, FALSE, FALSE, 12);
-
-	/* Alignment/Vbox in frame... */
-	alignment = gtk_alignment_new (0.5F, 0.5F, 1.0F, 1.0F);
-	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 0, 12, 0);
-	gtk_container_add (GTK_CONTAINER (frame), alignment);
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (alignment), vbox);
-
-	/* Add descriptive label */
-	label = gtk_label_new (_("Add remove and edit rows of data (you can optionally use CNTL-N to add "
-				 "new rows and the Delete key to remove the selected row)"));
-	gtk_label_set_line_wrap (GTK_LABEL(label), TRUE);
-	gtk_label_set_line_wrap_mode (GTK_LABEL(label), PANGO_WRAP_WORD);
-	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (eprop), FALSE, FALSE, 4);
+	if (adaptor->type == GTK_TYPE_LIST_STORE ||
+	    g_type_is_a (adaptor->type, GTK_TYPE_LIST_STORE))
+	{
+		/* -------------- The data area here -------------- */
+		/* Label item in frame label widget on top.. */
+		eprop = glade_widget_adaptor_create_eprop_by_name (adaptor, "data", FALSE, TRUE);
+		store_editor->properties = g_list_prepend (store_editor->properties, eprop);
+		frame = gtk_frame_new (NULL);
+		gtk_frame_set_label_widget (GTK_FRAME (frame), eprop->item_label);
+		gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+		gtk_box_pack_start (GTK_BOX (store_editor), frame, FALSE, FALSE, 12);
+		
+		/* Alignment/Vbox in frame... */
+		alignment = gtk_alignment_new (0.5F, 0.5F, 1.0F, 1.0F);
+		gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 0, 12, 0);
+		gtk_container_add (GTK_CONTAINER (frame), alignment);
+		vbox = gtk_vbox_new (FALSE, 0);
+		gtk_container_add (GTK_CONTAINER (alignment), vbox);
+		
+		/* Add descriptive label */
+		label = gtk_label_new (_("Add remove and edit rows of data (you can optionally use CNTL-N to add "
+					 "new rows and the Delete key to remove the selected row)"));
+		gtk_label_set_line_wrap (GTK_LABEL(label), TRUE);
+		gtk_label_set_line_wrap_mode (GTK_LABEL(label), PANGO_WRAP_WORD);
+		gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 6);
+		gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (eprop), FALSE, FALSE, 4);
+	}		
 
 	gtk_widget_show_all (GTK_WIDGET (store_editor));