summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.van.berkom@gmail.com>2011-10-11 16:18:44 -0400
committerTristan Van Berkom <tristan.van.berkom@gmail.com>2011-10-11 16:19:11 -0400
commit2af8a582ee19062e8b3495e80092cf94974a7490 (patch)
tree1af18cd4119c41c82a3d976f9d7d69a49efd5f49
parent75f753cac0d6fb12124dd8d05f0d05275e153d4a (diff)
downloadglade-2af8a582ee19062e8b3495e80092cf94974a7490.tar.gz
2011-10-11 Johannes Schmid <jhs@gnome.org>
* gladeui/glade-project.c: Avoid crashing if glade-previewer is not installed, bug 650899.
-rw-r--r--ChangeLog4
-rw-r--r--gladeui/glade-project.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bc0acc22..0f422b22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-11 Johannes Schmid <jhs@gnome.org>
+
+ * gladeui/glade-project.c: Avoid crashing if glade-previewer is not installed, bug 650899.
+
2011-10-11 Tristan Van Berkom <tvb@gnome.org>
* gladeui/glade-app.h: Make Glade 3.10 use new environment variables for proper
diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c
index b0244c08..9dea0a79 100644
--- a/gladeui/glade-project.c
+++ b/gladeui/glade-project.c
@@ -2013,7 +2013,9 @@ glade_project_preview (GladeProject *project, GladeWidget *gwidget)
if (!preview)
{
+ /* If the previewer program is somehow missing, this can return NULL */
preview = glade_preview_launch (gwidget, text);
+ g_return_if_fail (GLADE_IS_PREVIEW (preview));
/* Leave project data on the preview */
g_object_set_data (G_OBJECT (preview), "project", project);