ekiga r7722 - in trunk: . src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Sat Mar  7 10:54:00 2009
New Revision: 7722
URL: http://svn.gnome.org/viewvc/ekiga?rev=7722&view=rev

Log:
Fixed bug #574140 (Assistant loosing values when going backward).


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	Sat Mar  7 10:54:00 2009
@@ -88,6 +88,8 @@
 
   GtkWidget *video_device;
 
+  gint last_active_page;
+
   GtkListStore *summary_model;
   std::vector<sigc::connection> connections;
 };
@@ -1464,6 +1466,7 @@
   gtk_window_set_position (GTK_WINDOW (assistant), GTK_WIN_POS_CENTER);
   gtk_container_set_border_width (GTK_CONTAINER (assistant), 12);
 
+  assistant->priv->last_active_page = 0;
   assistant->priv->icon = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
                                                     "ekiga", 48,
                                                     (GtkIconLookupFlags) 0, NULL);
@@ -1487,7 +1490,8 @@
                          GtkWidget    *page)
 {
   EkigaAssistant *assistant = EKIGA_ASSISTANT (gtkassistant);
-  gchar *title;
+  gchar *title = NULL;
+  bool forward = false;
 
   title = g_strdup_printf (_("Ekiga Configuration Assistant (%d of %d)"),
                            gtk_assistant_get_current_page (gtkassistant) + 1,
@@ -1496,6 +1500,13 @@
   gtk_window_set_title (GTK_WINDOW (assistant), title);
   g_free (title);
 
+  if (assistant->priv->last_active_page < gtk_assistant_get_current_page (gtkassistant))
+    forward = true;
+  assistant->priv->last_active_page = gtk_assistant_get_current_page (gtkassistant);
+
+  if (!forward)
+    return;
+
   if (page == assistant->priv->personal_data_page) {
     prepare_personal_data_page (assistant);
     return;