ekiga r7386 - trunk/lib/engine/gui/gtk-frontend

[jpuydt svn gnome org]

Author: jpuydt
Date: Thu Nov 20 13:12:00 2008
New Revision: 7386
URL: http://svn.gnome.org/viewvc/ekiga?rev=7386&view=rev

Log:
Kicked all memory management out of the GUI : it's just not working as expected

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/roster-view-gtk.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	Thu Nov 20 13:12:00 2008
@@ -39,7 +39,6 @@
 
 #include "gmstockicons.h"
 
-#include "gm-refcounted-boxed.h"
 #include "addressbook-window.h"
 #include "book-view-gtk.h"
 #include "menu-builder-gtk.h"
@@ -410,7 +409,6 @@
                               (gpointer) menu_builder.menu);
           }
           g_object_ref_sink (G_OBJECT (menu_builder.menu));
-	  gmref_dec (book_iter);
         }
         gtk_tree_path_free (path);
       }
@@ -537,12 +535,9 @@
 
       if (&*book == book_iter) {
 
-	gmref_dec (book_iter);
         break;
       }
 
-      gmref_dec (book_iter);
-
       if (!gtk_tree_model_iter_next (store, iter))
         return FALSE;
     }
@@ -709,7 +704,7 @@
   store = gtk_tree_store_new (NUM_COLUMNS,
                               GDK_TYPE_PIXBUF,
                               G_TYPE_STRING,
-                              GM_TYPE_REFCOUNTED,
+                              G_TYPE_POINTER,
                               G_TYPE_OBJECT);
   self->priv->tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
   g_object_unref (store);

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	Thu Nov 20 13:12:00 2008
@@ -43,7 +43,6 @@
 #include "book-view-gtk.h"
 
 #include "gmstockicons.h"
-#include "gm-refcounted-boxed.h"
 #include "menu-builder-tools.h"
 #include "menu-builder-gtk.h"
 
@@ -331,7 +330,6 @@
 
 	  contact->populate_menu (builder);
 	}
-	gmref_dec (contact);
       }
     }
     gtk_tree_path_free (path);
@@ -422,7 +420,6 @@
       if (iter_contact == &*contact)
         found = TRUE;
 
-      gmref_dec (iter_contact);
     } while (!found && gtk_tree_model_iter_next (model, iter));
   }
 
@@ -568,7 +565,7 @@
 		    G_CALLBACK (on_contact_clicked), result);
 
   store = gtk_list_store_new (COLUMN_NUMBER,
-			      GM_TYPE_REFCOUNTED,
+			      G_TYPE_POINTER,
                               GDK_TYPE_PIXBUF,
                               G_TYPE_STRING);
 
@@ -657,7 +654,6 @@
       item = gtk_separator_menu_item_new ();
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
       contact->populate_menu (builder);
-      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	Thu Nov 20 13:12:00 2008
@@ -40,7 +40,6 @@
 #include <vector>
 #include <glib/gi18n.h>
 
-#include "gm-refcounted-boxed.h"
 #include "gm-cell-renderer-bitext.h"
 #include "gmcellrendererexpander.h"
 #include "gmstockicons.h"
@@ -528,7 +527,6 @@
 	  && (presentity->get_presence () == "offline"
 	      || presentity->get_presence () == "unknown"))
 	offline_count++;
-      gmref_dec (presentity);
     } while (gtk_tree_model_iter_next (model, &loop_iter));
   }
 
@@ -653,8 +651,6 @@
     }
 
     g_free (name);
-    gmref_dec (heap);
-    gmref_dec (presentity);
   } else {
 
     g_signal_emit (self, signals[PRESENTITY_SELECTED_SIGNAL], 0, NULL);
@@ -728,8 +724,6 @@
 	break; // shouldn't happen
       }
       g_free (name);
-      gmref_dec (heap);
-      gmref_dec (presentity);
     }
     gtk_tree_path_free (path);
   }
@@ -1119,7 +1113,6 @@
       gtk_tree_model_get (model, iter, COLUMN_HEAP, &iter_heap, -1);
       if (iter_heap == &*heap)
 	found = TRUE;
-      gmref_dec (iter_heap);
     } while (!found && gtk_tree_model_iter_next (model, iter));
   }
 
@@ -1184,7 +1177,6 @@
       gtk_tree_model_get (model, iter, COLUMN_PRESENTITY, &iter_presentity, -1);
       if (iter_presentity == &*presentity)
 	found = TRUE;
-      gmref_dec (iter_presentity);
     } while (!found && gtk_tree_model_iter_next (model, iter));
   }
 
@@ -1424,8 +1416,8 @@
 
   self->priv->store = gtk_tree_store_new (COLUMN_NUMBER,
                                           G_TYPE_INT,         // type
-                                          GM_TYPE_REFCOUNTED, // heap
-                                          GM_TYPE_REFCOUNTED, // presentity
+                                          G_TYPE_POINTER,     // heap
+                                          G_TYPE_POINTER,     // presentity
                                           G_TYPE_STRING,      // name
                                           G_TYPE_STRING,      // status
                                           G_TYPE_STRING,      // presence