vinagre r314 - in trunk: . src

[jwendell svn gnome org]

Author: jwendell
Date: Fri May  2 14:44:06 2008
New Revision: 314
URL: http://svn.gnome.org/viewvc/vinagre?rev=314&view=rev

Log:
2008-05-02  Jonh Wendell <jwendell gnome org>

	* src/vinagre-tab.c: Initial support for VEncrypt sessions.
	Patch from Henrik Holst. Closes #530712.


Modified:
   trunk/ChangeLog
   trunk/src/vinagre-tab.c

Modified: trunk/src/vinagre-tab.c
==============================================================================
--- trunk/src/vinagre-tab.c	(original)
+++ trunk/src/vinagre-tab.c	Fri May  2 14:44:06 2008
@@ -521,21 +521,36 @@
 vnc_authentication_cb (VncDisplay *vnc, GValueArray *credList, VinagreTab *tab)
 {
   gchar *password;
+  int i;
 
-  password = vinagre_tab_find_password (tab);
-  if (!password)
-    {
-      password = ask_password (tab);
-      if (!password) {
-        vinagre_notebook_remove_tab (tab->priv->nb, tab);
-        return;
-      }
-    }
+  if (credList == NULL)
+    return;
 
-  vinagre_connection_set_password (tab->priv->conn, password);
-  vnc_display_set_credential (vnc, VNC_DISPLAY_CREDENTIAL_PASSWORD, password);
-
-  g_free (password);
+  for (i = 0; i < credList->n_values; i++) {
+    switch (g_value_get_enum (&credList->values[i]))
+      {
+        case VNC_DISPLAY_CREDENTIAL_PASSWORD:
+          password = vinagre_tab_find_password (tab);
+          if (!password)
+            {
+              password = ask_password (tab);
+              if (!password) {
+                vinagre_notebook_remove_tab (tab->priv->nb, tab);
+                return;
+              }
+            }
+
+          vinagre_connection_set_password (tab->priv->conn, password);
+          vnc_display_set_credential (vnc, VNC_DISPLAY_CREDENTIAL_PASSWORD, password);
+
+          g_free (password);
+          break;
+
+        case VNC_DISPLAY_CREDENTIAL_CLIENTNAME:
+          vnc_display_set_credential (vnc, VNC_DISPLAY_CREDENTIAL_CLIENTNAME, "vinagre");
+          break;
+      }
+  }
 }
 
 static void vnc_grab_cb (VncDisplay *vnc, VinagreTab *tab)