diff options
| author | Tristan Van Berkom <vantr@TheBully.local> | 2009-06-20 11:32:59 -0400 |
|---|---|---|
| committer | Tristan Van Berkom <vantr@TheBully.local> | 2009-06-20 11:32:59 -0400 |
| commit | a862f710dba7d50a3fc025676eb5fce6fe6b0ecf (patch) | |
| tree | abfb9098ee2ff5815a7a9dcb8c99b389f4b167e1 | |
| parent | db2769e89d24e8f2ddb3a196c646a5357d2cda11 (diff) | |
| parent | 020ae58855c7affdfa8c5c748ea69514a41e1631 (diff) | |
| download | glade-a862f710dba7d50a3fc025676eb5fce6fe6b0ecf.tar.gz | |
Fixing merge conflict
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gladeui/glade-widget.c | 4 |
2 files changed, 9 insertions, 0 deletions
@@ -2,6 +2,11 @@ * plugins/gtk+/gtk+.xml.in: Make GtkMessageDialog texts translatable (bug 586063) +2009-06-18 James Liggett <jrliggett@cox.net> + + * gladeui/glade-widget.c: Make sure that the project view is not + NULL in glade_widget_show. (bug 585860) + 2009-06-15 Tristan Van Berkom <tvb@gnome.org> * plugins/gtk+/gtk+.xml.in: Make assistant page-titles translatable (bug 503146), marked since 2.10 on diff --git a/gladeui/glade-widget.c b/gladeui/glade-widget.c index b938bb59..2e216db7 100644 --- a/gladeui/glade-widget.c +++ b/gladeui/glade-widget.c @@ -1962,6 +1962,10 @@ glade_widget_show (GladeWidget *widget) view = glade_design_view_get_from_project (glade_widget_get_project (widget)); + + if (!view) + return; + layout = GTK_WIDGET (glade_design_view_get_layout (view)); if (!layout) |