[nautilus-actions] nact/egg-desktop-file.c: get ride of tests for Gtk+ 2.12.0

[Pierre Wieser <pwieser src gnome org>]

commit e0c34200e890c715b7e8fd446fc2b878da3b4534
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sun Jan 2 13:57:55 2011 +0100

    nact/egg-desktop-file.c: get ride of tests for Gtk+ 2.12.0
    
    This is anyway the minimal required version to build Nautilus-Actions.

 ChangeLog                   |    3 +++
 src/nact/egg-desktop-file.c |    8 --------
 2 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 533e821..4f9d1b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-01-02 Pierre Wieser <pwieser trychlos org>
 
+	* src/nact/egg-desktop-file.c:
+	Get ride of tests for Gtk+ 2.12.0 as this is the minimal required version.
+
 	* src/nact/base-keysyms.h: Use GTK_CHECK_VERSION macro.
 
 	* configure.ac:
diff --git a/src/nact/egg-desktop-file.c b/src/nact/egg-desktop-file.c
index 18d20fb..011ac53 100644
--- a/src/nact/egg-desktop-file.c
+++ b/src/nact/egg-desktop-file.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)