summaryrefslogtreecommitdiff
path: root/cut-n-paste/smclient
diff options
context:
space:
mode:
Diffstat (limited to 'cut-n-paste/smclient')
-rw-r--r--cut-n-paste/smclient/eggdesktopfile.c8
-rw-r--r--cut-n-paste/smclient/eggsmclient-xsmp.c4
2 files changed, 0 insertions, 12 deletions
diff --git a/cut-n-paste/smclient/eggdesktopfile.c b/cut-n-paste/smclient/eggdesktopfile.c
index 1f432adc..d50a1bcf 100644
--- a/cut-n-paste/smclient/eggdesktopfile.c
+++ b/cut-n-paste/smclient/eggdesktopfile.c
@@ -909,7 +909,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,
@@ -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, char *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)
diff --git a/cut-n-paste/smclient/eggsmclient-xsmp.c b/cut-n-paste/smclient/eggsmclient-xsmp.c
index 8d6e9f7c..78ecbaea 100644
--- a/cut-n-paste/smclient/eggsmclient-xsmp.c
+++ b/cut-n-paste/smclient/eggsmclient-xsmp.c
@@ -369,11 +369,7 @@ sm_client_xsmp_startup (EggSMClient *client,
free (ret_client_id);
gdk_threads_enter ();
-#if GTK_CHECK_VERSION (2, 24, 0)
gdk_x11_set_sm_client_id (xsmp->client_id);
-#else
- gdk_set_sm_client_id (xsmp->client_id);
-#endif
gdk_threads_leave ();
g_debug ("Got client ID \"%s\"", xsmp->client_id);