diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-09-29 09:32:15 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-09-29 09:32:15 +0800 |
| commit | dc1344cd020b7c210a0777ed965397922ce1f9bf (patch) | |
| tree | c2683536bb6524facfe8dc98454bbc1096230cd2 /smclient | |
| parent | 31b57ed0383b2ea225195d4b72a872f7f2d93163 (diff) | |
| download | gsoc2013-evolution-dc1344cd020b7c210a0777ed965397922ce1f9bf.tar gsoc2013-evolution-dc1344cd020b7c210a0777ed965397922ce1f9bf.tar.gz gsoc2013-evolution-dc1344cd020b7c210a0777ed965397922ce1f9bf.tar.bz2 gsoc2013-evolution-dc1344cd020b7c210a0777ed965397922ce1f9bf.tar.lz gsoc2013-evolution-dc1344cd020b7c210a0777ed965397922ce1f9bf.tar.xz gsoc2013-evolution-dc1344cd020b7c210a0777ed965397922ce1f9bf.tar.zst gsoc2013-evolution-dc1344cd020b7c210a0777ed965397922ce1f9bf.zip | |
Bump gtk+-2.0 requirement to 2.22.0.
Remove backward-compatibility hacks for older GTK+ versions.
Diffstat (limited to 'smclient')
| -rw-r--r-- | smclient/eggdesktopfile.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/smclient/eggdesktopfile.c b/smclient/eggdesktopfile.c index f264a93cdb..b546978d05 100644 --- a/smclient/eggdesktopfile.c +++ b/smclient/eggdesktopfile.c @@ -909,7 +909,6 @@ parse_link (EggDesktopFile *desktop_file, return TRUE; } -#if GTK_CHECK_VERSION (2, 12, 0) static gchar * start_startup_notification (GdkDisplay *display, EggDesktopFile *desktop_file, @@ -1020,7 +1019,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, gchar *variable) @@ -1207,7 +1205,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); @@ -1218,9 +1215,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); @@ -1238,7 +1232,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); @@ -1249,7 +1242,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) |