gobjectify this.

2002-11-06  Chris Toshok  <toshok@ximian.com>

	* gui/widgets/gal-view-minicard.[ch]: gobjectify this.

	* gui/widgets/e-minicard.[ch]: gobjectify this.
	(e_minicard_class_init): change the
	min/max values of the width/height paramspecs so that they can
	actually be set to something other than 0.0.

	* gui/widgets/e-minicard-widget.[ch]: gobjectify this.

	* gui/widgets/e-minicard-view.[ch]: gobjectify this.
	(set_empty_message): don't need e_utf8_from_locale_string anymore.

	* gui/widgets/e-minicard-view-widget.[ch]: gobjectify this.

	* gui/widgets/e-minicard-label.[ch]: gobjectify this.

	* gui/widgets/e-addressbook-view.[ch]: gobjectify this.

	* gui/widgets/e-addressbook-table-adapter.[ch]: gobjectify this.

	* gui/widgets/e-addressbook-reflow-adapter.[ch]: gobjectify this.

	* gui/widgets/e-addressbook-model.[ch]: gobjectify this.

	* gui/widgets/e-minicard-control.c (e_minicard_control_factory):
	fix bonobo_persist_stream_new api change.

	* gui/contact-list-editor/e-contact-list-model.c
	(e_contact_list_model_add_destination): get rid of the
	gtk_object_sink here.

	* gui/component/ldap-config.glade: glade-2 version of this file.

	* gui/component/e-address-popup.c (e_address_popup_refresh_names):
	don't need e_utf8_to_gtk_string anymore.

	* gui/component/addressbook.c (make_suboptions): don't need
	e_utf8_to_locale_string anymore.

	* gui/component/addressbook-config.c
	(addressbook_dialog_get_source): get rid of the e_utf8 gtk_entry
	functions.
	(addressbook_source_dialog_set_source): same.
	(general_tab_check): same.
	(port_changed_func): same.
	(connecting_tab_check): same.
	(query_for_supported_bases): same.
	(display_name_check): same.
	(display_name_page_prepare): same.
	(edit_source_clicked): same.
	(addressbook_config_create_new_source): same.

svn path=/trunk/; revision=18626

1 files changed, 5 insertions, 17 deletions

diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c
index 1aeba789e2..782e384029 100644
--- a/addressbook/gui/widgets/e-minicard-control.c
+++ b/addressbook/gui/widgets/e-minicard-control.c
@@ -26,6 +26,9 @@
 #include "e-minicard-widget.h"
 #include "e-card-merging.h"
 
+#define MINICARD_CONTROL_ID         "OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control"
+#define MINICARD_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory"
+
 typedef struct {
 	EMinicardWidget *minicard;
 	GList *card_list;
@@ -220,21 +223,6 @@ pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,
 	g_free (vcard);
 } /* pstream_save */
 
-static CORBA_long
-pstream_get_max_size (BonoboPersistStream *ps, void *data,
-		      CORBA_Environment *ev)
-{
-	EMinicardControl *minicard_control = data;
-	char *vcard;
-	gint length;
-
-	vcard = e_card_list_get_vcard(minicard_control->card_list);
-	length = strlen (vcard);
-	g_free (vcard);
-
-	return length;
-}
-
 static Bonobo_Persist_ContentTypeList *
 pstream_get_content_types (BonoboPersistStream *ps, void *closure,
 			   CORBA_Environment *ev)
@@ -333,8 +321,8 @@ e_minicard_control_factory (BonoboGenericFactory *Factory,
 			  G_CALLBACK (free_struct), minicard_control);
 
 	stream = bonobo_persist_stream_new (pstream_load, pstream_save,
-					    pstream_get_max_size,
 					    pstream_get_content_types,
+					    MINICARD_CONTROL_ID,
 					    minicard_control);
 
 #if 0
@@ -368,7 +356,7 @@ e_minicard_control_factory_init (void)
 
 	factory =
 		bonobo_generic_factory_new (
-		        "OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory",
+			MINICARD_CONTROL_FACTORY_ID,
 			e_minicard_control_factory, NULL);
 
 	if (factory == NULL)