app: don't use GLIB_CHECK_VERSION (2, 39, 90) for win32 argv parsing

Desktop / GNOME / GIMP - Michael Natterer [gimp.org] - 12 August 2014 08:37 UTC

Instead, use the new APIs unconditionally.

###

diff --git a/app/main.c b/app/main.c
index c8fa6f6..2038657 100644
--- a/app/main.c
+++ b/app/main.c
@@ -338,15 +338,11 @@ main (int argc,

g_set_application_name (GIMP_NAME);

-#if GLIB_CHECK_VERSION (2, 39, 90)
#ifdef G_OS_WIN32
argv = g_win32_get_command_line ();
#else
argv = g_strdupv (argv);
#endif
-#else
- argv = g_strdupv (argv);
-#endif

basename = g_path_get_basename (argv[0]);
g_set_prgname (basename);
@@ -403,11 +399,7 @@ main (int argc,

app_libs_init (context, no_interface);

-#if GLIB_CHECK_VERSION (2, 39, 90)
if (! g_option_context_parse_strv (context, &argv, &error))
-#else
- if (! g_option_context_parse (context, &argc, &argv, &error))
-#endif
{
if (error)
{

4d15f21 app: don't use GLIB_CHECK_VERSION (2, 39, 90) for win32 argv parsing
app/main.c | 8 --------
1 file changed, 8 deletions(-)

Upstream: git.gnome.org

  • Share