[virt-tools-list] [virt-viewer][PATCH 3/5 v2] virt-viewer: avoid simple_message_dialog() when errors can be propagated

[Jonathon Jongsma]

On Thu, 2015-03-26 at 16:35 +0100, Fabiano Fidêncio wrote:
> Remove all the dialogs used to report errors on extract_connect_info()
> and just propagate the errors we got from the it.
> The only exception is virt_viewer_domain_event(), that is a callback
> that doesn't have GError as argument. In this specific case, we show the
> error dialog instead of propagate it.
> 
> Related: rhbz#1085216
> ---
>  src/virt-viewer.c | 13 +++----------
>  1 file changed, 3 insertions(+), 10 deletions(-)
> 
> diff --git a/src/virt-viewer.c b/src/virt-viewer.c
> index 962bdd9..3a570bb 100644
> --- a/src/virt-viewer.c
> +++ b/src/virt-viewer.c
> @@ -415,9 +415,6 @@ virt_viewer_extract_connect_info(VirtViewer *self,
>          g_set_error_literal(&err, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, msg);
>          g_free(msg);
>  
> -        virt_viewer_app_simple_message_dialog(app, _("Cannot determine the graphic type for the guest %s"),
> -                                              priv->domkey);
> -
>          goto cleanup;
>      }
>  
> @@ -457,9 +454,6 @@ virt_viewer_extract_connect_info(VirtViewer *self,
>          g_set_error_literal(&err, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, msg);
>          g_free(msg);
>  
> -        virt_viewer_app_simple_message_dialog(app, _("Cannot determine the host for the guest %s"),
> -                                              priv->domkey);
> -
>          goto cleanup;
>      }
>  
> @@ -491,9 +485,6 @@ virt_viewer_extract_connect_info(VirtViewer *self,
>          g_debug("graphics listen '%s' is not reachable from this machine",
>                  ghost ? ghost : "");
>  
> -        virt_viewer_app_simple_message_dialog(app, _("Guest '%s' is not reachable"),
> -                                              priv->domkey);
> -
>          goto cleanup;
>      }
>  
> @@ -612,8 +603,10 @@ virt_viewer_domain_event(virConnectPtr conn G_GNUC_UNUSED,
>  
>      case VIR_DOMAIN_EVENT_STARTED:
>          virt_viewer_update_display(self, dom, &error);
> -        if (error)
> +        if (error) {
> +            virt_viewer_app_simple_message_dialog(app, error->message);
>              g_clear_error(&error);
> +        }
>  
>          virt_viewer_app_activate(app, &error);
>          if (error) {


ACK