diff options
| author | Huzaifa Sidhpurwala <huzaifas@redhat.com> | 2010-02-23 18:07:08 +0000 |
|---|---|---|
| committer | Lucas Rocha <lucasr@litl.com> | 2010-02-23 18:07:08 +0000 |
| commit | 3c17a5a8870422b9a9145ff805d6d3bb872dacea (patch) | |
| tree | 3d3a29dbe901def04853a35e15528ad18a1a3a0e /src/option.c | |
| parent | 078ff023621c57c7287a4978bf944d812481c82c (diff) | |
Bug 593926 - --progress needs a --nocancel option
Diffstat (limited to 'src/option.c')
| -rw-r--r-- | src/option.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c index 0e3ede5..bc09009 100644 --- a/src/option.c +++ b/src/option.c @@ -86,6 +86,7 @@ static int zenity_progress_percentage; static gboolean zenity_progress_pulsate; static gboolean zenity_progress_auto_close; static gboolean zenity_progress_auto_kill; +static gboolean zenity_progress_no_cancel; /* Question Dialog Options */ static gboolean zenity_question_active; @@ -607,6 +608,16 @@ static GOptionEntry progress_options[] = { N_("Kill parent process if cancel button is pressed"), NULL }, + { + "no-cancel", + '\0', + 0, + G_OPTION_ARG_NONE, + &zenity_progress_no_cancel, + /* xgettext: no-c-format */ + N_("Hide cancel button"), + NULL + }, { NULL } @@ -1050,7 +1061,7 @@ zenity_progress_pre_callback (GOptionContext *context, zenity_progress_pulsate = FALSE; zenity_progress_auto_close = FALSE; zenity_progress_auto_kill = FALSE; - + zenity_progress_no_cancel = FALSE; return TRUE; } @@ -1370,6 +1381,7 @@ zenity_progress_post_callback (GOptionContext *context, results->progress_data->autoclose = zenity_progress_auto_close; results->progress_data->autokill = zenity_progress_auto_kill; results->progress_data->percentage = zenity_progress_percentage; + results->progress_data->no_cancel = zenity_progress_no_cancel; } else { if (zenity_progress_pulsate) zenity_option_error (zenity_option_get_name (progress_options, &zenity_progress_pulsate), @@ -1386,6 +1398,9 @@ zenity_progress_post_callback (GOptionContext *context, if (zenity_progress_auto_kill) zenity_option_error (zenity_option_get_name (progress_options, &zenity_progress_auto_kill), ERROR_SUPPORT); + if (zenity_progress_no_cancel) + zenity_option_error (zenity_option_get_name (progress_options, &zenity_progress_no_cancel), + ERROR_SUPPORT); } return TRUE; |