diff options
| -rwxr-xr-x | plugins/spell/pluma-spell-language-dialog.c | 2 | ||||
| -rwxr-xr-x | plugins/time/pluma-time-plugin.c | 4 | ||||
| -rw-r--r-- | pluma/pluma-document.c | 4 | ||||
| -rw-r--r-- | pluma/pluma-window.c | 6 | ||||
| -rw-r--r-- | pluma/pluma.c | 2 | ||||
| -rw-r--r-- | tests/document-input-stream.c | 2 | ||||
| -rw-r--r-- | tests/document-loader.c | 2 | ||||
| -rw-r--r-- | tests/document-output-stream.c | 2 | ||||
| -rw-r--r-- | tests/document-saver.c | 2 | ||||
| -rw-r--r-- | tests/smart-converter.c | 2 |
10 files changed, 23 insertions, 5 deletions
diff --git a/plugins/spell/pluma-spell-language-dialog.c b/plugins/spell/pluma-spell-language-dialog.c index f0fdfcaa..464a0cd7 100755 --- a/plugins/spell/pluma-spell-language-dialog.c +++ b/plugins/spell/pluma-spell-language-dialog.c @@ -139,7 +139,9 @@ create_dialog (PlumaSpellLanguageDialog *dlg, NULL); gtk_window_set_title (GTK_WINDOW (dlg), _("Set language")); +#if !GTK_CHECK_VERSION (3, 0, 0) gtk_dialog_set_has_separator (GTK_DIALOG (dlg), FALSE); +#endif gtk_window_set_modal (GTK_WINDOW (dlg), TRUE); gtk_window_set_destroy_with_parent (GTK_WINDOW (dlg), TRUE); diff --git a/plugins/time/pluma-time-plugin.c b/plugins/time/pluma-time-plugin.c index a1b8e354..b275ea41 100755 --- a/plugins/time/pluma-time-plugin.c +++ b/plugins/time/pluma-time-plugin.c @@ -770,7 +770,9 @@ get_configure_dialog (PlumaTimePlugin *plugin) } gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE); +#if !GTK_CHECK_VERSION (3, 0, 0) gtk_dialog_set_has_separator (GTK_DIALOG (dialog->dialog), FALSE); +#endif sf = get_selected_format (plugin); create_formats_list (dialog->list, sf, plugin); @@ -934,7 +936,9 @@ get_choose_format_dialog (GtkWindow *parent, gtk_window_group_add_window (wg, GTK_WINDOW (err_dialog)); gtk_window_set_resizable (GTK_WINDOW (err_dialog), FALSE); +#if !GTK_CHECK_VERSION (3, 0, 0) gtk_dialog_set_has_separator (GTK_DIALOG (err_dialog), FALSE); +#endif gtk_dialog_set_default_response (GTK_DIALOG (err_dialog), GTK_RESPONSE_OK); gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (err_dialog))), diff --git a/pluma/pluma-document.c b/pluma/pluma-document.c index ec53a315..721824ae 100644 --- a/pluma/pluma-document.c +++ b/pluma/pluma-document.c @@ -39,7 +39,9 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> -#if !GTK_CHECK_VERSION (3, 0, 0) +#if GTK_CHECK_VERSION (3, 0, 0) +#include <gtksourceview/gtksource.h> +#else #include <gtksourceview/gtksourceiter.h> #endif diff --git a/pluma/pluma-window.c b/pluma/pluma-window.c index e2041bbf..7e1cee40 100644 --- a/pluma/pluma-window.c +++ b/pluma/pluma-window.c @@ -3697,7 +3697,7 @@ bottom_panel_visibility_changed (PlumaPanel *bottom_panel, gboolean visible; GtkAction *action; - visible = GTK_WIDGET_VISIBLE (bottom_panel); + visible = GTK_WIDGET_VISIBLE (GTK_WIDGET (bottom_panel)); if (pluma_prefs_manager_bottom_panel_visible_can_set ()) pluma_prefs_manager_set_bottom_panel_visible (visible); @@ -4169,7 +4169,7 @@ pluma_window_create_tab (PlumaWindow *window, -1, jump_to); - if (!GTK_WIDGET_VISIBLE (window)) + if (!GTK_WIDGET_VISIBLE (GTK_WIDGET (window))) { gtk_window_present (GTK_WINDOW (window)); } @@ -4221,7 +4221,7 @@ pluma_window_create_tab_from_uri (PlumaWindow *window, jump_to); - if (!GTK_WIDGET_VISIBLE (window)) + if (!GTK_WIDGET_VISIBLE (GTK_WIDGET (window))) { gtk_window_present (GTK_WINDOW (window)); } diff --git a/pluma/pluma.c b/pluma/pluma.c index a2e911af..7fbe58cb 100644 --- a/pluma/pluma.c +++ b/pluma/pluma.c @@ -397,7 +397,7 @@ on_message_received (const char *message, * terminal. We also need to make sure that the window * has been realized otherwise it will not work. lame. */ - if (!gtk_widget_get_realized (window)) + if (!gtk_widget_get_realized (GTK_WIDGET (window))) gtk_widget_realize (GTK_WIDGET (window)); #ifdef GDK_WINDOWING_X11 diff --git a/tests/document-input-stream.c b/tests/document-input-stream.c index 3a796a34..930912e6 100644 --- a/tests/document-input-stream.c +++ b/tests/document-input-stream.c @@ -140,7 +140,9 @@ test_consecutive_multibyte_big_read () int main (int argc, char *argv[]) { +#if !GLIB_CHECK_VERSION (2, 36, 0) g_type_init (); +#endif g_test_init (&argc, &argv, NULL); g_test_add_func ("/document-input-stream/empty", test_empty); diff --git a/tests/document-loader.c b/tests/document-loader.c index 42f9b638..a3e6a57b 100644 --- a/tests/document-loader.c +++ b/tests/document-loader.c @@ -238,7 +238,9 @@ test_begin_new_line_detection () int main (int argc, char *argv[]) { +#if !GLIB_CHECK_VERSION (2, 36, 0) g_type_init (); +#endif g_test_init (&argc, &argv, NULL); pluma_prefs_manager_app_init (); diff --git a/tests/document-output-stream.c b/tests/document-output-stream.c index 033cf49a..b6a474e2 100644 --- a/tests/document-output-stream.c +++ b/tests/document-output-stream.c @@ -119,7 +119,9 @@ test_big_char () int main (int argc, char *argv[]) { +#if !GLIB_CHECK_VERSION (2, 36, 0) g_type_init (); +#endif g_test_init (&argc, &argv, NULL); pluma_prefs_manager_app_init (); diff --git a/tests/document-saver.c b/tests/document-saver.c index 870e2498..707e0984 100644 --- a/tests/document-saver.c +++ b/tests/document-saver.c @@ -687,7 +687,9 @@ int main (int argc, gboolean have_unowned; gboolean have_unowned_group; +#if !GLIB_CHECK_VERSION (2, 36, 0) g_type_init (); +#endif g_test_init (&argc, &argv, NULL); pluma_prefs_manager_app_init (); diff --git a/tests/smart-converter.c b/tests/smart-converter.c index bef2a110..4f22c68c 100644 --- a/tests/smart-converter.c +++ b/tests/smart-converter.c @@ -341,7 +341,9 @@ test_guessed () int main (int argc, char *argv[]) { +#if !GLIB_CHECK_VERSION (2, 36, 0) g_type_init (); +#endif g_test_init (&argc, &argv, NULL); g_test_add_func ("/smart-converter/utf8-utf8", test_utf8_utf8); |