diff options
| author | Tristan Van Berkom <tvb@src.gnome.org> | 2004-12-23 21:18:53 +0000 |
|---|---|---|
| committer | Tristan Van Berkom <tvb@src.gnome.org> | 2004-12-23 21:18:53 +0000 |
| commit | 593e4d945f6e8700ae1dbfa05c80363f382f857d (patch) | |
| tree | 0ea17d14149a2828138caaf2f8df971f1eeedc68 /src/glade-widget.c | |
| parent | d360794bc868d9fa10a88b1a81298d54d8926697 (diff) | |
| download | glade-593e4d945f6e8700ae1dbfa05c80363f382f857d.tar.gz | |
Bringing LIBGLADE_INTEGRATION branch up to date with patches from HEAD.POST_MERGE_2004_12_23
Bringing LIBGLADE_INTEGRATION branch up to date with patches from HEAD.
Diffstat (limited to 'src/glade-widget.c')
| -rw-r--r-- | src/glade-widget.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/glade-widget.c b/src/glade-widget.c index 63c59a88..1d7a22cd 100644 --- a/src/glade-widget.c +++ b/src/glade-widget.c @@ -513,7 +513,7 @@ glade_widget_internal_new (const gchar *name, "object", object, NULL); - return (GladeWidget *) glade_widget; + return GLADE_WIDGET (glade_widget); } /** @@ -541,7 +541,10 @@ glade_widget_new (GladeWidget *parent, GladeWidgetClass *klass, GladeProject *pr if (widget->query_user) { GladeProjectWindow *gpw = glade_project_window_get (); - glade_editor_query_popup (gpw->editor, widget); + + /* If user pressed cancel on query popup. */ + if (!glade_editor_query_dialog (gpw->editor, widget)) + return NULL; } /* Properties that have custom set_functions on them need to be |