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

network: Don't try to populate the model before it is created

Browse source
This commit is contained in:
Rodrigo Moya 2010-11-03 14:10:55 +01:00
parent 527043d960
commit d5dffc50db
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
panels/network/gnome-network-properties.c
View file

@ -91,9 +91,11 @@ populate_listmodel (GtkListStore *store, GPtrArray *list)
gtk_list_store_clear (store); gtk_list_store_clear (store);
for (i = 0; i < list->len; i++) { if (list != NULL) {
gtk_list_store_append (store, &iter); for (i = 0; i < list->len; i++) {
gtk_list_store_set (store, &iter, 0, (char *) g_ptr_array_index (list, i), -1); gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, 0, (char *) g_ptr_array_index (list, i), -1);
}
} }
return GTK_TREE_MODEL (store); return GTK_TREE_MODEL (store);
@ -105,9 +107,9 @@ config_treeview(GtkTreeView *tree, GtkTreeModel *model)
GtkCellRenderer *renderer; GtkCellRenderer *renderer;
renderer = gtk_cell_renderer_text_new(); renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tree), gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(tree),
-1, "Hosts", renderer, -1, "Hosts", renderer,
"text", 0, NULL); "text", 0, NULL);
gtk_tree_view_set_model(GTK_TREE_VIEW(tree), model); gtk_tree_view_set_model(GTK_TREE_VIEW(tree), model);
@ -1250,12 +1252,11 @@ setup_dialog (GtkBuilder *builder)
g_signal_connect (gtk_builder_get_object (builder, "network_dialog"), g_signal_connect (gtk_builder_get_object (builder, "network_dialog"),
"response", G_CALLBACK (cb_dialog_response), NULL); "response", G_CALLBACK (cb_dialog_response), NULL);
proxy_settings_changed_cb (proxy_settings, "ignore-hosts", builder);
model = create_listmodel(); model = create_listmodel();
populate_listmodel(GTK_LIST_STORE(model), ignore_hosts); populate_listmodel(GTK_LIST_STORE(model), ignore_hosts);
config_treeview(GTK_TREE_VIEW(gtk_builder_get_object (builder, "treeview_ignore_host")), model); config_treeview (GTK_TREE_VIEW(gtk_builder_get_object (builder, "treeview_ignore_host")), model);
proxy_settings_changed_cb (proxy_settings, "ignore-hosts", builder);
g_signal_connect (gtk_builder_get_object (builder, "button_add_url"), g_signal_connect (gtk_builder_get_object (builder, "button_add_url"),
"clicked", G_CALLBACK (cb_add_url), builder); "clicked", G_CALLBACK (cb_add_url), builder);