Merge branch 'master' into project-tree-model

ChangeLog

@@ -1,5 +1,7 @@
 2010-04-14  Tristan Van Berkom <tvb@gnome.org>
 
+	* configure.ac, NEWS: Rolling Glade 3.7.1
+
 	* gladeui/glade-widget.c: Added some clarification to the docs of glade_widget_get_children(),
 	  fixed glade_widget_get_children() to not call g_list_append() in a loop.
 
@@ -8,7 +10,7 @@
 	* gladeui/glade-app.c: Allow destruction/recreation of the GladeApp object
 
 	* gladeui/glade-signal-editor.[ch]: Some refactoring to make the signal editor
-	  object itself a dockable widget and remove some cruft api.
+	  object itself a dockable widget and remove some cruft api (bug 618020)
 
 	* gladeui/glade-project.[ch]: Implement GtkTreeModel
 

NEWS

@@ -1,4 +1,39 @@
 
+===========
+Glade 3.7.1
+===========
+	- Changed "Close without saving" acelerator key from 'c' to 'w', (Aaron Brown, bug 612538)
+	- Save Glade files with UTF-8 encoding (Christian Persch, bug 596205)
+	- Save maximized window state of all windows in session data (Marco Diego Aurélio Mesquita, bug 607670)
+	- use g_timeout_add_seconds() (Javier Jardón, bug 581255)
+	- Fixed signal name serialization in GtkBuilder format to use '-' instead of '_' (bug 600031)
+	- Disable orientation properties completely and disregard them wherever they cause breakage
+	  (Federico Mena Quintero, bug 594231)
+	- Now print a summery of all missing icons at startup instead of a warning for each missing icon
+	- Fixed some remaining crashers introduced by recent GSEAL patches
+	- Integrated GtkToolPalette as the internal implementation of Glade's palette (bug 613956).
+	- Added tooltip to palette (bug 558983)
+	- Revamped internal treeview support, less warnings and better refresh of workspace when
+	  editing cell renderer attributes and liststores.
+	- Glade now loads/saves the "swapped" <signal> attribute.
+	- Signal editor revamped to now:
+	   o show documentation links
+	   o show warning icons for version mismatches
+	   o edit "swapped" attribute
+	   o edit the user-data object using an object selection dialog.
+	   o now the signal editor is a proper widget-class (Johannes Schmid, bug 618020)
+	- Disallow adding of non-scrollable widgets to scrolled windows (now an informative
+	  popup comes up instead).
+	- Fixed hangs in menu/treeview editors (Marco Diego Aurélio Mesquita, bug 609612)
+	- Changed the old glade-cell-renderer-button for a new activatable pixbuf renderer
+	  glade-cell-renderer-icon.[ch].
+	- Added support to add GtkActions to GtkActionGroups
+	- Added support to edit the <accelerator> for an action when in a group.
+	- Added notebook tabs to the Glade frontend with informative labels (per open project).
+	- Stop showing preferences dialog at startup time (bug 574095)
+	- GladeProject now implements GtkTreeModel and GladeInspector view saves lots of code (Johannes Schmid)
+	- Allow destruction of GladeApp object (Johannes Schmid, bug 618468).
+
 ===========
 Glade 3.7.0
 ===========

configure.ac

@@ -4,7 +4,7 @@ AC_PREREQ(2.52)
 
 m4_define(glade_major_version, 3)
 m4_define(glade_minor_version, 7)
-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],
@@ -52,8 +52,8 @@ AM_PROG_LIBTOOL
 # 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=3
+GLADE_REVISION=0
-GLADE_CURRENT=9
+GLADE_CURRENT=10
 GLADE_AGE=0
 GLADE_CURRENT_MINUS_AGE=`expr $GLADE_CURRENT - $GLADE_AGE`
 AC_SUBST(GLADE_REVISION)
@@ -121,7 +121,7 @@ GTK_DOC_CHECK(1.9)
 dnl ================================================================
 dnl Check for gtk+
 dnl ================================================================
-PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.19.5 gthread-2.0 libxml-2.0 >= 2.4.0])
+PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.20 gthread-2.0 libxml-2.0 >= 2.4.0])
 AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_CFLAGS)
 

gladeui/Makefile.am

@@ -115,7 +115,7 @@ libgladeuiinclude_HEADERS = \
 	glade-displayable-values.h \
 	glade-editable.h \
 	glade-editor-table.h \
-	glade-cell-renderer-icon.c
+	glade-cell-renderer-icon.h