ekiga r6413 - in trunk: lib/engine/gui/gtk-frontend src/gui

[jpuydt svn gnome org]

Author: jpuydt
Date: Sat Jun 28 11:57:21 2008
New Revision: 6413
URL: http://svn.gnome.org/viewvc/ekiga?rev=6413&view=rev

Log:
Yet another round of leaks...

Modified:
   trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp
   trunk/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
   trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
   trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
   trunk/src/gui/accounts.cpp
   trunk/src/gui/statusmenu.cpp

Modified: trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp	Sat Jun 28 11:57:21 2008
@@ -448,6 +448,7 @@
                       COLUMN_NAME, book.get_name ().c_str (),
                       COLUMN_BOOK_POINTER, &book, COLUMN_VIEW, view,
                       -1);
+  g_object_unref (book_icon);
   gtk_tree_selection_select_iter (self->priv->selection, &iter);
 }
 
@@ -537,13 +538,6 @@
 
   self = ADDRESSBOOK_WINDOW (obj);
 
-  if (self->priv->store) {
-
-    gtk_tree_store_clear (self->priv->store);
-    g_object_unref (self->priv->store);
-    self->priv->store = NULL;
-  }
-
   if (self->priv->menu_item_view) {
 
     g_object_unref (self->priv->menu_item_view);
@@ -689,7 +683,7 @@
                                           G_TYPE_POINTER,
                                           G_TYPE_OBJECT);
   view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (self->priv->store));
-  g_object_ref (self->priv->store);
+  g_object_unref (self->priv->store);
   gtk_container_add (GTK_CONTAINER (frame), view);
   gtk_widget_set_size_request (GTK_WIDGET (view), 125, -1);
   gtk_paned_add1 (GTK_PANED (hpaned), frame);

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	Sat Jun 28 11:57:21 2008
@@ -438,6 +438,8 @@
                       COLUMN_PHONE, phone.c_str (), 
                       COLUMN_PIXBUF, icon, -1);
 
+  g_object_unref (icon);
+
   if (GDK_IS_WINDOW (GTK_WIDGET (self)->window))
     gdk_window_set_cursor (GTK_WIDGET (self)->window, NULL);
 }
@@ -629,6 +631,7 @@
                               G_TYPE_STRING);
 
   gtk_tree_view_set_model (result->priv->tree_view, GTK_TREE_MODEL (store));
+  g_object_unref (store);
 
   /* Name */
   column = gtk_tree_view_column_new ();

Modified: trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp	Sat Jun 28 11:57:21 2008
@@ -208,6 +208,7 @@
 			      G_TYPE_STRING);
 
   tree = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
+  g_object_unref (store);
   gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree), FALSE);
   gtk_container_add (GTK_CONTAINER (result), tree);
 

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	Sat Jun 28 11:57:21 2008
@@ -1135,6 +1135,7 @@
 
   filtered = gtk_tree_model_filter_new (GTK_TREE_MODEL (self->priv->store),
 					NULL);
+  g_object_unref (self->priv->store);
   self->priv->tree_view =
     GTK_TREE_VIEW (gtk_tree_view_new_with_model (filtered));
   g_object_unref (filtered);

Modified: trunk/src/gui/accounts.cpp
==============================================================================
--- trunk/src/gui/accounts.cpp	(original)
+++ trunk/src/gui/accounts.cpp	Sat Jun 28 11:57:21 2008
@@ -1574,6 +1574,7 @@
 
   aw->accounts_list = 
     gtk_tree_view_new_with_model (GTK_TREE_MODEL (list_store));
+  g_object_unref (list_store);
   gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (aw->accounts_list), TRUE);
   gtk_tree_view_set_reorderable (GTK_TREE_VIEW (aw->accounts_list), TRUE);
   g_signal_connect (G_OBJECT (aw->accounts_list), "row-activated",

Modified: trunk/src/gui/statusmenu.cpp
==============================================================================
--- trunk/src/gui/statusmenu.cpp	(original)
+++ trunk/src/gui/statusmenu.cpp	Sat Jun 28 11:57:21 2008
@@ -648,6 +648,7 @@
                                    G_TYPE_STRING,
                                    G_TYPE_INT);
   tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list_store));
+  g_object_unref (list_store);
   gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), false);
 
   column = gtk_tree_view_column_new ();
@@ -852,6 +853,7 @@
 
   gtk_combo_box_set_model (GTK_COMBO_BOX (self),
                            GTK_TREE_MODEL (self->priv->list_store));
+  g_object_unref (self->priv->list_store);
 
   renderer = gtk_cell_renderer_pixbuf_new ();
   gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self), renderer, FALSE);