Changeset 13953


Ignore:
Timestamp:
Feb 4, 2013, 4:15:48 PM (8 years ago)
Author:
jordan
Message:

(2.7x) backport r13952 to fix bug #5271 in 2.7x

Location:
branches/2.7x/gtk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.7x/gtk/filter.c

    r13625 r13953  
    487487    cat_model = category_filter_model_new (tmodel);
    488488    c = gtk_combo_box_new_with_model (cat_model);
    489     g_object_unref (cat_model);
    490489    gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (c),
    491490                                          is_it_a_separator, NULL, NULL);
     
    792791    activity_model = activity_filter_model_new (tmodel);
    793792    c = gtk_combo_box_new_with_model (activity_model);
    794     g_object_unref (activity_model);
    795793    gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (c),
    796794                                       activity_is_it_a_separator, NULL, NULL);
  • branches/2.7x/gtk/main.c

    r13771 r13953  
    7474  gboolean start_paused;
    7575  gboolean is_iconified;
     76  gboolean is_closing;
    7677
    7778  guint activation_count;
     
    276277  struct cbdata * data = gdata;
    277278
    278   if (data->refresh_actions_tag == 0)
     279  if (!data->is_closing && !data->refresh_actions_tag)
    279280    data->refresh_actions_tag = gdk_threads_add_idle (refresh_actions, data);
    280281}
     
    927928  struct cbdata *cbdata = vdata;
    928929
     930  cbdata->is_closing = true;
     931
    929932  /* stop the update timer */
    930933  if (cbdata->timer)
     
    932935      g_source_remove (cbdata->timer);
    933936      cbdata->timer = 0;
     937    }
     938
     939  /* stop the refresh-actions timer */
     940  if (cbdata->refresh_actions_tag)
     941    {
     942      g_source_remove (cbdata->refresh_actions_tag);
     943      cbdata->refresh_actions_tag = 0;
    934944    }
    935945
Note: See TracChangeset for help on using the changeset viewer.