#10725: cleanup client logs

gnome/src/contacts/calltree.c

@@ -1048,6 +1048,11 @@ remove_conference(GtkTreeModel *model, GtkTreePath *path UNUSED, GtkTreeIter *it
 
 void calltree_remove_conference(calltab_t* tab, const conference_obj_t* conf)
 {
+    if(conf == NULL) {
+        ERROR("Could not remove conference, conference pointer is NULL");
+        return;
+    }
+
     ConferenceRemoveCtx context = {tab, conf};
     GtkTreeStore *store = tab->store;
     GtkTreeModel *model = GTK_TREE_MODEL(store);

gnome/src/contacts/conferencelist.c

@@ -111,7 +111,6 @@ void conferencelist_remove(calltab_t *tab, const gchar* const conf)
     gchar *c = (gchar*) conferencelist_get(tab, conf);
 
     if (c == NULL) {
-        ERROR("ConferenceList: Error: Could not find conference %s", conf);
         return;
     }
 
@@ -130,7 +129,6 @@ conference_obj_t* conferencelist_get(calltab_t *tab, const gchar* const conf_id)
     GList *c = g_queue_find_custom(tab->conferenceQueue, conf_id, is_confID_confstruct);
 
     if (c == NULL) {
-        ERROR("ConferenceList: Error: Could not find conference %s", conf_id);
         return NULL;
     }
 

gnome/src/dbus/dbus.c

@@ -154,7 +154,6 @@ incoming_message_cb(DBusGProxy *proxy UNUSED, const gchar *callID UNUSED,
         id = call->_callID;
     } else {
         conference_obj_t *conf = conferencelist_get(current_calls_tab, callID);
-
         if (!conf) {
             ERROR("Message received, but no recipient found");
             return;
@@ -279,7 +278,6 @@ conference_changed_cb(DBusGProxy *proxy UNUSED, const gchar *confID,
     DEBUG("DBUS: Conference state changed: %s\n", state);
 
     conference_obj_t* changed_conf = conferencelist_get(current_calls_tab, confID);
-
     if (changed_conf == NULL) {
         ERROR("DBUS: Conference is NULL in conference state changed");
         return;
@@ -353,8 +351,13 @@ static void
 conference_removed_cb(DBusGProxy *proxy UNUSED, const gchar *confID,
                       void *foo UNUSED)
 {
-    DEBUG("DBUS: Conference removed %s", confID);
+    DEBUG("Conference removed %s", confID);
     conference_obj_t *c = conferencelist_get(current_calls_tab, confID);
+    if(c == NULL) {
+        ERROR("Could not find conference %s from list", confID);
+        return;
+    }
+
     calltree_remove_conference(current_calls_tab, c);
 
     im_widget_update_state(IM_WIDGET(c->_im_widget), FALSE);