eog r4872 - in branches/gnome-2-24: . src

[friemann svn gnome org]

Author: friemann
Date: Fri Nov 14 20:44:10 2008
New Revision: 4872
URL: http://svn.gnome.org/viewvc/eog?rev=4872&view=rev

Log:
2008-11-14  Felix Riemann  <friemann svn gnome org>

	* src/main.c: (main): Change variable name to something that should
	be less prone to produce conflicts. Should fix compilation errors 
	under Mac OS X.	Fixes bug #560065.


Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/src/main.c

Modified: branches/gnome-2-24/src/main.c
==============================================================================
--- branches/gnome-2-24/src/main.c	(original)
+++ branches/gnome-2-24/src/main.c	Fri Nov 14 20:44:10 2008
@@ -58,7 +58,7 @@
 static gboolean slide_show = FALSE;
 static gboolean disable_collection = FALSE;
 #if HAVE_DBUS
-static gboolean wait = FALSE;
+static gboolean force_new_instance = FALSE;
 #endif
 static gchar **startup_files = NULL;
 
@@ -68,7 +68,7 @@
 	{ "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, &force_new_instance, 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,7 +196,8 @@
 	set_startup_flags ();
 	
 #ifdef HAVE_DBUS
-	if (!wait && !eog_application_register_service (EOG_APP)) {
+	if (!force_new_instance &&
+	    !eog_application_register_service (EOG_APP)) {
 		if (load_files_remote ()) {
 			g_object_unref (program);
 			return 0;