diff options
| author | Elias Aebi <[email protected]> | 2013-11-15 17:52:52 +0100 |
|---|---|---|
| committer | Elias Aebi <[email protected]> | 2013-11-15 17:52:52 +0100 |
| commit | 612e6529a66899e5466b9bf4bd9bdc2443075896 (patch) | |
| tree | fc26c1088f7395add2b8a84d7c6de7fc0a8dcdf9 | |
| parent | 084bfc5807982b4f3e32850a64993766fd9993d0 (diff) | |
| download | engrampa-612e6529a66899e5466b9bf4bd9bdc2443075896.tar.bz2 engrampa-612e6529a66899e5466b9bf4bd9bdc2443075896.tar.xz | |
port to GTK3
| -rw-r--r-- | copy-n-paste/eggsmclient-private.h | 2 | ||||
| -rw-r--r-- | src/dlg-batch-add.c | 11 | ||||
| -rw-r--r-- | src/fr-window.c | 5 | ||||
| -rw-r--r-- | src/gtk-utils.c | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/copy-n-paste/eggsmclient-private.h b/copy-n-paste/eggsmclient-private.h index 2e41d6d..3462ec3 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 <gdkconfig.h> +#include <gtk/gtk.h> #include "eggsmclient.h" G_BEGIN_DECLS diff --git a/src/dlg-batch-add.c b/src/dlg-batch-add.c index 28dbc01..e9d00a9 100644 --- a/src/dlg-batch-add.c +++ b/src/dlg-batch-add.c @@ -555,7 +555,11 @@ dlg_batch_add_files (FrWindow *window, /* archive type combobox */ +#if GTK_CHECK_VERSION(2,24,0) + data->a_archive_type_combo_box = gtk_combo_box_text_new (); +#else data->a_archive_type_combo_box = gtk_combo_box_new_text (); +#endif if (data->single_file) data->supported_types = single_file_save_type; else @@ -563,8 +567,11 @@ dlg_batch_add_files (FrWindow *window, sort_mime_types_by_extension (data->supported_types); for (i = 0; data->supported_types[i] != -1; i++) - gtk_combo_box_append_text (GTK_COMBO_BOX (data->a_archive_type_combo_box), - mime_type_desc[data->supported_types[i]].default_ext); +#if GTK_CHECK_VERSION(2,24,0) + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (data->a_archive_type_combo_box), mime_type_desc[data->supported_types[i]].default_ext); +#else + gtk_combo_box_append_text (GTK_COMBO_BOX (data->a_archive_type_combo_box), mime_type_desc[data->supported_types[i]].default_ext); +#endif gtk_box_pack_start (GTK_BOX (a_archive_type_box), data->a_archive_type_combo_box, TRUE, TRUE, 0); gtk_widget_show_all (a_archive_type_box); diff --git a/src/fr-window.c b/src/fr-window.c index f48b203..12fdce6 100644 --- a/src/fr-window.c +++ b/src/fr-window.c @@ -1919,7 +1919,7 @@ fr_window_update_file_list (FrWindow *window, } else { gtk_widget_set_sensitive (window->priv->list_view, FALSE); - gtk_widget_hide_all (gtk_widget_get_parent (window->priv->list_view)); + gtk_widget_hide (gtk_widget_get_parent (window->priv->list_view)); } return; @@ -2512,7 +2512,6 @@ 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); - gtk_dialog_set_has_separator (d, FALSE); 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); @@ -5952,7 +5951,6 @@ fr_window_construct (FrWindow *window) gtk_widget_show (vbox); } gtk_widget_show (statusbar_box); - gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (window->priv->statusbar), TRUE); fr_window_attach (FR_WINDOW (window), window->priv->statusbar, FR_WINDOW_AREA_STATUSBAR); if (g_settings_get_boolean (window->priv->settings_ui, PREF_UI_VIEW_STATUSBAR)) @@ -7085,7 +7083,6 @@ 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); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); 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 5e7fff4..8082127 100644 --- a/src/gtk-utils.c +++ b/src/gtk-utils.c @@ -78,7 +78,6 @@ _gtk_message_dialog_new (GtkWindow *parent, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); 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); @@ -214,7 +213,6 @@ _gtk_request_dialog_run (GtkWindow *parent, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); 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); @@ -306,7 +304,6 @@ _gtk_yesno_dialog_new (GtkWindow *parent, content_area = gtk_dialog_get_content_area (GTK_DIALOG (d)); - gtk_dialog_set_has_separator (GTK_DIALOG (d), FALSE); 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); @@ -394,7 +391,6 @@ _gtk_error_dialog_new (GtkWindow *parent, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); 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); |