fixing some memory leaks

1 files changed, 53 insertions, 18 deletions

diff --git a/src/plugins/peers/peers.c b/src/plugins/peers/peers.c
index 9e5cbac0..26374e8b 100644
--- a/src/plugins/peers/peers.c
+++ b/src/plugins/peers/peers.c
@@ -50,6 +50,14 @@ static GdkPixbuf *red;
 
 static GdkPixbuf *black;
 
+struct Flags {
+  struct Flags * next;
+  char * cc;
+  GdkPixbuf * flag;
+};
+
+static struct Flags * flags;
+
 static int
 collector (void *data,
            const PeerIdentity * identity,
@@ -72,6 +80,7 @@ collector (void *data,
   cron_t now;
   int i;
   int found;
+  struct Flags * pos;
 
   hash2enc (&identity->hashPubKey, &enc);
   /* check if same peer is already in model! */
@@ -128,21 +137,36 @@ collector (void *data,
     cc = NULL;
   if (cc != NULL)
     {
-      cc = STRDUP (cc);
-      for (i = 0; i < strlen (cc); i++)
-        cc[i] = tolower (cc[i]);
-      dir = os_get_installation_path (IPK_DATADIR);
-      fn = MALLOC (strlen (dir) + 32);
-      strcpy (fn, dir);
-      strcat (fn,
-              DIR_SEPARATOR_STR ".."
-              DIR_SEPARATOR_STR "gnunet-gtk"
-              DIR_SEPARATOR_STR "flags" DIR_SEPARATOR_STR);
-      strcat (fn, cc);
-      strcat (fn, ".png");
-      FREE (dir);
-      flagBuf = gdk_pixbuf_new_from_file (fn, NULL);
-      FREE (fn);
+      pos = flags;
+      while (pos != NULL) {
+        if (0 == strcmp(pos->cc, cc)) {
+          flagBuf = pos->flag;
+          break;
+        }
+        pos = pos->next;
+      }
+      if (pos == NULL) {      
+        cc = STRDUP (cc);
+        for (i = 0; i < strlen (cc); i++)
+          cc[i] = tolower (cc[i]);
+        dir = os_get_installation_path (IPK_DATADIR);
+        fn = MALLOC (strlen (dir) + 32);
+        strcpy (fn, dir);
+        strcat (fn,
+                DIR_SEPARATOR_STR ".."
+                DIR_SEPARATOR_STR "gnunet-gtk"
+                DIR_SEPARATOR_STR "flags" DIR_SEPARATOR_STR);
+        strcat (fn, cc);
+        strcat (fn, ".png");
+        FREE (dir);
+        flagBuf = gdk_pixbuf_new_from_file (fn, NULL);
+        FREE (fn);
+        pos = MALLOC(sizeof(struct Flags));
+        pos->cc = cc;
+        pos->flag = flagBuf;
+        pos->next = flags;
+        flags = pos;
+      }
     }
   FREE (prefix);
 
@@ -156,8 +180,6 @@ collector (void *data,
     ledBuf = red;
   else
     ledBuf = black;
-  if (ledBuf != NULL)
-    g_object_ref (ledBuf);
 
   /* add to model */
   if (found == NO)
@@ -169,7 +191,6 @@ collector (void *data,
                       2, bpmFromPeer,
                       3, (const char *) &enc,
                       4, ledBuf, 5, flagBuf, 6, cc, 7, last_message, -1);
-  FREENONNULL (cc);
   FREE (hostname);
   return OK;
 }
@@ -366,6 +387,9 @@ init_peers (struct GE_Context *e, struct GC_Configuration *c)
 void
 done_peers ()
 {
+  GtkWidget *w;
+  struct Flags * pos;
+
   cron_del_job (cron, &updatePeerInfo, REFRESH_RATE, NULL);
   if (red != NULL)
     g_object_unref (red);
@@ -375,6 +399,17 @@ done_peers ()
     g_object_unref (black);
   if (yellow != NULL)
     g_object_unref (yellow);
+  w = glade_xml_get_widget (getMainXML (), "peersTreeView");
+  gtk_tree_view_set_model (GTK_TREE_VIEW (w), NULL);
+
+  while (flags != NULL) {
+    pos = flags->next;    
+    if (flags->flag != NULL)
+      g_object_unref(flags->flag);
+    FREE (flags->cc);
+    FREE(flags);
+    flags = pos;
+  }
 }