[Telepathy-commits] [telepathy-gabble/master] conn-olpc: coding style tweaks

[Guillaume Desmottes]

20080728160359-7fe3f-ddfb831f04d8235e340bf24e0212ea8dd275611a.gz
---
 src/conn-olpc.c |   45 +++++++++++++++++++++++----------------------
 1 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/conn-olpc.c b/src/conn-olpc.c
index 3aad5db..ee1458f 100644
--- a/src/conn-olpc.c
+++ b/src/conn-olpc.c
@@ -3691,6 +3691,7 @@ create_view (GabbleConnection *conn,
   if (id == G_MAXUINT)
     {
       /* All the ID's are allocated */
+      DEBUG ("All the view ID's are already used!");
       return NULL;
     }
 
@@ -3706,17 +3707,17 @@ create_view (GabbleConnection *conn,
 }
 
 static LmHandlerResult
-buddy_query_result_cb (GabbleConnection *conn,
-                       LmMessage *sent_msg,
-                       LmMessage *reply_msg,
-                       GObject *_view,
-                       gpointer user_data)
+buddy_view_query_result_cb (GabbleConnection *conn,
+                            LmMessage *sent_msg,
+                            LmMessage *reply_msg,
+                            GObject *_view,
+                            gpointer user_data)
 {
   LmMessageNode *view_node;
   GabbleOlpcView *view = GABBLE_OLPC_VIEW (_view);
 
-  view_node = lm_message_node_get_child_with_namespace (reply_msg->node, "view",
-      NS_OLPC_BUDDY);
+  view_node = lm_message_node_get_child_with_namespace (reply_msg->node,
+      "view", NS_OLPC_BUDDY);
   if (view_node == NULL)
     return LM_HANDLER_RESULT_REMOVE_MESSAGE;
 
@@ -3784,7 +3785,7 @@ olpc_gadget_request_random_buddies (GabbleSvcOLPCGadget *iface,
   g_free (id_str);
 
   if (!_gabble_connection_send_with_reply (conn, query,
-        buddy_query_result_cb, G_OBJECT (view), NULL, NULL))
+        buddy_view_query_result_cb, G_OBJECT (view), NULL, NULL))
     {
       GError error = { TP_ERRORS, TP_ERROR_NETWORK_ERROR,
         "Failed to send buddy search query to server" };
@@ -3857,7 +3858,7 @@ olpc_gadget_search_buddies_by_properties (GabbleSvcOLPCGadget *iface,
       "property");
 
   if (!_gabble_connection_send_with_reply (conn, query,
-        buddy_query_result_cb, G_OBJECT (view), NULL, NULL))
+        buddy_view_query_result_cb, G_OBJECT (view), NULL, NULL))
     {
       GError error = { TP_ERRORS, TP_ERROR_NETWORK_ERROR,
         "Failed to send buddy search query to server" };
@@ -3923,7 +3924,7 @@ olpc_gadget_search_buddies_by_alias (GabbleSvcOLPCGadget *iface,
   g_free (id_str);
 
   if (!_gabble_connection_send_with_reply (conn, query,
-        buddy_query_result_cb, G_OBJECT (view), NULL, NULL))
+        buddy_view_query_result_cb, G_OBJECT (view), NULL, NULL))
     {
       GError error = { TP_ERRORS, TP_ERROR_NETWORK_ERROR,
         "Failed to send buddy search query to server" };
@@ -3943,17 +3944,17 @@ olpc_gadget_search_buddies_by_alias (GabbleSvcOLPCGadget *iface,
 }
 
 static LmHandlerResult
-activity_query_result_cb (GabbleConnection *conn,
-                          LmMessage *sent_msg,
-                          LmMessage *reply_msg,
-                          GObject *_view,
-                          gpointer user_data)
+activity_view_query_result_cb (GabbleConnection *conn,
+                               LmMessage *sent_msg,
+                               LmMessage *reply_msg,
+                               GObject *_view,
+                               gpointer user_data)
 {
   LmMessageNode *view_node;
   GabbleOlpcView *view = GABBLE_OLPC_VIEW (_view);
 
-  view_node = lm_message_node_get_child_with_namespace (reply_msg->node, "view",
-      NS_OLPC_ACTIVITY);
+  view_node = lm_message_node_get_child_with_namespace (reply_msg->node,
+      "view", NS_OLPC_ACTIVITY);
   if (view_node == NULL)
     return LM_HANDLER_RESULT_REMOVE_MESSAGE;
 
@@ -4021,7 +4022,7 @@ olpc_gadget_request_random_activities (GabbleSvcOLPCGadget *iface,
   g_free (id_str);
 
   if (!_gabble_connection_send_with_reply (conn, query,
-        activity_query_result_cb, G_OBJECT (view), NULL, NULL))
+        activity_view_query_result_cb, G_OBJECT (view), NULL, NULL))
     {
       GError error = { TP_ERRORS, TP_ERROR_NETWORK_ERROR,
         "Failed to send activity search query to server" };
@@ -4094,7 +4095,7 @@ olpc_gadget_search_activities_by_properties (GabbleSvcOLPCGadget *iface,
       "property");
 
   if (!_gabble_connection_send_with_reply (conn, query,
-        activity_query_result_cb, G_OBJECT (view), NULL, NULL))
+        activity_view_query_result_cb, G_OBJECT (view), NULL, NULL))
     {
       GError error = { TP_ERRORS, TP_ERROR_NETWORK_ERROR,
         "Failed to send activity search query to server" };
@@ -4175,7 +4176,7 @@ olpc_gadget_search_activities_by_participants (GabbleSvcOLPCGadget *iface,
     }
 
   if (!_gabble_connection_send_with_reply (conn, query,
-        activity_query_result_cb, G_OBJECT (view), NULL, NULL))
+        activity_view_query_result_cb, G_OBJECT (view), NULL, NULL))
     {
       GError error = { TP_ERRORS, TP_ERROR_NETWORK_ERROR,
         "Failed to send activity search query to server" };
@@ -4187,8 +4188,8 @@ olpc_gadget_search_activities_by_participants (GabbleSvcOLPCGadget *iface,
       return;
     }
 
-  gabble_svc_olpc_gadget_return_from_search_activities_by_participants (context,
-      object_path);
+  gabble_svc_olpc_gadget_return_from_search_activities_by_participants (
+      context, object_path);
 
   g_free (object_path);
   lm_message_unref (query);
-- 
1.5.6.5