summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <vantr@TheBully.local>2009-09-14 12:02:24 -0400
committerTristan Van Berkom <vantr@TheBully.local>2009-09-14 12:02:24 -0400
commit80e8236a074bd0d71f8299b23b6ee44d9869fd5c (patch)
tree63c5df1b2ff690e0072c3e16c4f38a86f6dbc2f6
parentb9cbed2935f1ca936778f048bdad409357bf23b2 (diff)
downloadglade-80e8236a074bd0d71f8299b23b6ee44d9869fd5c.tar.gz
Fixed gnome bug 595156 (crasher)
* gladeui/glade-widget.c: Fixed crasher while copying internal widgets (bug 595156)
-rw-r--r--ChangeLog4
-rw-r--r--gladeui/glade-widget.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b2c82a4c..ac013e83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-14 Tristan Van Berkom <tvb@gnome.org>
+
+ * gladeui/glade-widget.c: Fixed crasher while copying internal widgets (bug 595156)
+
2009-07-01 Tristan Van Berkom <tvb@gnome.org>
* plugins/gtk+/glade-gtk.c: Fixed loading state of assigned GtkTreeModels of GtkCellRendererCombo
diff --git a/gladeui/glade-widget.c b/gladeui/glade-widget.c
index 7d31616c..2bc57bea 100644
--- a/gladeui/glade-widget.c
+++ b/gladeui/glade-widget.c
@@ -1376,7 +1376,7 @@ glade_widget_dup_internal (GladeWidget *parent,
g_return_val_if_fail (parent == NULL || GLADE_IS_WIDGET (parent), NULL);
/* Dont actually duplicate internal widgets, but recurse through them anyway. */
- if (template_widget->internal)
+ if (parent && template_widget->internal)
{
GObject *internal_object = NULL;