diff options
Diffstat (limited to 'gladeui')
| -rw-r--r-- | gladeui/glade-app.c | 26 | ||||
| -rw-r--r-- | gladeui/glade-app.h | 3 | ||||
| -rw-r--r-- | gladeui/glade-base-editor.c | 2 | ||||
| -rw-r--r-- | gladeui/glade-widget.c | 3 |
4 files changed, 3 insertions, 31 deletions
diff --git a/gladeui/glade-app.c b/gladeui/glade-app.c index a31a2480..ee247139 100644 --- a/gladeui/glade-app.c +++ b/gladeui/glade-app.c @@ -69,10 +69,6 @@ struct _GladeAppPrivate GKeyFile *config; /* The configuration file */ - GtkWindow *transient_parent; /* If set by glade_app_set_transient_parent(); this - * will be used as the transient parent of all toplevel - * GladeWidgets. - */ GtkAccelGroup *accel_group; /* Default acceleration group for this app */ }; @@ -456,28 +452,6 @@ glade_app_config_save () return 0; } -void -glade_app_set_transient_parent (GtkWindow * parent) -{ - GladeApp *app; - - g_return_if_fail (GTK_IS_WINDOW (parent)); - - app = glade_app_get (); - app->priv->transient_parent = parent; -} - -GtkWindow * -glade_app_get_transient_parent (void) -{ - GtkWindow *parent; - GladeApp *app = glade_app_get (); - - parent = app->priv->transient_parent; - - return parent; -} - GladeApp * glade_app_get (void) { diff --git a/gladeui/glade-app.h b/gladeui/glade-app.h index dc2e91cf..b1296129 100644 --- a/gladeui/glade-app.h +++ b/gladeui/glade-app.h @@ -85,9 +85,6 @@ GladeProject* glade_app_get_project_by_path (const gchar *project_path); void glade_app_set_window (GtkWidget *window); GtkWidget* glade_app_get_window (void); -void glade_app_set_transient_parent (GtkWindow *parent); -GtkWindow *glade_app_get_transient_parent (void); - void glade_app_set_accel_group (GtkAccelGroup *accel_group); GtkAccelGroup *glade_app_get_accel_group (void); diff --git a/gladeui/glade-base-editor.c b/gladeui/glade-base-editor.c index 4e211d3e..45f5e5fa 100644 --- a/gladeui/glade-base-editor.c +++ b/gladeui/glade-base-editor.c @@ -2175,7 +2175,7 @@ glade_base_editor_help (GtkButton * button, gchar * markup) { GtkWidget *dialog; - dialog = gtk_message_dialog_new (glade_app_get_transient_parent (), + dialog = gtk_message_dialog_new (glade_app_get_window (), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, " "); diff --git a/gladeui/glade-widget.c b/gladeui/glade-widget.c index 4f1540e2..187b0884 100644 --- a/gladeui/glade-widget.c +++ b/gladeui/glade-widget.c @@ -921,7 +921,8 @@ glade_widget_constructor (GType type, if (gwidget->priv->construct_reason == GLADE_CREATE_USER) glade_widget_sync_custom_props (gwidget); - if (gwidget->priv->parent && gwidget->priv->packing_properties == NULL) + if (!gwidget->priv->internal && gwidget->priv->parent && + gwidget->priv->packing_properties == NULL) glade_widget_set_packing_properties (gwidget, gwidget->priv->parent); if (GTK_IS_WIDGET (gwidget->priv->object) && |