From 271719fd4939afb1f055f07df1c96d2e2983c117 Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 20 May 2014 12:35:08 +0200 Subject: [PATCH] Drop support for gtk+ < 2.24 --- src/eggdesktopfile.c | 8 -------- src/profile-editor.c | 2 -- 2 files changed, 10 deletions(-) diff --git a/src/eggdesktopfile.c b/src/eggdesktopfile.c index c1fe0a4..72f3cfb 100644 --- a/src/eggdesktopfile.c +++ b/src/eggdesktopfile.c @@ -910,7 +910,6 @@ parse_link (EggDesktopFile *desktop_file, return TRUE; } -#if GTK_CHECK_VERSION (2, 12, 0) static char * start_startup_notification (GdkDisplay *display, EggDesktopFile *desktop_file, @@ -1022,7 +1021,6 @@ set_startup_notification_timeout (GdkDisplay *display, g_timeout_add_seconds (EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH, startup_notification_timeout, sn_data); } -#endif /* GTK 2.12 */ static GPtrArray * array_putenv (GPtrArray *env, char *variable) @@ -1209,7 +1207,6 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, } g_free (command); -#if GTK_CHECK_VERSION (2, 12, 0) startup_id = start_startup_notification (display, desktop_file, argv[0], screen_num, workspace, launch_time); @@ -1220,9 +1217,6 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, env = array_putenv (env, startup_id_env); g_free (startup_id_env); } -#else - startup_id = NULL; -#endif /* GTK 2.12 */ if (env != NULL) g_ptr_array_add (env, NULL); @@ -1240,7 +1234,6 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, if (startup_id) { -#if GTK_CHECK_VERSION (2, 12, 0) if (current_success) { set_startup_notification_timeout (display, startup_id); @@ -1251,7 +1244,6 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, g_free (startup_id); } else -#endif /* GTK 2.12 */ g_free (startup_id); } else if (ret_startup_id) diff --git a/src/profile-editor.c b/src/profile-editor.c index 442ce3b..8076827 100644 --- a/src/profile-editor.c +++ b/src/profile-editor.c @@ -468,7 +468,6 @@ profile_palette_notify_colorpickers_cb (TerminalProfile *profile, static void custom_command_entry_changed_cb (GtkEntry *entry) { -#if GTK_CHECK_VERSION (2, 16, 0) const char *command; GError *error = NULL; @@ -490,7 +489,6 @@ custom_command_entry_changed_cb (GtkEntry *entry) g_error_free (error); } -#endif /* GTK+ >= 2.16.0 */ } static void