diff options
| -rw-r--r-- | copy-n-paste/eggsmclient-private.h | 2 | ||||
| -rw-r--r-- | src/fr-window.c | 9 | ||||
| -rw-r--r-- | src/gtk-utils.c | 12 |
3 files changed, 20 insertions, 3 deletions
diff --git a/copy-n-paste/eggsmclient-private.h b/copy-n-paste/eggsmclient-private.h index 3462ec3..18daf54 100644 --- a/copy-n-paste/eggsmclient-private.h +++ b/copy-n-paste/eggsmclient-private.h @@ -20,7 +20,7 @@ #ifndef __EGG_SM_CLIENT_PRIVATE_H__ #define __EGG_SM_CLIENT_PRIVATE_H__ -#include <gtk/gtk.h> +#include <gdk/gdk.h> #include "eggsmclient.h" G_BEGIN_DECLS diff --git a/src/fr-window.c b/src/fr-window.c index b5ee695..b488b88 100644 --- a/src/fr-window.c +++ b/src/fr-window.c @@ -1926,8 +1926,7 @@ fr_window_update_file_list (FrWindow *window, } else { gtk_widget_set_sensitive (window->priv->list_view, TRUE); - if (! gtk_widget_get_visible (window->priv->list_view)) - gtk_widget_show_all (gtk_widget_get_parent (window->priv->list_view)); + gtk_widget_show_all (gtk_widget_get_parent (window->priv->list_view)); } if (window->priv->give_focus_to_the_list) { @@ -2512,6 +2511,9 @@ create_the_progress_dialog (FrWindow *window) window->priv->pd_cancel_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); d = GTK_DIALOG (window->priv->progress_dialog); +#if !GTK_CHECK_VERSION(2,22,0) + gtk_dialog_set_has_separator (d, FALSE); +#endif gtk_window_set_resizable (GTK_WINDOW (d), TRUE); gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK); gtk_window_set_default_size (GTK_WINDOW (d), PROGRESS_DIALOG_DEFAULT_WIDTH, -1); @@ -7086,6 +7088,9 @@ fr_window_view_last_output (FrWindow *window, gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); +#if !GTK_CHECK_VERSION(2,22,0) + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); +#endif gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 6); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 8); diff --git a/src/gtk-utils.c b/src/gtk-utils.c index 8082127..3c55ffe 100644 --- a/src/gtk-utils.c +++ b/src/gtk-utils.c @@ -78,6 +78,9 @@ _gtk_message_dialog_new (GtkWindow *parent, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); +#if !GTK_CHECK_VERSION(2,22,0) + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); +#endif gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); gtk_container_set_border_width (GTK_CONTAINER (content_area), 6); gtk_box_set_spacing (GTK_BOX (content_area), 8); @@ -213,6 +216,9 @@ _gtk_request_dialog_run (GtkWindow *parent, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); +#if !GTK_CHECK_VERSION(2,22,0) + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); +#endif gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); gtk_container_set_border_width (GTK_CONTAINER (content_area), 6); gtk_box_set_spacing (GTK_BOX (content_area), 8); @@ -304,6 +310,9 @@ _gtk_yesno_dialog_new (GtkWindow *parent, content_area = gtk_dialog_get_content_area (GTK_DIALOG (d)); +#if !GTK_CHECK_VERSION(2,22,0) + gtk_dialog_set_has_separator (GTK_DIALOG (d), FALSE); +#endif gtk_container_set_border_width (GTK_CONTAINER (d), 6); gtk_container_set_border_width (GTK_CONTAINER (content_area), 6); gtk_box_set_spacing (GTK_BOX (content_area), 8); @@ -391,6 +400,9 @@ _gtk_error_dialog_new (GtkWindow *parent, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); +#if !GTK_CHECK_VERSION(2,22,0) + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); +#endif gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); gtk_container_set_border_width (GTK_CONTAINER (content_area), 6); gtk_box_set_spacing (GTK_BOX (content_area), 8); |