<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Aug 12, 2014 at 6:10 PM, Jonathon Jongsma <span dir="ltr"><<a href="mailto:jjongsma@redhat.com" target="_blank">jjongsma@redhat.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Instead of returning 0 for success and -1 for failure, change to a<br>
boolean success value to be more consistent with the rest of the<br>
virt-viewer code.<br>
---<br>
src/remote-viewer.c | 5 +++--<br>
src/virt-viewer-auth.c | 4 ++--<br>
src/virt-viewer-auth.h | 10 +++++-----<br>
src/virt-viewer-session-vnc.c | 10 +++++-----<br>
4 files changed, 15 insertions(+), 14 deletions(-)<br>
<br>
diff --git a/src/remote-viewer.c b/src/remote-viewer.c<br>
index 1f2fa0d..e5c97f0 100644<br>
--- a/src/remote-viewer.c<br>
+++ b/src/remote-viewer.c<br>
@@ -707,13 +707,14 @@ authenticate_cb(RestProxy *proxy, G_GNUC_UNUSED RestProxyAuth *auth,<br>
gchar *username = NULL;<br>
gchar *password = NULL;<br>
VirtViewerWindow *window;<br>
+ gboolean success = FALSE;<br>
<br>
g_object_get(proxy,<br>
"username", &username,<br>
NULL);<br>
<br>
window = virt_viewer_app_get_main_window(VIRT_VIEWER_APP(user_data));<br>
- int ret = virt_viewer_auth_collect_credentials(virt_viewer_window_get_window(window),<br>
+ success = virt_viewer_auth_collect_credentials(virt_viewer_window_get_window(window),<br>
"oVirt",<br>
NULL,<br>
&username, &password);<br>
@@ -726,7 +727,7 @@ authenticate_cb(RestProxy *proxy, G_GNUC_UNUSED RestProxyAuth *auth,<br>
<br>
g_free(username);<br>
g_free(password);<br>
- return (ret == 0);<br>
+ return success;<br>
}<br>
<br>
<br>
diff --git a/src/virt-viewer-auth.c b/src/virt-viewer-auth.c<br>
index a796619..556a10b 100644<br>
--- a/src/virt-viewer-auth.c<br>
+++ b/src/virt-viewer-auth.c<br>
@@ -36,7 +36,7 @@<br>
* field will be pre-filled with this value. The existing string will be freed<br>
* before setting the output parameter to the user-entered value.<br>
*/<br>
-int<br>
+gboolean<br>
virt_viewer_auth_collect_credentials(GtkWindow *window,<br>
const char *type,<br>
const char *address,<br>
@@ -102,7 +102,7 @@ virt_viewer_auth_collect_credentials(GtkWindow *window,<br>
gtk_widget_destroy(GTK_WIDGET(dialog));<br>
g_object_unref(G_OBJECT(creds));<br>
<br>
- return response == GTK_RESPONSE_OK ? 0 : -1;<br>
+ return response == GTK_RESPONSE_OK;<br>
}<br>
<br>
/*<br>
diff --git a/src/virt-viewer-auth.h b/src/virt-viewer-auth.h<br>
index ad932c5..85e3bbc 100644<br>
--- a/src/virt-viewer-auth.h<br>
+++ b/src/virt-viewer-auth.h<br>
@@ -32,11 +32,11 @@<br>
#include "virt-viewer-session.h"<br>
#include "virt-viewer-util.h"<br>
<br>
-int virt_viewer_auth_collect_credentials(GtkWindow *window,<br>
- const char *type,<br>
- const char *address,<br>
- char **username,<br>
- char **password);<br>
+gboolean virt_viewer_auth_collect_credentials(GtkWindow *window,<br>
+ const char *type,<br>
+ const char *address,<br>
+ char **username,<br>
+ char **password);<br>
<br>
#endif<br>
/*<br>
diff --git a/src/virt-viewer-session-vnc.c b/src/virt-viewer-session-vnc.c<br>
index e2f90f2..8de39d4 100644<br>
--- a/src/virt-viewer-session-vnc.c<br>
+++ b/src/virt-viewer-session-vnc.c<br>
@@ -294,12 +294,12 @@ virt_viewer_session_vnc_auth_credential(GtkWidget *src G_GNUC_UNUSED,<br>
}<br>
<br>
if (wantUsername || wantPassword) {<br>
- int ret = virt_viewer_auth_collect_credentials(self->priv->main_window,<br>
- "VNC", NULL,<br>
- wantUsername ? &username : NULL,<br>
- wantPassword ? &password : NULL);<br>
+ gboolean ret = virt_viewer_auth_collect_credentials(self->priv->main_window,<br>
+ "VNC", NULL,<br>
+ wantUsername ? &username : NULL,<br>
+ wantPassword ? &password : NULL);<br>
<br>
- if (ret < 0) {<br>
+ if (!ret) {<br>
vnc_display_close(self->priv->vnc);<br>
goto cleanup;<br>
}<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.9.3<br>
<br>
_______________________________________________<br>
virt-tools-list mailing list<br>
<a href="mailto:virt-tools-list@redhat.com">virt-tools-list@redhat.com</a><br>
<a href="https://www.redhat.com/mailman/listinfo/virt-tools-list" target="_blank">https://www.redhat.com/mailman/listinfo/virt-tools-list</a><br>
</font></span></blockquote></div><br><br clear="all"><div>ACK!</div>-- <br><div>Fabiano Fidêncio</div>
</div></div>