diff options
| author | Javier Jardón <jjardon@gnome.org> | 2009-12-09 05:25:10 +0100 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2009-12-09 05:27:14 +0100 |
| commit | 0c6833751956587554b44741f2d3a83b14f4a854 (patch) | |
| tree | 8c11d488f94e1b54c042c863129513f77a7521e7 | |
| parent | 5c43a73ccaeca8ec6c8a7187c279f1e0501168c9 (diff) | |
| download | yelp-0c6833751956587554b44741f2d3a83b14f4a854.tar.gz | |
Removed unneded conditional code
After the bump of GTK+ version to 2.18 some code is not
needed anymore
| -rw-r--r-- | src/eggdesktopfile.c | 8 | ||||
| -rw-r--r-- | src/yelp-window.c | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/eggdesktopfile.c b/src/eggdesktopfile.c index 357e548f..c415c912 100644 --- a/src/eggdesktopfile.c +++ b/src/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/src/yelp-window.c b/src/yelp-window.c index 98b42f24..d436f24e 100644 --- a/src/yelp-window.c +++ b/src/yelp-window.c @@ -1324,18 +1324,10 @@ window_populate (YelpWindow *window) priv->back_menu); action = gtk_action_group_get_action(priv->action_group, "GoBack"); -#if GTK_CHECK_VERSION (2, 16, 0) gtk_activatable_set_related_action (GTK_ACTIVATABLE (b_proxy), action); -#else - gtk_action_connect_proxy (action, b_proxy); -#endif action = gtk_action_group_get_action (priv->action_group, "GoForward"); -#if GTK_CHECK_VERSION (2, 16, 0) gtk_activatable_set_related_action (GTK_ACTIVATABLE (f_proxy), action); -#else - gtk_action_connect_proxy (action, f_proxy); -#endif gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (f_proxy), priv->forward_menu); |