diff options
| author | Felix Riemann <friemann@svn.gnome.org> | 2008-11-14 20:44:15 +0000 |
|---|---|---|
| committer | Felix Riemann <friemann@src.gnome.org> | 2008-11-14 20:44:15 +0000 |
| commit | 986d39484f6eeffd020b8b3c4a4e0ac92cc396d9 (patch) | |
| tree | d579492cfb23b00a8925b469d5eb4bedef5b3e61 /src/main.c | |
| parent | 9b7705c84dcb3420f66970d720127a2af3701b39 (diff) | |
| download | eog-986d39484f6eeffd020b8b3c4a4e0ac92cc396d9.tar.gz | |
Change variable name to something that should be less prone to produce
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.
svn path=/trunk/; revision=4873
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -58,7 +58,7 @@ static gboolean fullscreen = FALSE; 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 @@ static const GOptionEntry goption_options[] = { "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 @@ main (int argc, char **argv) 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; |