diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-01-31 03:03:19 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-04-08 23:05:26 +0800 |
| commit | 72797decc12602b181f69dba7c54df7a0d1b9326 (patch) | |
| tree | ecd1314c92bc26b59647b351b2d47e446f4ed21d /shell/e-shell-content.c | |
| parent | 3ba0b61f9f447b01c3a83bfb78ee33a45d413700 (diff) | |
| download | gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar.gz gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar.bz2 gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar.lz gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar.xz gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar.zst gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.zip | |
Giant leap towards GSEAL compliance.
Diffstat (limited to 'shell/e-shell-content.c')
| -rw-r--r-- | shell/e-shell-content.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c index 5d5857cfc2..658bb2a6fc 100644 --- a/shell/e-shell-content.c +++ b/shell/e-shell-content.c @@ -201,7 +201,7 @@ shell_content_size_allocate (GtkWidget *widget, priv = E_SHELL_CONTENT_GET_PRIVATE (widget); - widget->allocation = *allocation; + gtk_widget_set_allocation (widget, allocation); child = priv->searchbar; @@ -254,11 +254,13 @@ shell_content_forall (GtkContainer *container, gpointer callback_data) { EShellContentPrivate *priv; + GtkWidget *parent; priv = E_SHELL_CONTENT_GET_PRIVATE (container); + parent = gtk_widget_get_parent (priv->searchbar); if (include_internals && priv->searchbar != NULL && - container == GTK_CONTAINER (priv->searchbar->parent)) + container == GTK_CONTAINER (parent)) callback (priv->searchbar, callback_data); /* Chain up to parent's forall() method. */ @@ -409,6 +411,7 @@ e_shell_content_run_advanced_search_dialog (EShellContent *shell_content) { EShellView *shell_view; EShellWindow *shell_window; + GtkWidget *content_area; GtkWidget *dialog; GtkWidget *widget; EFilterRule *rule; @@ -445,8 +448,8 @@ e_shell_content_run_advanced_search_dialog (EShellContent *shell_content) gtk_container_set_border_width (GTK_CONTAINER (widget), 3); gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 300); - gtk_box_pack_start ( - GTK_BOX (GTK_DIALOG (dialog)->vbox), widget, TRUE, TRUE, 0); + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0); g_signal_connect_swapped ( rule, "changed", G_CALLBACK ( @@ -510,6 +513,7 @@ e_shell_content_run_save_search_dialog (EShellContent *shell_content) { EShellView *shell_view; EShellWindow *shell_window; + GtkWidget *content_area; GtkWidget *dialog; GtkWidget *widget; EFilterRule *rule; @@ -547,8 +551,8 @@ e_shell_content_run_save_search_dialog (EShellContent *shell_content) gtk_container_set_border_width (GTK_CONTAINER (widget), 3); gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 300); - gtk_box_pack_start ( - GTK_BOX (GTK_DIALOG (dialog)->vbox), widget, TRUE, TRUE, 0); + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0); g_signal_connect_swapped ( rule, "changed", G_CALLBACK ( |