From: <the...@us...> - 2006-08-05 10:05:13
|
Revision: 16646 Author: thekingant Date: 2006-08-05 03:05:07 -0700 (Sat, 05 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16646&view=rev Log Message: ----------- Backport SVN revisions 16530, 16533 and 16534 from HEAD to v2_0_0 These are memleak fixes from sadrul Modified Paths: -------------- branches/v2_0_0/src/gtkconv.c branches/v2_0_0/src/gtknotify.c branches/v2_0_0/src/notify.c Modified: branches/v2_0_0/src/gtkconv.c =================================================================== --- branches/v2_0_0/src/gtkconv.c 2006-08-05 09:54:33 UTC (rev 16645) +++ branches/v2_0_0/src/gtkconv.c 2006-08-05 10:05:07 UTC (rev 16646) @@ -411,6 +411,7 @@ g_string_append_printf(s, "%s, ", (char *)l->data); else g_string_append_printf(s, "%s.", (char *)l->data); + g_list_free(text); } gaim_conversation_write(conv, NULL, s->str, GAIM_MESSAGE_NO_LOG, time(NULL)); Modified: branches/v2_0_0/src/gtknotify.c =================================================================== --- branches/v2_0_0/src/gtknotify.c 2006-08-05 09:54:33 UTC (rev 16645) +++ branches/v2_0_0/src/gtknotify.c 2006-08-05 10:05:07 UTC (rev 16646) @@ -53,6 +53,7 @@ GtkWidget *treeview; GtkWidget *window; gpointer user_data; + GaimNotifySearchResults *results; } GaimNotifySearchResultsData; @@ -115,7 +116,7 @@ if (id == GTK_RESPONSE_YES) { GtkTreeSelection *selection; - + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->treeview)); if (gtk_tree_selection_get_selected(selection, NULL, &iter)) @@ -191,6 +192,8 @@ button = bd->button; button->callback(gaim_account_get_connection(data->account), row, data->user_data); + g_list_foreach(row, (GFunc)g_free, NULL); + g_list_free(row); } static void * @@ -682,6 +685,7 @@ data = g_malloc(sizeof(GaimNotifySearchResultsData)); data->user_data = user_data; + data->results = results; /* Create the window */ window = gtk_window_new(GTK_WINDOW_TOPLEVEL); @@ -758,7 +762,7 @@ gaim_notify_searchresults_column_get_title(results, i-1), renderer, "text", i, NULL); } - + /* Setup the button area */ button_area = gtk_hbutton_box_new(); gtk_box_pack_start(GTK_BOX(vbox), button_area, FALSE, FALSE, 0); @@ -810,6 +814,8 @@ g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(searchresults_callback_wrapper_cb), bd); + g_signal_connect_swapped(G_OBJECT(button), "destroy", + G_CALLBACK(g_free), bd); } } @@ -862,6 +868,7 @@ GaimNotifySearchResultsData *data = (GaimNotifySearchResultsData *)ui_handle; gtk_widget_destroy(data->window); + gaim_notify_searchresults_free(data->results); g_free(data); } Modified: branches/v2_0_0/src/notify.c =================================================================== --- branches/v2_0_0/src/notify.c 2006-08-05 09:54:33 UTC (rev 16645) +++ branches/v2_0_0/src/notify.c 2006-08-05 10:05:07 UTC (rev 16646) @@ -200,6 +200,7 @@ for (l = results->buttons; l; l = g_list_delete_link(l, l)) { GaimNotifySearchButton *button = l->data; + g_free(button->label); g_free(button); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |