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

Get the ESelectNamesModel from the widget's text model instead of storing

Browse Source 
2001-04-13  Christopher James Lahey  <clahey@ximian.com>

	* gui/component/select-names/e-select-names-bonobo.c
	(entry_get_property_fn): Get the ESelectNamesModel from the
	widget's text model instead of storing it as a gtk_object_set_data
	since it may change.

svn path=/trunk/; revision=9299
This commit is contained in:
Christopher James Lahey
2001-04-13 13:01:25 +00:00
committed by Chris Lahey
parent 68f8aa3465
commit 045c3ffbea
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addressbook/ChangeLog
+7
View File
@@ -1,3 +1,10 @@
2001-04-13 Christopher James Lahey <clahey@ximian.com>
* gui/component/select-names/e-select-names-bonobo.c
(entry_get_property_fn): Get the ESelectNamesModel from the
widget's text model instead of storing it as a gtk_object_set_data
since it may change.
2001-04-12 Jason Leach <jasonleach@usa.net>
* backend/pas/pas-backend-file.c (INITIAL_VCARD): Update the Voice
addressbook/gui/component/select-names/e-select-names-bonobo.c
+14 -6
View File
@@ -25,6 +25,8 @@
#include <config.h>
#endif
#include "e-select-names-bonobo.h"
#include <bonobo/bonobo-property-bag.h>
#include <bonobo/bonobo-control.h>
@@ -34,7 +36,9 @@
#include "Evolution-Addressbook-SelectNames.h"
#include "e-select-names-manager.h"
#include "e-select-names-bonobo.h"
#include "e-select-names-model.h"
#include "e-select-names-text-model.h"
@@ -69,7 +73,15 @@ entry_get_property_fn (BonoboPropertyBag *bag,
switch (arg_id) {
case ENTRY_PROPERTY_ID_TEXT:
{
ESelectNamesModel *model = E_SELECT_NAMES_MODEL (gtk_object_get_data (GTK_OBJECT (w), "bonobo_select_names_model"));
ESelectNamesTextModel *text_model;
ESelectNamesModel *model;
gtk_object_get(GTK_OBJECT(w),
"model", &text_model,
NULL);
gtk_object_get(GTK_OBJECT(text_model),
"source", &model,
NULL);
text = e_select_names_model_get_address_text (model);
BONOBO_ARG_SET_STRING (arg, text);
}
@@ -177,10 +189,6 @@ impl_SelectNames_get_entry_for_section (PortableServer_Servant servant,
entry_widget = e_select_names_manager_create_entry (priv->manager, section_id);
gtk_widget_show (entry_widget);
gtk_object_set_data (GTK_OBJECT (entry_widget),
"bonobo_select_names_model",
e_select_names_manager_get_source (priv->manager, section_id));
if (entry_widget == NULL) {
CORBA_exception_set (ev,
CORBA_USER_EXCEPTION,