applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

color: Prevent a crash when hotplugging monitors when the color panel is open

Browse source
This commit is contained in:
Richard Hughes 2012-03-16 12:45:13 +00:00
parent 2b1fa69453
commit c31f2eed79
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
panels/color/cc-color-panel.c
View file

@ -1856,6 +1856,7 @@ gcm_prefs_remove_device (CcColorPanel *prefs, CdDevice *cd_device)
const gchar *id; const gchar *id;
gchar *id_tmp; gchar *id_tmp;
gboolean ret; gboolean ret;
CdDevice *device_tmp;
CcColorPanelPrivate *priv = prefs->priv; CcColorPanelPrivate *priv = prefs->priv;
/* remove */ /* remove */
@ -1875,8 +1876,15 @@ gcm_prefs_remove_device (CcColorPanel *prefs, CdDevice *cd_device)
-1); -1);
if (g_strcmp0 (id_tmp, id) == 0) if (g_strcmp0 (id_tmp, id) == 0)
{ {
gtk_tree_model_get (model, &iter,
GCM_PREFS_COLUMN_DEVICE, &device_tmp,
-1);
g_signal_handlers_disconnect_by_func (device_tmp,
G_CALLBACK (gcm_prefs_device_changed_cb),
prefs);
gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); gtk_tree_store_remove (GTK_TREE_STORE (model), &iter);
g_free (id_tmp); g_free (id_tmp);
g_object_unref (device_tmp);
break; break;
} }
g_free (id_tmp); g_free (id_tmp);