Ticket #17032: patch-src-main.c.diff

src/main.c

@@ -58 +58 @@
 static gboolean slide_show = FALSE;
 static gboolean disable_collection = FALSE;
 #if HAVE_DBUS
-static gboolean wait = FALSE;
+static gboolean eog_wait = FALSE;
 #endif
 static gchar **startup_files = NULL;
 
@@ -68 +68 @@
         { "disable-image-collection", 'c', 0, G_OPTION_ARG_NONE, &disable_collection, N_("Disable image collection"), NULL  },
         { "slide-show", 's', 0, G_OPTION_ARG_NONE, &slide_show, N_("Open in slide show mode"), NULL  },
 #if HAVE_DBUS
-        { "new-instance", 'n', 0, G_OPTION_ARG_NONE, &wait, N_("Start a new instance instead of reusing an existing one"), NULL },
+        { "new-instance", 'n', 0, G_OPTION_ARG_NONE, &eog_wait, N_("Start a new instance instead of reusing an existing one"), NULL },
 #endif
         { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &startup_files, NULL, N_("[FILE...]") },
         { NULL }
@@ -196 +196 @@
         set_startup_flags ();
         
 #ifdef HAVE_DBUS
-        if (!wait && !eog_application_register_service (EOG_APP)) {
+        if (!eog_wait && !eog_application_register_service (EOG_APP)) {
                 if (load_files_remote ()) {
                         g_object_unref (program);
                         return 0;