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

Accept model (get_services_category_entry): Accept model

Browse source 
2002-01-27  Bradford Hovinen  <hovinen@ximian.com>

	* service-info.c (load_all_services): Accept model
	(get_services_category_entry): Accept model
	(service_info_new): Accept model
	(get_services_category_entry): Set the parent pointer

	* model-entry.c (get_model_entries): Accept model

	* mime-type-info.c (mime_type_info_new, load_all_mime_types):
	Accept model

	* mime-edit-dialog.c (store_data): Don't perform notification

	* model-entry.c (model_entry_insert_child)
	(model_entry_remove_child): Perform notification here

	* mime-type-info.c (mime_type_info_set_category_name): Accept
	model for notification purposes
	(get_category): Ditto; notify the model that the new category has
	been created

	* mime-types-model.c (mime_types_model_iter_parent): Make the
	iterator invalid if the parent is the root node

	* mime-edit-dialog.c (collect_filename_extensions): Return NULL if
	there are no nodes in the tree at all
This commit is contained in:
Bradford Hovinen 2002-01-27 16:18:36 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent ffc7207157
commit 6a3797bfc5
11 changed files with 126 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

29
capplets/file-types/model-entry.c
View file

@ -29,6 +29,7 @@
#include "model-entry.h"
#include "mime-type-info.h"
#include "service-info.h"
#include "mime-types-model.h"
/* List of MimeTypeInfo structures that have data to be committed */
@ -36,7 +37,7 @@ static GList *dirty_list = NULL;
static GList *delete_list = NULL;
ModelEntry *
get_model_entries (void)
get_model_entries (GtkTreeModel *model)
{
static ModelEntry *root;
@ -44,8 +45,8 @@ get_model_entries (void)
root = g_new0 (ModelEntry, 1);
root->type = MODEL_ENTRY_NONE;
load_all_mime_types ();
load_all_services ();
load_all_mime_types (model);
load_all_services (model);
}
return root;
@ -92,14 +93,18 @@ model_entry_get_index (ModelEntry *parent, ModelEntry *child)
}
void
model_entry_insert_child (ModelEntry *entry, ModelEntry *child)
model_entry_insert_child (ModelEntry *entry, ModelEntry *child, GtkTreeModel *model)
{
ModelEntry *tmp;
GtkTreePath *path;
GtkTreeIter iter;
g_return_if_fail (entry != NULL);
g_return_if_fail (entry->type == MODEL_ENTRY_CATEGORY || entry->type == MODEL_ENTRY_SERVICES_CATEGORY ||
entry->type == MODEL_ENTRY_NONE);
g_return_if_fail (child != NULL);
g_return_if_fail (model != NULL);
g_return_if_fail (IS_MIME_TYPES_MODEL (model));
if (entry->first_child == NULL) {
entry->first_child = child;
@ -107,17 +112,26 @@ model_entry_insert_child (ModelEntry *entry, ModelEntry *child)
for (tmp = entry->first_child; tmp->next != NULL; tmp = tmp->next);
tmp->next = child;
}
mime_types_model_construct_iter (MIME_TYPES_MODEL (model), child, &iter);
path = gtk_tree_model_get_path (model, &iter);
gtk_tree_model_row_inserted (model, path, &iter);
gtk_tree_path_free (path);
}
void
model_entry_remove_child (ModelEntry *entry, ModelEntry *child)
model_entry_remove_child (ModelEntry *entry, ModelEntry *child, GtkTreeModel *model)
{
ModelEntry *tmp;
GtkTreePath *path;
GtkTreeIter iter;
g_return_if_fail (entry != NULL);
g_return_if_fail (entry->type == MODEL_ENTRY_CATEGORY || entry->type == MODEL_ENTRY_SERVICES_CATEGORY ||
entry->type == MODEL_ENTRY_NONE);
g_return_if_fail (child != NULL);
g_return_if_fail (model != NULL);
g_return_if_fail (IS_MIME_TYPES_MODEL (model));
if (entry->first_child == NULL) {
return;
@ -128,6 +142,11 @@ model_entry_remove_child (ModelEntry *entry, ModelEntry *child)
for (tmp = entry->first_child; tmp->next != NULL && tmp->next != child; tmp = tmp->next);
tmp->next = child->next;
}
mime_types_model_construct_iter (MIME_TYPES_MODEL (model), child, &iter);
path = gtk_tree_model_get_path (model, &iter);
gtk_tree_model_row_deleted (model, path);
gtk_tree_path_free (path);
}
void