callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try a control before an embeddable instead of an embeddable before a

Browse Source 
control when embedding something in the mail display.

svn path=/trunk/; revision=7845
This commit is contained in:
Ettore Perazzoli
2001-01-27 03:39:24 +00:00
parent 93c8da913b
commit 50cedfaadd
2 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mail/ChangeLog
View File

@ -1,3 +1,8 @@
2001-01-26 Ettore Perazzoli <ettore@ximian.com>
* mail-display.c (get_embedded_for_component): Try a control
first, instead of an embeddable.
2001-01-26 Jeffrey Stedfast <fejj@ximian.com>
* subscribe-dialog.c (populate_store_foreach): Check for a NULL

35
mail/mail-display.c
View File

@ -557,24 +557,29 @@ get_embedded_for_component (const char *iid, MailDisplay *md)
BonoboControlFrame *control_frame;
Bonobo_PropertyBag prop_bag;
embedded = bonobo_widget_new_subdoc (iid, NULL);
if (embedded) {
/* FIXME: as of bonobo 0.18, there's an extra
* client_site dereference in the BonoboWidget
* destruction path that we have to balance out to
* prevent problems.
*/
bonobo_object_ref (BONOBO_OBJECT(bonobo_widget_get_client_site (
BONOBO_WIDGET (embedded))));
return embedded;
}
/*
* Try a control now
* First try a control.
*/
embedded = bonobo_widget_new_control (iid, NULL);
if (!embedded)
if (embedded == NULL) {
/*
* No control, try an embeddable instead.
*/
embedded = bonobo_widget_new_subdoc (iid, NULL);
if (embedded != NULL) {
/* FIXME: as of bonobo 0.18, there's an extra
* client_site dereference in the BonoboWidget
* destruction path that we have to balance out to
* prevent problems.
*/
bonobo_object_ref (BONOBO_OBJECT(bonobo_widget_get_client_site (
BONOBO_WIDGET (embedded))));
return embedded;
}
}
if (embedded == NULL)
return NULL;
control_frame = bonobo_widget_get_control_frame (BONOBO_WIDGET (embedded));