Index: src/main.c
===================================================================
--- src/main.c	(revisión: 4483)
+++ src/main.c	(copia de trabajo)
@@ -57,6 +57,9 @@ static EogStartupFlags flags;
 static gboolean fullscreen = FALSE;
 static gboolean slide_show = FALSE;
 static gboolean disable_collection = FALSE;
+#if HAVE_DBUS
+static gboolean wait = FALSE;
+#endif
 static gchar **startup_files = NULL;
 
 static const GOptionEntry goption_options[] =
@@ -64,6 +67,9 @@ static const GOptionEntry goption_option
 	{ "fullscreen", 'f', 0, G_OPTION_ARG_NONE, &fullscreen, N_("Open in fullscreen mode"), NULL  },
 	{ "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
+	{ "wait", 'w', 0, G_OPTION_ARG_NONE, &wait, N_("Keep this instance open, even if there's already other one"), NULL },
+#endif
 	{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &startup_files, NULL, N_("[FILE...]") },
 	{ NULL }
 };
@@ -190,7 +196,7 @@ main (int argc, char **argv)
 	set_startup_flags ();
 	
 #ifdef HAVE_DBUS
-	if (!eog_application_register_service (EOG_APP)) {
+	if (!wait && !eog_application_register_service (EOG_APP)) {
 		if (load_files_remote ()) {
 			g_object_unref (program);
 			return 0;
