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

window, shell-model: Silence warnings

Browse source 
A fallback from the previous commit.
This commit is contained in:
Georges Basile Stavracas Neto 2018-05-02 22:34:23 -03:00
parent 4b91361d98
commit 16f06665dd
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
shell/cc-shell-model.c
View file

@ -336,16 +336,16 @@ cc_shell_model_has_panel (CcShellModel *model,
g_assert (id); g_assert (id);
valid = gtk_tree_model_get_iter_first (model, &iter); valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter);
while (valid) while (valid)
{ {
g_autofree gchar *panel_id = NULL; g_autofree gchar *panel_id = NULL;
gtk_tree_model_get (model, &iter, COL_ID, &panel_id, -1); gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, COL_ID, &panel_id, -1);
if (g_str_equal (id, panel_id)) if (g_str_equal (id, panel_id))
return TRUE; return TRUE;
valid = gtk_tree_model_iter_next (model, &iter); valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter);
} }
return FALSE; return FALSE;

2
shell/cc-window.c
View file

@ -756,7 +756,7 @@ cc_window_init (CcWindow *self)
/* After everything is loaded, select the last used panel, if any, /* After everything is loaded, select the last used panel, if any,
* or the first visible panel */ * or the first visible panel */
id = g_settings_get_string (self->settings, "last-panel"); id = g_settings_get_string (self->settings, "last-panel");
if (id != NULL && cc_shell_model_has_panel (self->store, id)) if (id != NULL && cc_shell_model_has_panel (CC_SHELL_MODEL (self->store), id))
cc_panel_list_set_active_panel (CC_PANEL_LIST (self->panel_list), id); cc_panel_list_set_active_panel (CC_PANEL_LIST (self->panel_list), id);
else else
cc_panel_list_activate (CC_PANEL_LIST (self->panel_list)); cc_panel_list_activate (CC_PANEL_LIST (self->panel_list));