Re: BonoboStreamMemory

[Lutz Müller <urc8 rz uni-karlsruhe de>]

On 09 Jul 2001 11:14:38 -0400, Michael Meeks wrote:
> 
> Hi Lutz,
> 
> On 9 Jul 2001, Lutz [ISO-8859-1] Müller wrote:
> > I'd like to add Bonobo_Stream_[get,set]Info capabilities to the
> > BonoboStreamMemory. Is this ok? If yes, I'll submit a patch.
> 
> 	Yes, that's excellent - please do, I look forward to your patch.
Attached. Can I commit to bonobo? (What about libbonobo?)
> 
> > By the way, are there any news regarding my patch to gshell? I'd like
> > to continue work on that...
> 
> 	I did the CVS surgery to move it into bonobo-extra, can you hack
> in there ? bonobo-extra/gshell [ send me the patch again against
> bonobo-extra if you don't have a CVS account, I'd like to glance over it
> anyway ].
I'll submit the patch again. Give me some time.

Lutz

--
                                                        \|||/
+------------------------------------------------+      (o o)
| Lutz Mueller           +49 (7156) 34837        +---ooO-(_)-Ooo---+
|                                                                  |
| Hans-Sachs-Strasse 5                                             |
| 71254 Ditzingen        http://www.uni-karlsruhe.de/~Lutz.Mueller |
| Germany                urc8 rz uni-karlsruhe de                  |
+------------------------------------------------------------------+

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/bonobo/ChangeLog,v
retrieving revision 1.1081
diff -r1.1081 ChangeLog
0a1,5
> 2001-07-09  Lutz Müller  <urc8 rz uni-karlsruhe de>
> 
> 	* bonobo/bonobo-stream-memory.[c,h]: Make mem_[get,set]_info
> 	functional. 
> 
Index: bonobo/bonobo-stream-memory.c
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-stream-memory.c,v
retrieving revision 1.32
diff -r1.32 bonobo-stream-memory.c
15a16
> #include <bonobo/bonobo-exception.h>
32,33c33,34
< 	si->name = CORBA_string_dup ("");
< 	si->content_type = CORBA_string_dup ("application/octet-stream");
---
> 	si->name = CORBA_string_dup (smem->name);
> 	si->content_type = CORBA_string_dup (smem->content_type);
46c47
< 	if (smem->read_only)
---
> 	if (smem->read_only) {
50c51,60
< 	else
---
> 		return;
> 	}
> 
> 	if (mask & Bonobo_FIELD_SIZE)
> 		CORBA_exception_set (
> 			ev, CORBA_USER_EXCEPTION,
> 			ex_Bonobo_Stream_NotSupported, NULL);
> 
> 	if ((mask & Bonobo_FIELD_TYPE) && 
> 	    (info->type != Bonobo_STORAGE_TYPE_REGULAR))
53a64,75
> 
> 	if (mask & Bonobo_FIELD_CONTENT_TYPE) {
> 		bonobo_return_if_fail (info->content_type != NULL, ev);
> 		g_free (smem->content_type);
> 		smem->content_type = g_strdup (info->content_type);
> 	}
> 
> 	if (strcmp (info->name, smem->name)) {
> 		bonobo_return_if_fail (info->name != NULL, ev);
> 		g_free (smem->name);
> 		smem->name = g_strdup (info->name);
> 	}
231a254
> 	g_free (smem->content_type);
324a348
> 	stream_mem->content_type = g_strdup ("application/octet-stream");
Index: bonobo/bonobo-stream-memory.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-stream-memory.h,v
retrieving revision 1.11
diff -r1.11 bonobo-stream-memory.h
39a40,41
> 	char        *content_type;
> 	char        *name;