* #10725: gnome: cleanup logging

gnome/src/contacts/calltab.c

@@ -53,7 +53,7 @@ void
 calltab_select_call(calltab_t* tab, callable_obj_t * c)
 {
     g_assert(tab);
-    DEBUG("CallTab: Select call %s", c ? c->_callID : "");
+    DEBUG("Select call %s", c ? c->_callID : "");
 
     tab->selectedType = A_CALL;
     tab->selectedCall = c;
@@ -65,7 +65,7 @@ void
 calltab_select_conf(calltab_t *tab, conference_obj_t * c)
 {
     g_assert(tab);
-    DEBUG("CallTab: Selected conf %s", c ? c->_confID : "");
+    DEBUG("Selected conf %s", c ? c->_confID : "");
 
     tab->selectedType = A_CONFERENCE;
     tab->selectedConf = c;

gnome/src/contacts/conferencelist.c

@@ -44,7 +44,7 @@ static gint is_confID_confstruct(gconstpointer a, gconstpointer b)
 void conferencelist_init(calltab_t *tab)
 {
     if (tab == NULL) {
-        ERROR("ConferenceList: Error: Call tab is NULL");
+        ERROR("Call tab is NULL");
         return;
     }
 
@@ -55,7 +55,7 @@ void conferencelist_init(calltab_t *tab)
 void conferencelist_clean(calltab_t *tab)
 {
     if (tab == NULL) {
-        ERROR("ConferenceList: Error: Calltab tab is NULL");
+        ERROR("Calltab tab is NULL");
         return;
     }
 
@@ -65,7 +65,7 @@ void conferencelist_clean(calltab_t *tab)
 void conferencelist_reset(calltab_t *tab)
 {
     if (tab == NULL) {
-        ERROR("ConferenceList: Error: Calltab tab is NULL");
+        ERROR("Calltab tab is NULL");
         return;
     }
 
@@ -77,12 +77,12 @@ void conferencelist_reset(calltab_t *tab)
 void conferencelist_add(calltab_t *tab, const conference_obj_t* conf)
 {
     if (conf == NULL) {
-        ERROR("ConferenceList: Error: Conference is NULL");
+        ERROR("Conference is NULL");
         return;
     }
 
     if (tab == NULL) {
-        ERROR("ConferenceList: Error: Tab is NULL");
+        ERROR("Tab is NULL");
         return;
     }
 
@@ -96,15 +96,15 @@ void conferencelist_add(calltab_t *tab, const conference_obj_t* conf)
 
 void conferencelist_remove(calltab_t *tab, const gchar* const conf_id)
 {
-    DEBUG("ConferenceList: Remove conference %s", conf_id);
+    DEBUG("Remove conference %s", conf_id);
 
     if (conf_id == NULL) {
-        ERROR("ConferenceList: Error: Conf id is NULL");
+        ERROR("Conf id is NULL");
         return;
     }
 
     if (tab == NULL) {
-        ERROR("ConferenceList: Error: Calltab is NULL");
+        ERROR("Calltab is NULL");
         return;
     }
 
@@ -118,10 +118,10 @@ void conferencelist_remove(calltab_t *tab, const gchar* const conf_id)
 
 conference_obj_t* conferencelist_get(calltab_t *tab, const gchar* const conf_id)
 {
-    DEBUG("ConferenceList: Conference list get %s", conf_id);
+    DEBUG("Conference list get %s", conf_id);
 
     if (tab == NULL) {
-        ERROR("ConferenceList: Error: Calltab is NULL");
+        ERROR("Calltab is NULL");
         return NULL;
     }
 
@@ -136,14 +136,14 @@ conference_obj_t* conferencelist_get(calltab_t *tab, const gchar* const conf_id)
 conference_obj_t* conferencelist_get_nth(calltab_t *tab, guint n)
 {
     if (tab == NULL) {
-        ERROR("ConferenceList: Error: Calltab is NULL");
+        ERROR("Calltab is NULL");
         return NULL;
     }
 
     conference_obj_t *c = g_queue_peek_nth(tab->conferenceQueue, n);
 
     if (c == NULL) {
-        ERROR("ConferenceList: Error: Could not fetch conference %d", n);
+        ERROR("Could not fetch conference %d", n);
         return NULL;
     }
 
@@ -153,7 +153,7 @@ conference_obj_t* conferencelist_get_nth(calltab_t *tab, guint n)
 conference_obj_t *conferencelist_pop_head(calltab_t *tab)
 {
     if (tab == NULL) {
-        ERROR("ConferenceList: Error: Tab is NULL");
+        ERROR("Tab is NULL");
         return NULL;
     }
 
@@ -163,7 +163,7 @@ conference_obj_t *conferencelist_pop_head(calltab_t *tab)
 guint conferencelist_get_size(calltab_t *tab)
 {
     if (tab == NULL) {
-        ERROR("ConferenceList: Error: Calltab is NULL");
+        ERROR("Calltab is NULL");
         return 0;
     }