summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Pablo Ugarte <juanpablougarte@gmail.com>2014-05-12 16:11:59 -0300
committerJuan Pablo Ugarte <juanpablougarte@gmail.com>2014-05-12 16:11:59 -0300
commit4080ba94ed676b5d5b8fe7c96333c1908ae73b9b (patch)
tree848095f47549ee3a96209635e9447c45e0249151
parent94890267857e77ba3bf388b71b25aec97783a9f2 (diff)
downloadglade-4080ba94ed676b5d5b8fe7c96333c1908ae73b9b.tar.gz
Rolling 3.8.5GLADE_3_8_5
-rw-r--r--NEWS10
-rw-r--r--configure.ac8
-rw-r--r--gladeui/Makefile.am2
-rw-r--r--po/POTFILES.in2
4 files changed, 17 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index f98b5afa..a444e3a3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,14 @@
===========
+Glade 3.8.5
+===========
+
+ - Backported topological sort object dependancy (Thomas Martitz)
+ - Closes Bug 709609 "[PATCH] Change way of sorting before writing XML output."
+ - Fixes Bug 711858 "editing glade project results in long CPU usage spikes after upgrading to 3.16 and GTK+3.10"
+ - Closes Bug 689667 "backport support for GtkComboBoxText" (Rafał Mużyło)
+ - Backported feature to make GladeProject remember unknown object classes
+
+===========
Glade 3.8.4
===========
- Added workaround for Bug 625867 "RadioButton information lost on cut+paste, add/remove parent, etc"
diff --git a/configure.ac b/configure.ac
index 2533b28f..c0c64528 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ(2.52)
m4_define(glade_major_version, 3)
m4_define(glade_minor_version, 8)
-m4_define(glade_micro_version, 4)
+m4_define(glade_micro_version, 5)
m4_define(glade_version, glade_major_version.glade_minor_version.glade_micro_version)
AC_INIT([glade3], [glade_version],
@@ -52,9 +52,9 @@ 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_CURRENT=12
-GLADE_AGE=1
+GLADE_REVISION=0
+GLADE_CURRENT=13
+GLADE_AGE=2
GLADE_CURRENT_MINUS_AGE=`expr $GLADE_CURRENT - $GLADE_AGE`
AC_SUBST(GLADE_REVISION)
AC_SUBST(GLADE_CURRENT)
diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
index 98ca9a65..11ac1691 100644
--- a/gladeui/Makefile.am
+++ b/gladeui/Makefile.am
@@ -124,7 +124,7 @@ noinst_HEADERS = \
glade-design-layout.h \
glade-object-stub.h \
glade-popup.h \
- glade-accumulators.h
+ glade-accumulators.h \
glade-tsort.h \
glade-widget-private.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c59ee530..fca74e0d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39,6 +39,7 @@ gladeui/glade-widget-action.c
gladeui/glade-named-icon-chooser-dialog.c
gladeui/icon-naming-spec.c
gladeui/glade-custom.c
+gladeui/glade-object-stub.c
# gtk plugin backend
plugins/gtk+/glade-convert.c
@@ -63,6 +64,7 @@ plugins/gtk+/glade-treeview-editor.c
plugins/gtk+/glade-entry-editor.c
plugins/gtk+/glade-activatable-editor.c
plugins/gtk+/glade-tool-item-group-editor.c
+plugins/gtk+/glade-string-list.c
# gnome plugin
plugins/gnome/bonobo.xml.in