Update of /cvsroot/mahogany/M/include
In directory sc8-pr-cvs1:/tmp/cvs-serv16882/include
Modified Files:
Moptions.h
Log Message:
resolved conflict with my changes
Index: Moptions.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Moptions.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -b -u -2 -r1.75 -r1.76
--- Moptions.h 28 Aug 2003 16:24:02 -0000 1.75
+++ Moptions.h 28 Aug 2003 20:34:17 -0000 1.76
@@ -18,4 +18,6 @@
extern const MOption MP_PROFILE_TYPE;
+extern const MOption MP_CONFIG_SOURCE_TYPE;
+extern const MOption MP_CONFIG_SOURCE_PRIO;
extern const MOption MP_VERSION;
extern const MOption MP_FIRSTRUN;
@@ -407,5 +409,4 @@
extern const MOption MP_AWAY_STATUS;
extern const MOption MP_CREATE_INTERNAL_MESSAGE;
-extern const MOption MP_CONFIG_SOURCE_TYPE;
// ----------------------------------------------------------------------------
@@ -657,4 +658,8 @@
/// The Profile Type. [OBSOLETE]
#define MP_PROFILE_TYPE_NAME "ProfileType"
+/// The type of the config source
+#define MP_CONFIG_SOURCE_TYPE_NAME "Type"
+/// The priority of the config source
+#define MP_CONFIG_SOURCE_PRIO_NAME "Priority"
/// the current user identity
#define MP_CURRENT_IDENTITY_NAME "Identity"
@@ -1216,6 +1221,4 @@
#define MP_CREATE_INTERNAL_MESSAGE_NAME "CreateInternalMessage"
-#define MP_CONFIG_SOURCE_TYPE_NAME "ConfigSource"
-
//@}
@@ -1228,4 +1231,8 @@
/// The Profile Type. [OBSOLETE]
#define MP_PROFILE_TYPE_DEFVAL 0l
+/// The type of the config source
+#define MP_CONFIG_SOURCE_TYPE_DEFVAL ""
+/// The priority of the config source
+#define MP_CONFIG_SOURCE_PRIO_DEFVAL 0l
/// our version
#define MP_VERSION_DEFVAL M_EMPTYSTRING
@@ -2210,6 +2217,4 @@
/// stop "folder internal data" message
#define MP_CREATE_INTERNAL_MESSAGE_DEFVAL 1
-
-#define MP_CONFIG_SOURCE_TYPE_DEFVAL "local"
//@}
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
