Commit 12ca59bc authored by Tristan Van Berkom's avatar Tristan Van Berkom
Browse files

Rolling Glade 3.6.0


	* NEWS, configure.ac: Rolling Glade 3.6.0

	* gladeui/glade-command.c: Remove widgets from their project before removing
	  them from their parents (fixes bug 567809)

	* src/glade-window.c: Dont access NULL GError when glade_project_save()
	  returns FALSE with no error (user canceled save) (Fixed bug 574706).


svn path=/trunk/; revision=2170
parent cae49920
2009-03-16 Tristan Van Berkom <tvb@gnome.org>
* NEWS, configure.ac: Rolling Glade 3.6.0
* gladeui/glade-command.c: Remove widgets from their project before removing
them from their parents (fixes bug 567809)
* src/glade-window.c: Dont access NULL GError when glade_project_save()
returns FALSE with no error (user canceled save) (Fixed bug 574706).
2009-03-09 Juan Pablo Ugarte <juanpablougarte@gmail.com>
* gladeui/glade-property.c: reverted fix for bug #573513. (bug #574260)
......
===========
Glade 3.6.0
===========
- Fixed bugs 574260, 573513, 573453, 574706, 567809 (Juan Pablo Ugarte, Ryu Jinno, myself)
New and updated translations
============================
- Kostas Papadimas (el)
- Claude Paroz (fr)
- Kenneth Nielsen (da)
- Ani Peter (ml)
- Ignacio Casal Quinteiro (gl)
- Krishnababu K (te)
- Gintautas Miliauskas (lt)
- Duarte Loreto (pt)
- Manoj Kumar Giri (or)
- Petr Kovar (cs)
- Milo Casagrande (it)
- Theppitak Karoonboonyanan (th)
- Philip Withnall (en_GB)
- Daniel Nylander (sv)
- Nickolay V. Shmyrev (ru)
- Ilkka Tuohela (fi)
- Christian Kirbach, Hendrik Richter (de)
- Baris Cicek (tr)
- Philip Withnall (en_GB)
- Raivis Dejus (lv)
- Changwoo Ryu (ko)
- Jorge Gonzalez (es)
- Daniel Nylander (sv)
- Kenneth Nielsen (da)
- Gabor Kelemen (hu)
- Inaki Larranaga Murgoitio (eu)
- Clytie Siddall (vi)
- Og Maciel, Jonh Wendell (pt_BR)
- Claude Paroz (fr)
===========
Glade 3.5.7
===========
......
......@@ -3,8 +3,8 @@ 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, 5)
m4_define(glade_micro_version, 7)
m4_define(glade_minor_version, 6)
m4_define(glade_micro_version, 0)
m4_define(glade_version, glade_major_version.glade_minor_version.glade_micro_version)
AC_INIT([glade3], [glade_version],
......@@ -47,7 +47,7 @@ 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=1
GLADE_REVISION=2
GLADE_CURRENT=9
GLADE_AGE=0
GLADE_CURRENT_MINUS_AGE=`expr $GLADE_CURRENT - $GLADE_AGE`
......
......@@ -1384,6 +1384,7 @@ glade_command_add_execute (GladeCommandAddRemove *me)
/* Toplevels get pasted to the active project */
add_project = (me->from_clipboard && cdata->widget->parent == NULL) ?
active_project : me->project;
glade_project_add_object (add_project, cdata->project, cdata->widget->object);
for (l = cdata->reffed; l; l = l->next)
......@@ -1413,14 +1414,6 @@ glade_command_remove_execute (GladeCommandAddRemove *me)
{
cdata = list->data;
if (cdata->parent)
{
if (cdata->placeholder)
glade_widget_replace(cdata->parent, cdata->widget->object, G_OBJECT (cdata->placeholder));
else
glade_widget_remove_child (cdata->parent, cdata->widget);
}
glade_project_remove_object(GLADE_PROJECT (cdata->widget->project), cdata->widget->object);
for (l = cdata->reffed; l; l = l->next)
......@@ -1429,6 +1422,14 @@ glade_command_remove_execute (GladeCommandAddRemove *me)
glade_project_remove_object(GLADE_PROJECT (cdata->widget->project), reffed->object);
}
if (cdata->parent)
{
if (cdata->placeholder)
glade_widget_replace(cdata->parent, cdata->widget->object, G_OBJECT (cdata->placeholder));
else
glade_widget_remove_child (cdata->parent, cdata->widget);
}
glade_widget_hide (cdata->widget);
}
......
......@@ -1181,10 +1181,14 @@ save (GladeWindow *window, GladeProject *project, const gchar *path)
{
/* Reset path so future saves will prompt the file chooser */
glade_project_reset_path (project);
glade_util_ui_message (GTK_WIDGET (window), GLADE_UI_ERROR, NULL,
_("Failed to save %s: %s"),
display_path, error->message);
g_error_free (error);
if (error)
{
glade_util_ui_message (GTK_WIDGET (window), GLADE_UI_ERROR, NULL,
_("Failed to save %s: %s"),
display_path, error->message);
g_error_free (error);
}
g_free (display_path);
return;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment