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

Use bonobo_object_unref rather than gtk_object_destroy

Browse source 
2001-07-09  Bradford Hovinen  <hovinen@ximian.com>

	* bonobo-config-archiver.c (bonobo_config_archiver_new): Use
	bonobo_object_unref rather than gtk_object_destroy

	* bonobo-moniker-archiver.c (archiver_resolve): Allow PropertyBag
	interface as well
	(parse_name): Set *location to NULL when there is no location

	* sound-properties.xml: Use 0 and 1 rather than true and false

	* capplet-dir.c (capplet_control_launch): Don't convert underscores
	to dashes in moniker
This commit is contained in:
Bradford Hovinen 2001-07-09 19:56:27 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent c09362e12a
commit 2c2fafbaad
8 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
archiver/ChangeLog
View file

@ -1,7 +1,15 @@
2001-07-09 Bradford Hovinen <hovinen@ximian.com>
* bonobo-config-archiver.c (bonobo_config_archiver_new): Use
bonobo_object_unref rather than gtk_object_destroy
* bonobo-moniker-archiver.c (archiver_resolve): Allow PropertyBag
interface as well
(parse_name): Set *location to NULL when there is no location
* archive.c (archive_load): Use .gnome/capplet-archive rather than
.gnome/control-center
(archive_set_current_location): Removed unused variables
* bonobo-config-archiver.c (bonobo_config_archiver_new): Try to
load the defaults file if no rollback data can be found

2
archiver/archive.c
View file

@ -437,7 +437,7 @@ archive_get_current_location (Archive *archive)
void
archive_set_current_location (Archive *archive, Location *location)
{
GList *backends1, *backends2, *backends, *tmp;
GList *backends;
Location *old_location = archive_get_current_location (archive);
g_return_if_fail (archive != NULL);

4
archiver/bonobo-config-archiver.c
View file

@ -646,7 +646,7 @@ bonobo_config_archiver_new (const char *backend_id, const char *location_id)
archiver_db->location = archive_get_location (archive, location_id);
if (archiver_db->location == NULL) {
gtk_object_destroy (GTK_OBJECT (archiver_db));
bonobo_object_unref (BONOBO_OBJECT (archiver_db));
return CORBA_OBJECT_NIL;
}
@ -664,7 +664,7 @@ bonobo_config_archiver_new (const char *backend_id, const char *location_id)
g_free (filename);
if (archiver_db->doc == NULL) {
gtk_object_destroy (GTK_OBJECT (archiver_db));
bonobo_object_unref (BONOBO_OBJECT (archiver_db));
return CORBA_OBJECT_NIL;
}
}

9
archiver/bonobo-moniker-archiver.c
View file

@ -46,6 +46,7 @@ parse_name (const gchar *name, gchar **backend_id, gchar **location)
*backend_id = g_strdup (e + 1);
} else {
*backend_id = g_strdup (name);
*location = NULL;
}
return TRUE;
@ -62,7 +63,9 @@ archiver_resolve (BonoboMoniker *moniker,
const gchar *name;
gchar *backend_id, *location;
if (strcmp (requested_interface, "IDL:Bonobo/ConfigDatabase:1.0")) {
if (strcmp (requested_interface, "IDL:Bonobo/ConfigDatabase:1.0") &&
strcmp (requested_interface, "IDL:Bonobo/PropertyBag:1.0"))
{
EX_SET_NOT_FOUND (ev);
return CORBA_OBJECT_NIL;
}
@ -75,10 +78,8 @@ archiver_resolve (BonoboMoniker *moniker,
if (parent != CORBA_OBJECT_NIL) {
pdb = Bonobo_Moniker_resolve (parent, options,
"IDL:Bonobo/ConfigDatabase:1.0",
ev);
requested_interface, ev);
bonobo_object_release_unref (parent, NULL);