Changeset 9916

Timestamp:

Jan 11, 2010, 9:54:54 PM (12 years ago)

Author:

charles

Message:

(trunk gtk) remove a few very minor memory leaks in the GTK+ client

Location:

trunk/gtk

Files:

• my-valgrind.sh (modified) (1 diff)
• tr-prefs.c (modified) (2 diffs)
• tr-window.c (modified) (1 diff)
• util.c (modified) (2 diffs)

trunk/gtk/my-valgrind.sh

@@ -3 +3 @@
 export G_DEBUG=gc-friendly
 export GLIBCXX_FORCE_NEW=1
-valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=48 --log-file=x-valgrind --show-reachable=yes ./transmission -g /tmp/test
+valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=48 --log-file=x-valgrind --show-reachable=yes ./transmission

trunk/gtk/tr-prefs.c

@@ -744 +744 @@
 }
 
+static void
+remotePageFree( gpointer gpage )
+{
+    struct remote_page * page = gpage;
+
+    g_slist_free( page->widgets );
+    g_slist_free( page->auth_widgets );
+    g_slist_free( page->whitelist_widgets );
+    g_free( page );
+}
+
 static GtkWidget*
 webPage( GObject * core )
@@ -757 +768 @@
 
     t = hig_workarea_create( );
-    g_object_set_data_full( G_OBJECT( t ), "page", page, g_free );
+    g_object_set_data_full( G_OBJECT( t ), "page", page, remotePageFree );
 
     hig_workarea_add_section_title( t, &row, _( "Web Client" ) );

trunk/gtk/tr-window.c

@@ -911 +911 @@
                               SEXY_ICON_ENTRY_PRIMARY,
                               GTK_IMAGE( w ) );
+    g_object_unref( w );
     sexy_icon_entry_set_icon_highlight( SEXY_ICON_ENTRY( s ),
                                         SEXY_ICON_ENTRY_PRIMARY, TRUE );

trunk/gtk/util.c

@@ -674 +674 @@
 
     if( !more )
-        g_free( data );
+        g_slice_free( struct gtr_func_data, data );
 
     return more;
@@ -686 +686 @@
     gdk_threads_add_idle( function, data );
 #else
-    struct gtr_func_data * d = g_new( struct gtr_func_data, 1 );
+    struct gtr_func_data * d = g_slice_new( struct gtr_func_data );
     d->function = function;
     d->data = data;