A little patch
- From: Dietmar Maurer <dietmar maurer-it com>
- To: Michael Meeks <michael helixcode com>, "gnome-components-list gnome org" <gnome-components-list gnome org>
- Subject: A little patch
- Date: Mon, 27 Nov 2000 11:49:37 +0100
to solve the version problem pointed out by joe.
- Dietmar
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/bonobo/ChangeLog,v
retrieving revision 1.756
diff -u -r1.756 ChangeLog
--- ChangeLog 2000/11/27 02:06:05 1.756
+++ ChangeLog 2000/11/27 10:30:46
@@ -1,3 +1,16 @@
+Mon Nov 27 11:05:42 2000 Dietmar Maurer <dietmar maurer-it com>
+
+ * storage-modules/bonobo-storage-fs.c (bonobo_storage_fs_open):
+ removed unused realname variable.
+
+ * bonobo/bonobo-storage-plugin.h (BONOBO_STORAGE_VERSION): define
+ a version string which we can change manulally if we make
+ incompatible changes.
+
+ * bonobo/bonobo-storage-plugin.c,
+ storage-modules/bonobo-storage-efs.c,
+ storage-modules/bonobo-storage-fs.c: see above
+
2000-11-26 Vladimir Vukicevic <vladimir helixcode com>
* monikers/Makefile.am: correct spelling of moniker_test_SOURCE
Index: bonobo/bonobo-storage-plugin.c
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-storage-plugin.c,v
retrieving revision 1.4
diff -u -r1.4 bonobo-storage-plugin.c
--- bonobo/bonobo-storage-plugin.c 2000/11/14 15:24:31 1.4
+++ bonobo/bonobo-storage-plugin.c 2000/11/27 10:30:46
@@ -120,7 +120,7 @@
while (l) {
p = (StoragePlugin *) l->data;
if (!strcmp (p->name, name) &&
- !strcmp (p->version, VERSION)) {
+ !strcmp (p->version, BONOBO_STORAGE_VERSION)) {
return p;
}
l = l->next;
Index: bonobo/bonobo-storage-plugin.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-storage-plugin.h,v
retrieving revision 1.2
diff -u -r1.2 bonobo-storage-plugin.h
--- bonobo/bonobo-storage-plugin.h 2000/10/30 18:27:47 1.2
+++ bonobo/bonobo-storage-plugin.h 2000/11/27 10:30:46
@@ -12,6 +12,8 @@
#include <bonobo/bonobo-storage.h>
#include <gmodule.h>
+#define BONOBO_STORAGE_VERSION "1.0"
+
BEGIN_GNOME_DECLS
typedef struct _StoragePlugin StoragePlugin;
Index: storage-modules/bonobo-storage-efs.c
===================================================================
RCS file: /cvs/gnome/bonobo/storage-modules/bonobo-storage-efs.c,v
retrieving revision 1.27
diff -u -r1.27 bonobo-storage-efs.c
--- storage-modules/bonobo-storage-efs.c 2000/11/11 20:32:53 1.27
+++ storage-modules/bonobo-storage-efs.c 2000/11/27 10:30:47
@@ -523,7 +523,7 @@
plugin->name = "efs";
plugin->description = "Embedded Filesystem Driver";
- plugin->version = VERSION;
+ plugin->version = BONOBO_STORAGE_VERSION;
plugin->storage_open = bonobo_storage_efs_open;
Index: storage-modules/bonobo-storage-fs.c
===================================================================
RCS file: /cvs/gnome/bonobo/storage-modules/bonobo-storage-fs.c,v
retrieving revision 1.29
diff -u -r1.29 bonobo-storage-fs.c
--- storage-modules/bonobo-storage-fs.c 2000/11/13 11:57:05 1.29
+++ storage-modules/bonobo-storage-fs.c 2000/11/27 10:30:47
@@ -391,16 +391,10 @@
CORBA_Environment *ev)
{
struct stat st;
- char *realname;
- int len;
g_return_val_if_fail (path != NULL, NULL);
+ g_return_val_if_fail (ev != NULL, NULL);
- realname = g_strdup (path);
- len = strlen (realname);
- if (realname [len - 1] == '/') /* Kill appended '/' */
- realname [len - 1] == '/0';
-
/* Most storages are files */
mode = mode | 010101;
@@ -446,7 +440,7 @@
plugin->name = "fs";
plugin->description = "Native Filesystem Driver";
- plugin->version = VERSION;
+ plugin->version = BONOBO_STORAGE_VERSION;
plugin->storage_open = bonobo_storage_fs_open;
plugin->stream_open = bonobo_stream_fs_open;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]