ekiga r7188 - in trunk: . lib/engine/framework

[jpuydt svn gnome org]

Author: jpuydt
Date: Fri Oct 10 19:31:17 2008
New Revision: 7188
URL: http://svn.gnome.org/viewvc/ekiga?rev=7188&view=rev

Log:
Applied patch from Howard Chu, to sync the form dumper with Ekiga::FormVisitor, fixing #555772.

Modified:
   trunk/ChangeLog
   trunk/lib/engine/framework/form-dumper.cpp
   trunk/lib/engine/framework/form-dumper.h

Modified: trunk/lib/engine/framework/form-dumper.cpp
==============================================================================
--- trunk/lib/engine/framework/form-dumper.cpp	(original)
+++ trunk/lib/engine/framework/form-dumper.cpp	Fri Oct 10 19:31:17 2008
@@ -58,6 +58,12 @@
 }
 
 void
+Ekiga::FormDumper::link (const std::string _link, const std::string _uri)
+{
+  out << "Link: " << _link << " , Uri: " << _uri << std::endl;
+}
+
+void
 Ekiga::FormDumper::error (const std::string _error)
 {
   out << "Error: " << _error << std::endl;
@@ -156,7 +162,8 @@
 void
 Ekiga::FormDumper::editable_set (const std::string name,
 				 const std::string description,
-				 const std::set<std::string> values)
+				 const std::set<std::string> values,
+				 const std::set<std::string> proposed_values)
 {
   out << "Editable list " << name << ":" << std::endl
       << description << std::endl
@@ -165,4 +172,9 @@
        iter != values.end ();
        iter++)
     out << *iter << std::endl;
+  out << "with proposed set of :" << std::endl;
+  for (std::set<std::string>::const_iterator iter = proposed_values.begin ();
+       iter != proposed_values.end ();
+       iter++)
+    out << *iter << std::endl;
 }

Modified: trunk/lib/engine/framework/form-dumper.h
==============================================================================
--- trunk/lib/engine/framework/form-dumper.h	(original)
+++ trunk/lib/engine/framework/form-dumper.h	Fri Oct 10 19:31:17 2008
@@ -61,6 +61,9 @@
 
     void instructions (const std::string );
 
+    void link (const std::string link,
+                       const std::string uri);
+
     void error (const std::string );
 
     void hidden (const std::string name,
@@ -94,7 +97,8 @@
 
     void editable_set (const std::string name,
 		       const std::string description,
-		       const std::set<std::string> values);
+		       const std::set<std::string> values,
+		       const std::set<std::string> proposed_values);
   private:
 
     std::ostream &out;