mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(gtk) better fix for the bug described in r6858

This commit is contained in:
Charles Kerr 2008-10-06 20:54:18 +00:00
parent add9eda736
commit 6f2076fb1c
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gtk/tr-prefs.c
View File

@ -197,9 +197,11 @@ new_check_button( const char * mnemonic,
struct spin_idle_data struct spin_idle_data
{ {
guint tag; gpointer core;
gpointer core; char * key;
GTimer * last_change; int value;
GTimer * last_change;
GtkSpinButton * spin;
}; };
static void static void
@ -208,35 +210,37 @@ spin_idle_data_free( gpointer gdata )
struct spin_idle_data * data = gdata; struct spin_idle_data * data = gdata;
g_timer_destroy( data->last_change ); g_timer_destroy( data->last_change );
g_free( data->key );
g_free( data ); g_free( data );
} }
static void static void
onSpinDestroyed( gpointer tag, onSpinDestroyed( gpointer gdata,
GObject * details UNUSED ) GObject * details UNUSED )
{ {
g_source_remove( GPOINTER_TO_UINT( tag ) ); struct spin_idle_data * data = gdata;
data->spin = NULL;
} }
static gboolean static gboolean
spun_cb_idle( gpointer spin ) spun_cb_idle( gpointer gdata )
{ {
gboolean keep_waiting = TRUE; gboolean keep_waiting = TRUE;
GObject * o = G_OBJECT( spin ); struct spin_idle_data * data = gdata;
struct spin_idle_data * data = g_object_get_data( o, IDLE_DATA );
/* has the user stopped making changes? */ /* has the user stopped making changes? */
if( g_timer_elapsed( data->last_change, NULL ) > 0.33f ) if( g_timer_elapsed( data->last_change, NULL ) > 0.33f )
{ {
/* update the core */ /* update the core */
const char * key = g_object_get_data( o, PREF_KEY ); tr_core_set_pref_int( TR_CORE( data->core ), data->key, data->value );
const int value = gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON( spin ) );
tr_core_set_pref_int( TR_CORE( data->core ), key, value );
/* cleanup */ /* cleanup */
g_object_weak_unref( o, onSpinDestroyed, GUINT_TO_POINTER( data->tag ) ); if( data->spin ) {
g_object_set_data( o, IDLE_DATA, NULL ); GObject * o = G_OBJECT( data->spin );
g_object_weak_unref( o, onSpinDestroyed, data );
g_object_set_data( o, IDLE_DATA, NULL );
}
spin_idle_data_free( data );
keep_waiting = FALSE; keep_waiting = FALSE;
} }
@ -249,7 +253,7 @@ spun_cb( GtkSpinButton * w,
{ {
/* user may be spinning through many values, so let's hold off /* user may be spinning through many values, so let's hold off
for a moment to keep from flooding the core with changes */ for a moment to keep from flooding the core with changes */
GObject * o = G_OBJECT( w ); GObject * o = G_OBJECT( w );
struct spin_idle_data * data = g_object_get_data( o, IDLE_DATA ); struct spin_idle_data * data = g_object_get_data( o, IDLE_DATA );
if( data == NULL ) if( data == NULL )
@ -257,9 +261,11 @@ spun_cb( GtkSpinButton * w,
data = g_new( struct spin_idle_data, 1 ); data = g_new( struct spin_idle_data, 1 );
data->core = core; data->core = core;
data->last_change = g_timer_new( ); data->last_change = g_timer_new( );
data->tag = g_timeout_add( 100, spun_cb_idle, w ); data->key = g_strdup( g_object_get_data( o, PREF_KEY ) );
g_object_set_data_full( o, IDLE_DATA, data, spin_idle_data_free ); data->value = gtk_spin_button_get_value_as_int( w );
g_object_weak_ref( o, onSpinDestroyed, GUINT_TO_POINTER( data->tag ) ); g_timeout_add( 100, spun_cb_idle, data );
g_object_set_data( o, IDLE_DATA, data );
g_object_weak_ref( o, onSpinDestroyed, data );
} }
g_timer_start( data->last_change ); g_timer_start( data->last_change );
} }