Changeset 13952


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

(gtk) #5271 'once we start shutting down the application, stop updating the Action states': fixed

Location:
trunk/gtk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/gtk/filter.c

    r13938 r13952  
    403403  c_combo_box = GTK_COMBO_BOX (c);
    404404  c_cell_layout = GTK_CELL_LAYOUT (c);
    405   g_object_unref (cat_model);
    406405  gtk_combo_box_set_row_separator_func (c_combo_box,
    407406                                        is_it_a_separator, NULL, NULL);
     
    692691  c_combo_box = GTK_COMBO_BOX (c);
    693692  c_cell_layout = GTK_CELL_LAYOUT (c);
    694   g_object_unref (activity_model);
    695693  gtk_combo_box_set_row_separator_func (c_combo_box,
    696694                                        activity_is_it_a_separator, NULL, NULL);
  • trunk/gtk/main.c

    r13868 r13952  
    7474  gboolean start_paused;
    7575  gboolean is_iconified;
     76  gboolean is_closing;
    7677
    7778  guint activation_count;
     
    8889  GSList * details;
    8990  GtkTreeSelection * sel;
    90   gpointer quit_dialog;
    9191};
    9292
     
    276276  struct cbdata * data = gdata;
    277277
    278   if (data->refresh_actions_tag == 0)
     278  if (!data->is_closing && !data->refresh_actions_tag)
    279279    data->refresh_actions_tag = gdk_threads_add_idle (refresh_actions, data);
    280280}
     
    917917{
    918918  GtkWidget *r, *p, *b, *w, *c;
    919   struct cbdata *cbdata = vdata;
     919  struct cbdata * cbdata = vdata;
    920920  struct session_close_struct * session_close_data;
     921
     922  cbdata->is_closing = true;
    921923
    922924  /* stop the update timer */
     
    925927      g_source_remove (cbdata->timer);
    926928      cbdata->timer = 0;
     929    }
     930
     931  /* stop the refresh-actions timer */
     932  if (cbdata->refresh_actions_tag)
     933    {
     934      g_source_remove (cbdata->refresh_actions_tag);
     935      cbdata->refresh_actions_tag = 0;
    927936    }
    928937
Note: See TracChangeset for help on using the changeset viewer.