Rolling 3.18GLADE_3_18_0

Glade registration, point to production url.

4 files changed, 34 insertions, 7 deletions

diff --git a/NEWS b/NEWS
index 5e97453f..8e392a8e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,31 @@
 ============
+Glade 3.18.0
+============
+
+	- Added License property to Glade project
+	- Added realtime preview for custom CSS
+	- Added support for previewing templates
+	- glade-previewer added --slideshow option
+	- Fixed Bug 702314 "Cancelling an Add Parent action is destructive"
+	- pango attribute editor: don't write on cancel for color/font (Timm Bäder)
+	- Fixed bug 711568 "[PATCH] glade crashes upon startup" (thanks to Lubomir Rintel)
+	- Fixed Bug 712289 "Glade silently fails to open malformed ui file"
+	- Sort object dependancy before saving using a topological sorting algorithm
+	- Fixed Bug 709609 "[PATCH] Change way of sorting before writing XML output."
+	- Fixed Bug 711858 "editing glade project results in long CPU usage spikes after upgrading to 3.16 and GTK+3.10" 
+	- Fixed <requires> tag output
+	- Fixed cellrenderer model column combobox chooser.
+	- Fixed issue with numeric property editors.
+	- Restored shortcuts function in workspace.
+	- Added new jhbuild based bundling system for 64bit linux bundles. (Tristan Van Berkom)
+	- Bug 720585 - Fix order of customized property output.
+	- gladeui: fix a pair of printf security problems (Ryan Lortie)
+	- Added Registration & User Survey Dialog in Help menu
+	- Fixed bug 723819 "Correct bounds checking for design view highlight" (Chris Johns)
+	- Fixed bug #721098 "Anjuta hangs when opening project"
+	- GtkGrid: Don't save width/height at their default values (Kalev Lember)
+
+============
 Glade 3.16.0
 ============
 
diff --git a/configure.ac b/configure.ac
index cbfd0775..836ea99b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
 m4_define(glade_major_version, 3)
-m4_define(glade_minor_version, 16)
+m4_define(glade_minor_version, 18)
 m4_define(glade_micro_version, 0)
 m4_define(glade_version, glade_major_version.glade_minor_version.glade_micro_version)
 
@@ -53,9 +53,9 @@ AC_PATH_PROG(DLLTOOL, dlltool)
 # 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/libtool.html#Versioning
 
-GLADE_REVISION=2
-GLADE_CURRENT=6
-GLADE_AGE=0
+GLADE_REVISION=0
+GLADE_CURRENT=7
+GLADE_AGE=1
 GLADE_CURRENT_MINUS_AGE=`expr $GLADE_CURRENT - $GLADE_AGE`
 AC_SUBST(GLADE_REVISION)
 AC_SUBST(GLADE_CURRENT)
@@ -145,7 +145,7 @@ GOBJECT_INTROSPECTION_CHECK([1.32.0])
 dnl ================================================================
 dnl Check for gtk+
 dnl ================================================================
-GTK_REQUIRED=3.10.0
+GTK_REQUIRED=3.11.0
 PKG_CHECK_MODULES([GTK],[
   gtk+-3.0 >= $GTK_REQUIRED
   gmodule-2.0
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index 70e74b4c..1e067300 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -1,5 +1,5 @@
 <glade-catalog name="gtk+"
-	       version="3.10"
+	       version="3.12"
 	       targetable="3.8,3.6,3.4,3.2,3.0"
 	       icon-prefix="gtk"
 	       library="gladegtk"
diff --git a/src/glade-registration.c b/src/glade-registration.c
index 8941561f..8db8e5e9 100644
--- a/src/glade-registration.c
+++ b/src/glade-registration.c
@@ -519,7 +519,7 @@ on_registration_dialog_response (GtkDialog *dialog, gint response_id)
   glade_registration_http_post (GLADE_REGISTRATION (dialog),
                                 priv->http,
                                 priv->cancellable,
-                                "/~jpu/glade/registration_master.php",
+                                "/~jpu/glade/registration.php",
                                 post);
   
   g_string_free (post, TRUE);