Changeset 701

Show
Ignore:
Timestamp:
01/01/10 14:46:09 (2 years ago)
Author:
erikd
Message:

Replace deprecated gtk_timeout_add/remove functions with their replacements.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sweep/trunk/src/file_speex.c

    r691 r701  
    14801480  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkbutton), FALSE); 
    14811481 
    1482   tag = gtk_timeout_add (30, randomise_serialno, data); 
     1482  tag = g_timeout_add (30, randomise_serialno, data); 
    14831483  g_object_set_data (G_OBJECT(widget), "tag", GINT_TO_POINTER(tag)); 
    14841484} 
    …… 
    14901490 
    14911491  tag = GPOINTER_TO_INT(g_object_get_data (G_OBJECT(widget), "tag")); 
    1492   gtk_timeout_remove (tag); 
     1492  g_source_remove (tag); 
    14931493} 
    14941494 

  • sweep/trunk/src/main.c

    r688 r701  
    132132         
    133133 
    134   /* must be done before g_idle_add / gtk_timeout_add */ 
     134  /* must be done before g_idle_add / g_timeout_add */ 
    135135  sweep_timeouts_init (); 
    136136 

  • sweep/trunk/src/sweep_undo.c

    r691 r701  
    280280  if (sample->op_progress_tag == -1) { 
    281281    sample->op_progress_tag = 
    282       gtk_timeout_add (30, (GtkFunction)update_edit_progress, 
     282      g_timeout_add (30, (GtkFunction)update_edit_progress, 
    283283                       (gpointer)sample); 
    284284  } 

  • sweep/trunk/src/timeouts.c

    r694 r701  
    8282      g_assert (td->gtk_tag != -1); 
    8383 
    84       gtk_timeout_remove (td->gtk_tag); 
     84      g_source_remove (td->gtk_tag); 
    8585      timeouts = g_list_remove_link (timeouts, gl); 
    8686      g_free (td); 
    8787    } else if (td->gtk_tag == -1) { 
    88       td->gtk_tag = gtk_timeout_add (td->interval, sweep_timeout_wrapper, td); 
     88      td->gtk_tag = g_timeout_add (td->interval, sweep_timeout_wrapper, td); 
    8989    } 
    9090  } 
    …… 
    106106  g_mutex_unlock (timeouts_mutex); 
    107107 
    108   gtk_timeout_add ((guint32)500, sweep_timeouts_handle_pending, NULL); 
     108  g_timeout_add ((guint32)500, sweep_timeouts_handle_pending, NULL); 
    109109} 
    110110 

  • sweep/trunk/src/view.c

    r700 r701  
    12951295 
    12961296  if (view->sample->op_progress_tag != -1) 
    1297     gtk_timeout_remove(view->sample->op_progress_tag); 
     1297    g_source_remove(view->sample->op_progress_tag); 
     1298  view->sample->op_progress_tag = -1; 
    12981299  cancel_active_op (view->sample); 
    12991300  sample_remove_view(view->sample, view);