diff options
Diffstat (limited to 'plugins/groupwise-features')
| -rw-r--r-- | plugins/groupwise-features/junk-mail-settings.c | 10 | ||||
| -rw-r--r-- | plugins/groupwise-features/mail-retract.c | 16 | ||||
| -rw-r--r-- | plugins/groupwise-features/share-folder-common.c | 6 | ||||
| -rw-r--r-- | plugins/groupwise-features/status-track.c | 4 |
4 files changed, 24 insertions, 12 deletions
diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c index b868e28c5a..192b4f2b0d 100644 --- a/plugins/groupwise-features/junk-mail-settings.c +++ b/plugins/groupwise-features/junk-mail-settings.c @@ -62,6 +62,7 @@ void gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view) { GtkWidget *dialog ,*w, *notebook, *box; + GtkWidget *content_area; JunkSettings *junk_tab; gint page_count =0; EGwConnection *cnc; @@ -86,9 +87,10 @@ gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view) GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); gtk_window_set_default_size ((GtkWindow *) dialog, 292, 260); gtk_widget_ensure_style (dialog); - gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *) dialog)->vbox, 12); + gtk_container_set_border_width (GTK_CONTAINER (content_area), 12); box = gtk_vbox_new (FALSE, 6); w = gtk_label_new (""); msg = g_strdup_printf("<b>%s</b>", _("Junk Mail Settings")); @@ -105,12 +107,12 @@ gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view) notebook = gtk_notebook_new (); gtk_notebook_append_page ((GtkNotebook *)notebook, box, NULL); gtk_box_pack_start ( - (GtkBox *) ((GtkDialog *) dialog)->vbox, - notebook, TRUE, TRUE, 0); + GTK_BOX (content_area), notebook, TRUE, TRUE, 0); } if (page_count == 0) - gtk_box_pack_start ((GtkBox *) ((GtkDialog *) dialog)->vbox, box, TRUE, TRUE, 0); + gtk_box_pack_start ( + GTK_BOX (content_area), box, TRUE, TRUE, 0); g_signal_connect (dialog, "response", G_CALLBACK (junk_dialog_response), junk_tab); gtk_widget_show_all (dialog); diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c index 17d5c7a554..69b9acd5f0 100644 --- a/plugins/groupwise-features/mail-retract.c +++ b/plugins/groupwise-features/mail-retract.c @@ -66,6 +66,7 @@ gw_retract_mail_cb (GtkAction *action, EShellView *shell_view) CamelStore *store; gchar *id = NULL; GtkWidget *confirm_dialog, *confirm_warning; + GtkWidget *content_area; gint n; g_return_if_fail (get_selected_info (shell_view, &folder, &id)); @@ -76,16 +77,21 @@ gw_retract_mail_cb (GtkAction *action, EShellView *shell_view) cnc = get_cnc (store); if (cnc && E_IS_GW_CONNECTION(cnc)) { - confirm_dialog = gtk_dialog_new_with_buttons (_("Message Retract"), GTK_WINDOW (e_shell_view_get_shell_window (shell_view)), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_YES, GTK_RESPONSE_YES, - GTK_STOCK_NO, GTK_RESPONSE_NO, NULL); + confirm_dialog = gtk_dialog_new_with_buttons ( + _("Message Retract"), + GTK_WINDOW (e_shell_view_get_shell_window (shell_view)), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_YES, GTK_RESPONSE_YES, + GTK_STOCK_NO, GTK_RESPONSE_NO, NULL); + + content_area = gtk_dialog_get_content_area ( + GTK_DIALOG (confirm_dialog)); confirm_warning = gtk_label_new (_("Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this?")); gtk_label_set_line_wrap (GTK_LABEL (confirm_warning), TRUE); gtk_label_set_selectable (GTK_LABEL (confirm_warning), TRUE); - gtk_container_add (GTK_CONTAINER ((GTK_DIALOG(confirm_dialog))->vbox), confirm_warning); + gtk_container_add (GTK_CONTAINER (content_area), confirm_warning); gtk_widget_set_size_request (confirm_dialog, 400, 100); gtk_widget_show_all (confirm_dialog); diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 41dde5a9f9..e7775b216a 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -286,6 +286,7 @@ static void new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *model) { GtkWidget *users_dialog; + GtkWidget *content_area; GtkWidget *w; struct ShareInfo *ssi; const gchar *uri; @@ -312,12 +313,13 @@ new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *m _("Users"), NULL, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); w = gtk_label_new_with_mnemonic (_("Enter the users and set permissions")); gtk_widget_show(w); - gtk_box_pack_start(GTK_BOX (GTK_DIALOG (users_dialog)->vbox), (GtkWidget *) w, TRUE, TRUE, 6); + content_area = gtk_dialog_get_content_area (GTK_DIALOG (users_dialog)); + gtk_box_pack_start(GTK_BOX (content_area), (GtkWidget *) w, TRUE, TRUE, 6); ssi->sf = share_folder_new (cnc, NULL); gtk_widget_set_sensitive (GTK_WIDGET ((ssi->sf)->table), TRUE); ssi->model = model; ssi->emfs = emfs; - gtk_widget_reparent (GTK_WIDGET ((ssi->sf)->table), GTK_DIALOG (users_dialog)->vbox); + gtk_widget_reparent (GTK_WIDGET ((ssi->sf)->table), content_area); gtk_widget_hide((GtkWidget*) emfs); gtk_window_resize (GTK_WINDOW (users_dialog), 350, 300); gtk_widget_show(users_dialog); diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index 40fbd0b562..0243e1e453 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -94,6 +94,7 @@ gw_track_message_status_cb (GtkAction *action, GtkDialog *d; GtkTable *table; GtkWidget *widget; + GtkWidget *content_area; GtkScrolledWindow *win; GtkVBox *vbox; @@ -117,12 +118,13 @@ gw_track_message_status_cb (GtkAction *action, /* Create the dialog */ d = (GtkDialog *) gtk_dialog_new (); + content_area = gtk_dialog_get_content_area (d); gtk_dialog_add_button (d, GTK_STOCK_OK, GTK_RESPONSE_OK); gtk_window_set_title (GTK_WINDOW (d), _("Message Status")); table = (GtkTable *) gtk_table_new (1, 2, FALSE); win = (GtkScrolledWindow *) gtk_scrolled_window_new (NULL, NULL); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG(d)->vbox), GTK_WIDGET (win)); + gtk_container_add (GTK_CONTAINER (content_area), GTK_WIDGET (win)); vbox = (GtkVBox *) gtk_vbox_new (FALSE, 12); gtk_scrolled_window_add_with_viewport (win, GTK_WIDGET(vbox)); gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (table), FALSE, TRUE, 0); |