ekiga r7364 - in trunk/lib/engine/gui: gtk-core gtk-frontend

[jpuydt svn gnome org]

Author: jpuydt
Date: Sun Nov 16 09:53:21 2008
New Revision: 7364
URL: http://svn.gnome.org/viewvc/ekiga?rev=7364&view=rev

Log:
Removed log printing and uncommented the needed gmref_dec in the roster and book view

Modified:
   trunk/lib/engine/gui/gtk-core/gm-refcounted-boxed.cpp
   trunk/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
   trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp

Modified: trunk/lib/engine/gui/gtk-core/gm-refcounted-boxed.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-core/gm-refcounted-boxed.cpp	(original)
+++ trunk/lib/engine/gui/gtk-core/gm-refcounted-boxed.cpp	Sun Nov 16 09:53:21 2008
@@ -41,7 +41,6 @@
 gmrefcounted_boxed_copy (GmRefCounted* obj)
 {
   gmref_inc (obj);
-  g_print ("%s, %p -> %d\n", __PRETTY_FUNCTION__, obj, gmref_count (obj));
   return obj;
 }
 

Modified: trunk/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/book-view-gtk.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/book-view-gtk.cpp	Sun Nov 16 09:53:21 2008
@@ -331,7 +331,7 @@
 
 	  contact->populate_menu (builder);
 	}
-	//gmref_dec (contact);
+	gmref_dec (contact);
       }
     }
     gtk_tree_path_free (path);
@@ -422,7 +422,7 @@
       if (iter_contact == &*contact)
         found = TRUE;
 
-      //gmref_dec (iter_contact);
+      gmref_dec (iter_contact);
     } while (!found && gtk_tree_model_iter_next (model, iter));
   }
 
@@ -657,7 +657,7 @@
       item = gtk_separator_menu_item_new ();
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
       contact->populate_menu (builder);
-      //gmref_dec (contact);
+      gmref_dec (contact);
     }
   }
 }

Modified: trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp	Sun Nov 16 09:53:21 2008
@@ -527,7 +527,7 @@
 	  && (presentity->get_presence () == "offline"
 	      || presentity->get_presence () == "unknown"))
 	offline_count++;
-      //gmref_dec (presentity);
+      gmref_dec (presentity);
     } while (gtk_tree_model_iter_next (model, &loop_iter));
   }
 
@@ -652,8 +652,8 @@
     }
 
     g_free (name);
-    //gmref_dec (heap);
-    //gmref_dec (presentity);
+    gmref_dec (heap);
+    gmref_dec (presentity);
   } else {
 
     g_signal_emit (self, signals[PRESENTITY_SELECTED_SIGNAL], 0, NULL);
@@ -724,8 +724,8 @@
 	break; // shouldn't happen
       }
       g_free (name);
-      //gmref_dec (heap);
-      //gmref_dec (presentity);
+      gmref_dec (heap);
+      gmref_dec (presentity);
     }
     gtk_tree_path_free (path);
   }
@@ -912,8 +912,6 @@
 
   roster_view_gtk_find_iter_for_heap (self, heap, &iter);
 
-  g_print ("%s, %p -> %d\n", __PRETTY_FUNCTION__, &*heap, gmref_count (&*heap));
-
   gtk_tree_store_set (self->priv->store, &iter,
 		      COLUMN_TYPE, TYPE_HEAP,
 		      COLUMN_HEAP, &*heap,
@@ -1117,7 +1115,7 @@
       gtk_tree_model_get (model, iter, COLUMN_HEAP, &iter_heap, -1);
       if (iter_heap == &*heap)
 	found = TRUE;
-      //gmref_dec (iter_heap);
+      gmref_dec (iter_heap);
     } while (!found && gtk_tree_model_iter_next (model, iter));
   }
 
@@ -1182,7 +1180,7 @@
       gtk_tree_model_get (model, iter, COLUMN_PRESENTITY, &iter_presentity, -1);
       if (iter_presentity == &*presentity)
 	found = TRUE;
-      //gmref_dec (iter_presentity);
+      gmref_dec (iter_presentity);
     } while (!found && gtk_tree_model_iter_next (model, iter));
   }