ekiga r6493 - in trunk: . src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Thu Jul 24 19:45:38 2008
New Revision: 6493
URL: http://svn.gnome.org/viewvc/ekiga?rev=6493&view=rev

Log:
Fixed unsensitive Forward button when it should be sensitive as
reported by Eugen. Improve a few sentences as suggested by Eugen.
Fixed crash when creating new account.


Modified:
   trunk/ChangeLog
   trunk/src/gui/assistant.cpp

Modified: trunk/src/gui/assistant.cpp
==============================================================================
--- trunk/src/gui/assistant.cpp	(original)
+++ trunk/src/gui/assistant.cpp	Thu Jul 24 19:45:38 2008
@@ -577,7 +577,8 @@
     gtk_entry_set_text (GTK_ENTRY (assistant->priv->password), account->get_password ().c_str ());
 
   set_current_page_complete (GTK_ASSISTANT (assistant),
-                             account && !account->get_username ().empty () && !account->get_password ().empty ());
+                             gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (assistant->priv->skip_ekiga_net))
+                             || (account && !account->get_username ().empty () && !account->get_password ().empty ()));
 }
 
 
@@ -593,7 +594,7 @@
   bool new_account = (account == NULL);
 
   if (new_account)
-    opal_bank->new_account (Opal::Bank::Ekiga, 
+    opal_bank->new_account (Opal::Account::Ekiga, 
                             gtk_entry_get_text (GTK_ENTRY (assistant->priv->username)),
                             gtk_entry_get_text (GTK_ENTRY (assistant->priv->password)));
   else
@@ -613,7 +614,7 @@
 
   vbox = create_page (assistant, _("Ekiga Call Out Account"), GTK_ASSISTANT_PAGE_CONTENT);
 
-  label = gtk_label_new (_("Please enter your username:"));
+  label = gtk_label_new (_("Please enter your account ID:"));
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
@@ -621,7 +622,7 @@
   gtk_entry_set_activates_default (GTK_ENTRY (assistant->priv->dusername), TRUE);
   gtk_box_pack_start (GTK_BOX (vbox), assistant->priv->dusername, FALSE, FALSE, 0);
 
-  label = gtk_label_new (_("Please enter your password:"));
+  label = gtk_label_new (_("Please enter your PIN code:"));
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
@@ -698,9 +699,9 @@
   gtk_container_add (GTK_CONTAINER (align), assistant->priv->skip_ekiga_out);
   gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE, 0);
 
-  g_signal_connect (assistant->priv->username, "changed",
+  g_signal_connect (assistant->priv->dusername, "changed",
                     G_CALLBACK (ekiga_out_info_changed_cb), assistant);
-  g_signal_connect (assistant->priv->password, "changed",
+  g_signal_connect (assistant->priv->dpassword, "changed",
                     G_CALLBACK (ekiga_out_info_changed_cb), assistant);
   g_signal_connect (assistant->priv->skip_ekiga_out, "toggled",
                     G_CALLBACK (ekiga_out_info_changed_cb), assistant);
@@ -722,7 +723,8 @@
     gtk_entry_set_text (GTK_ENTRY (assistant->priv->dpassword), account->get_password ().c_str ());
 
   set_current_page_complete (GTK_ASSISTANT (assistant),
-                             account && !account->get_username ().empty () && !account->get_password ().empty ());
+                             gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (assistant->priv->skip_ekiga_out))
+                             || (account && !account->get_username ().empty () && !account->get_password ().empty ()));
 }
 
 
@@ -738,7 +740,7 @@
   bool new_account = (account == NULL);
 
   if (new_account)
-    opal_bank->new_account (Opal::Bank::DiamondCard, 
+    opal_bank->new_account (Opal::Account::DiamondCard, 
                             gtk_entry_get_text (GTK_ENTRY (assistant->priv->dusername)),
                             gtk_entry_get_text (GTK_ENTRY (assistant->priv->dpassword)));
   else