Don't add the location to the list if it is marked deleted
2001-08-27 Bradford Hovinen <hovinen@ximian.com> * archive.c (foreach_build_list_cb): Don't add the location to the list if it is marked deleted (impl_ConfigArchiver_Archive_createLocation): Do CORBA_Object_duplicate rather than bonobo_object_dup_ref * location.c (location_is_deleted): Implement * background-properties-capplet.c (setup_dialog): Initialize/free the CORBA environment structure (real_realize_cb): Put into an idle handler, called by realize_2_cb, the new timeout handler * preferences.c (preferences_load_from_bonobo_pbag): (preferences_load_from_bonobo_db): Extract from preferences_new_* * background-properties-capplet.c (property_change_cb): (realize_cb): Accept prefs structure in lieu of Bonobo_PropertyBag; don't reload the preferences structure from the property bag (property_change_cb): Call preferences_apply_event to modify the preferences structure appropriately (property_change_cb): (realize_cb): If the preferences structure is marked destroyed, just return (setup_dialog): Create a preferences structure from the property bag given and use that as the extra data passed to callbacks (realize_cb): Put into an idle handler real_realize_cb * preferences.c (preferences_apply_event): Implement * applier.c (output_compat_prefs): Make prefs const * applier.[ch]: Have applier_apply_prefs take a const Preferences structure * preferences.[ch]: Make preferences_clone take a const Preferences structure
This commit is contained in:
parent
8b63aee560
commit
a82ec1573c
33 changed files with 27435 additions and 4619 deletions
|
@ -466,7 +466,7 @@ location_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
|
|||
(GTK_VALUE_POINTER (*arg)));
|
||||
location->p->parent =
|
||||
GTK_VALUE_POINTER (*arg);
|
||||
bonobo_object_ref (GTK_VALUE_POINTER (*arg));
|
||||
bonobo_object_ref (BONOBO_OBJECT (location->p->parent));
|
||||
}
|
||||
|
||||
default:
|
||||
|
@ -1355,12 +1355,13 @@ location_store_full_snapshot (Location *location)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* location_garbage_collect:
|
||||
/**
|
||||
* location_garbage_collect:
|
||||
* @location:
|
||||
*
|
||||
* Iterates through backends and eliminates excess archived data from the
|
||||
* configuration log and the XML archive
|
||||
*/
|
||||
**/
|
||||
|
||||
static void
|
||||
garbage_collect_cb (ConfigLog *config_log, gchar *backend_id, gint id, Location *location)
|
||||
|
@ -1391,6 +1392,19 @@ location_garbage_collect (Location *location)
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* location_is_deleted:
|
||||
* @location:
|
||||
*
|
||||
* Returns TRUE iff the location is marked deleted
|
||||
**/
|
||||
|
||||
gboolean
|
||||
location_is_deleted (const Location *location)
|
||||
{
|
||||
return location->p->deleted;
|
||||
}
|
||||
|
||||
static gint
|
||||
get_backends_cb (BackendList *backend_list, gchar *backend_id,
|
||||
Location *location)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue