org.guifications.gf2: 976ff54433d93cd1217c2326f700c1c446d83b59

[nosnilmot at guifications.org]

-----------------------------------------------------------------
Revision: 976ff54433d93cd1217c2326f700c1c446d83b59
Ancestor: 5f734c015e5481988792a576c27cf1aa86b530d7
Author: nosnilmot at guifications.org
Date: 2008-03-13T01:36:18
Branch: org.guifications.gf2

Modified files:
        ChangeLog src/gf_action.c src/gf_display.c src/gf_event.c

ChangeLog: 

Memory leak fixes

-----------------------------------------------------------------
This revision's diffstat output:
 ChangeLog        |    1 +
 src/gf_action.c  |    7 ++++---
 src/gf_display.c |    9 +++++++--
 src/gf_event.c   |    1 +
 4 files changed, 13 insertions(+), 5 deletions(-)
-------------- next part --------------
============================================================
--- ChangeLog	1b34625c58efcbfcf64ce1ffc8ed439bcd7132d9
+++ ChangeLog	3fb8fc6936d4532f6c7b6f85883a49b757af02ab
@@ -1,7 +1,8 @@ Version 2.17 ;
 Version 2.17 ;
   * Made the nick-said notification not fire if your nick is in another word.
     For example, if my nick is grim, it will not fire when someone says
 	grimmy.
+  * Memory leak fixes
 
 Version 2.16 12/16/07:
   * Really fixed the G_GNUC_NULL_TERMINATED errors on non-Windows platforms.
============================================================
--- src/gf_action.c	030c97c735ecceafe02e2ce45d2cb35706dd0598
+++ src/gf_action.c	2647509b1de6c2245dd24ce585893a1c41281ed1
@@ -74,8 +74,8 @@ gf_action_destroy(GfAction *action) {
 gf_action_destroy(GfAction *action) {
 	g_return_if_fail(action);
 
-	if(action->name)
-		g_free(action->name);
+	g_free(action->name);
+	g_free(action->i18n);
 
 	g_free(action);
 	action = NULL;
@@ -216,8 +216,9 @@ gf_actions_uninit() {
 
 	for(l = actions; l; l = ll) {
 		ll = l->next;
-
+		GfAction *action = GF_ACTION(l->data);
 		gf_actions_remove_action(GF_ACTION(l->data));
+		gf_action_destroy(action);
 	}
 
 	g_list_free(actions);
============================================================
--- src/gf_display.c	8f2fc03766383153ec8f0e0a0553b8ff58f7d214
+++ src/gf_display.c	96a418d2fd233f0f412b1992c316970aa59244ec
@@ -989,6 +989,8 @@ gf_display_condense(GfEventInfo *info) {
 					if(!(buddy1->account == buddy2->account &&
 					    !strcmp(ck1, ck2)))
 					{
+						g_free(ck2);
+						ck2 = NULL;
 						if(priority1 >= priority2) {
 							gf_event_info_set_is_contact(info, TRUE);
 							gf_display_destroy(display);
@@ -997,9 +999,10 @@ gf_display_condense(GfEventInfo *info) {
 							ret = TRUE;
 							break;
 						}
+					} else {
+						g_free(ck2);
+						ck2 = NULL;
 					}
-
-					g_free(ck2);
 				}
 			}
 
@@ -1032,6 +1035,8 @@ gf_display_condense(GfEventInfo *info) {
 					ret = TRUE;
 					break;
 				}
+			} else {
+				g_free(ck2);
 			}
 		}
 	}
============================================================
--- src/gf_event.c	cfc1852faa151087ce8f02adef8fc6c80e18b73d
+++ src/gf_event.c	29afd52c19c951f7fa7acffcd4ab55db809c9d26
@@ -125,6 +125,7 @@ gf_event_destroy(GfEvent *event) {
 	g_free(event->n_type);
 	g_free(event->name);
 	g_free(event->description);
+	g_free(event->tokens);
 
 	g_free(event);
 }