From bcb6b9fe2668c0ac479d9ed6bffac393943986c4 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sat, 11 Sep 2010 23:50:20 +0200 Subject: [PATCH] [shell] Dialogues have no separators on gtk 3 --- shell/ev-annotation-properties-dialog.c | 2 ++ shell/ev-convert-metadata.c | 4 ++++ shell/ev-password-view.c | 4 +++- shell/ev-properties-dialog.c | 4 +++- shell/ev-window.c | 2 ++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/shell/ev-annotation-properties-dialog.c b/shell/ev-annotation-properties-dialog.c index 0f5c6e17..68013f27 100644 --- a/shell/ev-annotation-properties-dialog.c +++ b/shell/ev-annotation-properties-dialog.c @@ -139,7 +139,9 @@ ev_annotation_properties_dialog_init (EvAnnotationPropertiesDialog *annot_dialog gtk_window_set_title (GTK_WINDOW (annot_dialog), _("Annotation Properties")); gtk_window_set_destroy_with_parent (GTK_WINDOW (annot_dialog), TRUE); gtk_container_set_border_width (GTK_CONTAINER (annot_dialog), 5); +#if !GTK_CHECK_VERSION (2, 90, 7) gtk_dialog_set_has_separator (dialog, FALSE); +#endif gtk_dialog_add_buttons (dialog, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, GTK_STOCK_APPLY, GTK_RESPONSE_APPLY, diff --git a/shell/ev-convert-metadata.c b/shell/ev-convert-metadata.c index 52e59fc9..5ee725c3 100644 --- a/shell/ev-convert-metadata.c +++ b/shell/ev-convert-metadata.c @@ -164,7 +164,11 @@ show_progress_dialog (ConvertData *data) dialog = gtk_dialog_new_with_buttons (_("Converting metadata"), NULL, +#if GTK_CHECK_VERSION (2, 90, 8) + 0, +#else GTK_DIALOG_NO_SEPARATOR, +#endif GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog)); diff --git a/shell/ev-password-view.c b/shell/ev-password-view.c index bb5ba313..6998b0b0 100644 --- a/shell/ev-password-view.c +++ b/shell/ev-password-view.c @@ -255,7 +255,9 @@ ev_password_view_ask_password (EvPasswordView *password_view) action_area = gtk_dialog_get_action_area (dialog); /* Set the dialog up with HIG properties */ - gtk_dialog_set_has_separator (dialog, FALSE); +#if !GTK_CHECK_VERSION (2, 90, 7) + gtk_dialog_set_has_separator (dialog, FALSE); +#endif gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */ gtk_container_set_border_width (GTK_CONTAINER (action_area), 5); diff --git a/shell/ev-properties-dialog.c b/shell/ev-properties-dialog.c index e3785bf1..dac890b8 100644 --- a/shell/ev-properties-dialog.c +++ b/shell/ev-properties-dialog.c @@ -61,7 +61,9 @@ ev_properties_dialog_init (EvPropertiesDialog *properties) gtk_window_set_title (GTK_WINDOW (properties), _("Properties")); gtk_window_set_destroy_with_parent (GTK_WINDOW (properties), TRUE); - gtk_dialog_set_has_separator (GTK_DIALOG (properties), FALSE); +#if !GTK_CHECK_VERSION (2, 90, 7) + gtk_dialog_set_has_separator (GTK_DIALOG (properties), FALSE); +#endif gtk_container_set_border_width (GTK_CONTAINER (properties), 5); gtk_box_set_spacing (content_area, 2); diff --git a/shell/ev-window.c b/shell/ev-window.c index 9aa3926b..01c5e9f7 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -4211,7 +4211,9 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window) gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)), 5); gtk_box_set_spacing (GTK_BOX (content_area), 2); +#if !GTK_CHECK_VERSION (2, 90, 7) gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); +#endif gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400); toolbar = EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar); -- 2.43.0