diff options
| author | infirit <[email protected]> | 2014-05-16 20:12:42 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-05-16 20:12:42 +0200 |
| commit | 65886d8d05867862632319982af408ed03b6f96c (patch) | |
| tree | 3334b39cce54540ea9a3fff096f1b504ee9da595 | |
| parent | 754805fd9153815bb4af4544db68e93af49ddf80 (diff) | |
| download | mate-panel-65886d8d05867862632319982af408ed03b6f96c.tar.bz2 mate-panel-65886d8d05867862632319982af408ed03b6f96c.tar.xz | |
Drop support for gtk+ < 2.24
| -rw-r--r-- | mate-panel/libegg/eggdesktopfile.c | 8 | ||||
| -rw-r--r-- | mate-panel/panel-menu-button.c | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/mate-panel/libegg/eggdesktopfile.c b/mate-panel/libegg/eggdesktopfile.c index fbd4f30e..384fd475 100644 --- a/mate-panel/libegg/eggdesktopfile.c +++ b/mate-panel/libegg/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/mate-panel/panel-menu-button.c b/mate-panel/panel-menu-button.c index 4b2c8402..e7325645 100644 --- a/mate-panel/panel-menu-button.c +++ b/mate-panel/panel-menu-button.c @@ -1059,11 +1059,7 @@ panel_menu_button_accessible_get_n_children (AtkObject *obj) { g_return_val_if_fail (PANEL_IS_MENU_BUTTON_ACCESSIBLE (obj), 0); -#if GTK_CHECK_VERSION (2, 21, 0) return gtk_accessible_get_widget (GTK_ACCESSIBLE (obj)) ? 1 : 0; -#else - return GTK_ACCESSIBLE (obj)->widget ? 1 : 0; -#endif } static AtkObject * @@ -1078,11 +1074,7 @@ panel_menu_button_accessible_ref_child (AtkObject *obj, if (index != 0) return NULL; -#if GTK_CHECK_VERSION (2, 21, 0) if (!(button = PANEL_MENU_BUTTON (gtk_accessible_get_widget (GTK_ACCESSIBLE (obj))))) -#else - if (!(button = PANEL_MENU_BUTTON (GTK_ACCESSIBLE (obj)->widget))) -#endif return NULL; if (!(menu = panel_menu_button_create_menu (button))) |