Commit 16f06665 authored by Georges Basile Stavracas Neto's avatar Georges Basile Stavracas Neto
Browse files

window, shell-model: Silence warnings

A fallback from the previous commit.
parent 4b91361d
......@@ -336,16 +336,16 @@ cc_shell_model_has_panel (CcShellModel *model,
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)
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))
return TRUE;
valid = gtk_tree_model_iter_next (model, &iter);
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter);
return FALSE;
......@@ -756,7 +756,7 @@ cc_window_init (CcWindow *self)
/* After everything is loaded, select the last used panel, if any,
* or the first visible 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_activate (CC_PANEL_LIST (self->panel_list));
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment