Updating branch refs/heads/master
to 47c0e40e14e9ffbceccecdf090027f9050e1edfd (commit)
from dd037637961e26994a33adc38f6fe6d7ce74d14c (commit)
commit 47c0e40e14e9ffbceccecdf090027f9050e1edfd
Author: Sean Davis <[email protected]>
Date: Fri Oct 5 07:58:42 2012 -0400
Fix for when to display minimal/main dialogs.
dialogs/display-settings/main.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 736cb01..cd9fa11 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1969,15 +1969,12 @@ main (gint argc, gchar **argv)
if (xfce_titled_dialog_get_type () == 0)
return EXIT_FAILURE;
- if (!minimal)
+ if (xfce_randr->noutput <= 1 || !minimal)
{
display_settings_show_main_dialog( display, event_base, error );
}
else
{
- if (xfce_randr->noutput < 2)
- goto cleanup;
-
display_settings_show_minimal_dialog ( display, event_base, error
);
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
