[ekiga] Fixed compilation with latest master

[Julien Puydt <jpuydt src gnome org>]

commit 7b57a6be8a06f30a706cf7b229ebed82eb5df057
Author: Julien Puydt <jpuydt gnome org>
Date:   Fri May 29 11:42:07 2009 +0200

    Fixed compilation with latest master
    
    Exceptions aren't used anymore.

 lib/engine/components/loudmouth/loudmouth-heap.cpp |   93 ++++++++------------
 .../components/loudmouth/loudmouth-presentity.cpp  |   51 +++++------
 2 files changed, 59 insertions(+), 85 deletions(-)
---
diff --git a/lib/engine/components/loudmouth/loudmouth-heap.cpp b/lib/engine/components/loudmouth/loudmouth-heap.cpp
index 62ca5ae..af4c6c8 100644
--- a/lib/engine/components/loudmouth/loudmouth-heap.cpp
+++ b/lib/engine/components/loudmouth/loudmouth-heap.cpp
@@ -336,24 +336,16 @@ LM::Heap::add_item_form_submitted (bool submitted,
   if ( !submitted)
     return;
 
-  try {
-
-    const std::string jid = result.text ("jid");
-    if ( !jid.empty ()) {
-
-      LmMessage* subscribe = lm_message_new (NULL, LM_MESSAGE_TYPE_PRESENCE);
-      lm_message_node_set_attributes (lm_message_get_node (subscribe),
-				      "to", jid.c_str (),
-				      "type", "subscribe",
-				      NULL);
-      lm_connection_send (connection, subscribe, NULL);
-      lm_message_unref (subscribe);
-    }
-  } catch (Ekiga::Form::not_found) {
-#ifdef __GNUC__
-    std::cerr << "Invalid form submitted to "
-	      << __PRETTY_FUNCTION__ << std::endl;
-#endif
+  const std::string jid = result.text ("jid");
+  if ( !jid.empty ()) {
+
+    LmMessage* subscribe = lm_message_new (NULL, LM_MESSAGE_TYPE_PRESENCE);
+    lm_message_node_set_attributes (lm_message_get_node (subscribe),
+				    "to", jid.c_str (),
+				    "type", "subscribe",
+				    NULL);
+    lm_connection_send (connection, subscribe, NULL);
+    lm_message_unref (subscribe);
   }
 }
 
@@ -364,43 +356,34 @@ LM::Heap::subscribe_from_form_submitted (bool submitted,
   if ( !submitted)
     return;
 
-  try {
-
-    const std::string jid = result.hidden ("jid");
-    const std::string answer = result.single_choice ("answer");
-
-    if (answer == "grant") {
-
-      LmMessage* message = lm_message_new (NULL, LM_MESSAGE_TYPE_PRESENCE);
-      lm_message_node_set_attributes (lm_message_get_node (message),
-				      "to", jid.c_str (),
-				      "type", "subscribed",
-				      NULL);
-      lm_connection_send (connection, message, NULL);
-      lm_message_unref (message);
-      LmMessage* subscribe = lm_message_new (NULL, LM_MESSAGE_TYPE_PRESENCE);
-      lm_message_node_set_attributes (lm_message_get_node (subscribe),
-				      "to", jid.c_str (),
-				      "type", "subscribe",
-				      NULL);
-      lm_connection_send (connection, subscribe, NULL);
-      lm_message_unref (subscribe);
-    } else if (answer == "refuse") {
-
-      LmMessage* message = lm_message_new (NULL, LM_MESSAGE_TYPE_PRESENCE);
-      lm_message_node_set_attributes (lm_message_get_node (message),
-				      "to", jid.c_str (),
-				      "type", "unsubscribed",
-				      NULL);
-      lm_connection_send (connection, message, NULL);
-      lm_message_unref (message);
-    }
-
-  } catch (Ekiga::Form::not_found) {
-#ifdef __GNUC__
-    std::cerr << "Invalid form submitted to "
-	      << __PRETTY_FUNCTION__ << std::endl;
-#endif
+  const std::string jid = result.hidden ("jid");
+  const std::string answer = result.single_choice ("answer");
+
+  if (answer == "grant") {
+
+    LmMessage* message = lm_message_new (NULL, LM_MESSAGE_TYPE_PRESENCE);
+    lm_message_node_set_attributes (lm_message_get_node (message),
+				    "to", jid.c_str (),
+				    "type", "subscribed",
+				    NULL);
+    lm_connection_send (connection, message, NULL);
+    lm_message_unref (message);
+    LmMessage* subscribe = lm_message_new (NULL, LM_MESSAGE_TYPE_PRESENCE);
+    lm_message_node_set_attributes (lm_message_get_node (subscribe),
+				    "to", jid.c_str (),
+				    "type", "subscribe",
+				    NULL);
+    lm_connection_send (connection, subscribe, NULL);
+    lm_message_unref (subscribe);
+  } else if (answer == "refuse") {
+
+    LmMessage* message = lm_message_new (NULL, LM_MESSAGE_TYPE_PRESENCE);
+    lm_message_node_set_attributes (lm_message_get_node (message),
+				    "to", jid.c_str (),
+				    "type", "unsubscribed",
+				    NULL);
+    lm_connection_send (connection, message, NULL);
+    lm_message_unref (message);
   }
 }
 
diff --git a/lib/engine/components/loudmouth/loudmouth-presentity.cpp b/lib/engine/components/loudmouth/loudmouth-presentity.cpp
index 5974c1d..f84079b 100644
--- a/lib/engine/components/loudmouth/loudmouth-presentity.cpp
+++ b/lib/engine/components/loudmouth/loudmouth-presentity.cpp
@@ -287,40 +287,31 @@ LM::Presentity::edit_presentity_form_submitted (bool submitted,
   if (!submitted)
     return;
 
-  try {
-
-    const std::string name = result.text ("name");
-    const std::set<std::string> groups = result.editable_set ("groups");
-    LmMessage* message = lm_message_new_with_sub_type (NULL, LM_MESSAGE_TYPE_IQ, LM_MESSAGE_SUB_TYPE_SET);
-    LmMessageNode* query = lm_message_node_add_child (lm_message_get_node (message), "query", NULL);
-    lm_message_node_set_attribute (query, "xmlns", "jabber:iq:roster");
-    LmMessageNode* node = lm_message_node_add_child (query, "item", NULL);
-
-    {
-      gchar* escaped = g_markup_escape_text (name.c_str (), -1);
-      lm_message_node_set_attributes (node,
-				      "jid", get_jid ().c_str (),
-				      "name", escaped,
-				      NULL);
-      g_free (escaped);
-    }
-
-    for (std::set<std::string>::const_iterator iter = groups.begin (); iter != groups.end (); ++iter) {
+  const std::string name = result.text ("name");
+  const std::set<std::string> groups = result.editable_set ("groups");
+  LmMessage* message = lm_message_new_with_sub_type (NULL, LM_MESSAGE_TYPE_IQ, LM_MESSAGE_SUB_TYPE_SET);
+  LmMessageNode* query = lm_message_node_add_child (lm_message_get_node (message), "query", NULL);
+  lm_message_node_set_attribute (query, "xmlns", "jabber:iq:roster");
+  LmMessageNode* node = lm_message_node_add_child (query, "item", NULL);
 
-      gchar* escaped = g_markup_escape_text (iter->c_str (), -1);
-      lm_message_node_add_child (node, "group", escaped);
-      g_free (escaped);
-    }
+  {
+    gchar* escaped = g_markup_escape_text (name.c_str (), -1);
+    lm_message_node_set_attributes (node,
+				    "jid", get_jid ().c_str (),
+				    "name", escaped,
+				    NULL);
+    g_free (escaped);
+  }
 
-    lm_connection_send (connection, message, NULL);
-    lm_message_unref (message);
+  for (std::set<std::string>::const_iterator iter = groups.begin (); iter != groups.end (); ++iter) {
 
-  } catch (Ekiga::Form::not_found) {
-#ifdef __GNUC__
-    std::cerr << "Invalid form submitted to "
-	      << __PRETTY_FUNCTION__ << std::endl;
-#endif
+    gchar* escaped = g_markup_escape_text (iter->c_str (), -1);
+    lm_message_node_add_child (node, "group", escaped);
+    g_free (escaped);
   }
+
+  lm_connection_send (connection, message, NULL);
+  lm_message_unref (message);
 }
 
 void