5 files changed, 153 insertions, 154 deletions
diff --git a/Makefile b/Makefile
index 6eb89e7..d770a05 100644
--- a/Makefile
+++ b/Makefile
@@ -1,147 +1,118 @@
-#############################################################################
+DISTPATH = $(shell pwd)
-# Makefile for building: kopi-desktop
+DISTDIR = $(shell basename $(DISTPATH))
-# Generated by qmake (1.07a) (Qt 3.3.2) on: Wed Jul  7 14:00:48 2004
-# Project:  kopi-desktop.pro
+SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \
-# Template: subdirs
+   libkcal libkdepim kabc  kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir \
-# Command: $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kopi-desktop.pro
+   kabc/plugins/opie \
-#############################################################################
+         korganizer kalarmd kaddressbook kmicromail/libetpan kmicromail/libmailwrapper kmicromail
+all: tmake
-        MAKEFILE =Makefile
+        for i in $(SUBDIRS); do pushd $$i; \
-        QMAKE    =qmake
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
-DEL_FILE =    rm -f
+          done
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
+objects:
-INSTALL_FILE= 
+        for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
-INSTALL_DIR = 
+        for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
-        SUBTARGETS = \
+        mkdir -p libical/lib/$(PLATFORM)
-                sub-libical \
-                sub-libkcal \
+clean:
-                sub-microkde \
+        rm -f libical/lib/$(PLATFORM)/*;
-                sub-libkdepim \
+        for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
-                sub-kabc \
+          rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
-                sub-korganizer \
+          done 
-                sub-kaddressbook \
+install:
-                sub-kabc-plugins-file \
+        cd bin/kdepim; make install
-                sub-kabc-plugins-dir
+        cp db2file/db2file $(QPEDIR)/bin/db2file
+        cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
-first: all
+        cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop
+        cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
-all: Makefile $(SUBTARGETS)
+dist:
-libical/$(MAKEFILE): 
+        @echo Dont forget to do "make install" before "make dist"
-        @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
+        rm -f *arm.ipk
-        cd libical && $(QMAKE) libical.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+        rm -f *~
-sub-libical: libical/$(MAKEFILE) FORCE
+        cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim
-        cd libical && $(MAKE) -f $(MAKEFILE)
+        mkipks kmicrokdelibs.control
+        mkipks korganizer.control
-libkcal/$(MAKEFILE): 
+        mkipks kaddressbook.control
-        @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
+        mkipks kopiemail.control
-        cd libkcal && $(QMAKE) libkcal.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+        mkipks korganizer-alarm.control
-sub-libkcal: libkcal/$(MAKEFILE) FORCE
-        cd libkcal && $(MAKE) -f $(MAKEFILE)
+tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \
+       libkcal/Makefile$(PLATFORM) \
-microkde/$(MAKEFILE): 
+       libkdepim/Makefile$(PLATFORM) korganizer/Makefile$(PLATFORM) \
-        @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
+       kalarmd/Makefile$(PLATFORM) \
-        cd microkde && $(QMAKE) microkde.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+       libical/src/libical/Makefile$(PLATFORM) \
-sub-microkde: microkde/$(MAKEFILE) FORCE
+       libical/src/libicalss/Makefile$(PLATFORM) \
-        cd microkde && $(MAKE) -f $(MAKEFILE)
+       kabc/Makefile$(PLATFORM) \
+       kabc/converter/opie/Makefile$(PLATFORM) \
-libkdepim/$(MAKEFILE): 
+       kabc/formats/binary/Makefile$(PLATFORM) \
-        @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
+       kabc/plugins/file/Makefile$(PLATFORM) \
-        cd libkdepim && $(QMAKE) libkdepim.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+       kabc/plugins/dir/Makefile$(PLATFORM) \
-sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
+       kabc/plugins/ldap/Makefile$(PLATFORM) \
-        cd libkdepim && $(MAKE) -f $(MAKEFILE)
+       kabc/plugins/opie/Makefile$(PLATFORM) \
+       kaddressbook/Makefile$(PLATFORM) \
-kabc/$(MAKEFILE): 
+       kmicromail/Makefile$(PLATFORM) \
-        @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
+       kmicromail/libetpan/Makefile$(PLATFORM) \
-        cd kabc && $(QMAKE) kabc.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+       kmicromail/libmailwrapper/Makefile$(PLATFORM) 
-sub-kabc: kabc/$(MAKEFILE) FORCE
-        cd kabc && $(MAKE) -f $(MAKEFILE)
-korganizer/$(MAKEFILE): 
+qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
-        @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
+        cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM)
-        cd korganizer && $(QMAKE) korganizer.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
-sub-korganizer: korganizer/$(MAKEFILE) FORCE
+microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
-        cd korganizer && $(MAKE) -f $(MAKEFILE)
+        cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM)
-kaddressbook/$(MAKEFILE): 
+libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
-        @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
+        cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM)
-        cd kaddressbook && $(QMAKE) kaddressbook.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
-sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
-        cd kaddressbook && $(MAKE) -f $(MAKEFILE)
+libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
+        cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" libkdepimE.pro -o Makefile$(PLATFORM)
-kabc/plugins/file/$(MAKEFILE): 
-        @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
+kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
-        cd kabc/plugins/file && $(QMAKE) file.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+        cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" kalarmdE.pro -o Makefile$(PLATFORM)
-sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
-        cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
+korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
+        cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM)
-kabc/plugins/dir/$(MAKEFILE): 
-        @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
+libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
-        cd kabc/plugins/dir && $(QMAKE) dir.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+        cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM)
-sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
-        cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
+libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
+        cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM)
-Makefile: kopi-desktop.pro  /usr/local/qtgcc/mkspecs/default/qmake.conf 
-        $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kopi-desktop.pro
+kabc/Makefile$(PLATFORM): kabc/kabcE.pro
-qmake: qmake_all
+        cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM)
-        @$(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kopi-desktop.pro
+kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro
-all: $(SUBTARGETS)
+        cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieconverterE.pro -o Makefile$(PLATFORM)
-qmake_all: libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE)
+  
-         ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
-         ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+        cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
-         ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-         ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/kabc_fileE.pro
-         ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+        cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_fileE.pro -o Makefile$(PLATFORM)
-         ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-         ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/kabc_dirE.pro
-         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+        cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_dirE.pro -o Makefile$(PLATFORM)
-         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
+kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/kabc_ldapE.pro
-         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+        cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_ldapE.pro -o Makefile$(PLATFORM)
-         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/kabc_opieE.pro
-         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+        cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_opieE.pro -o Makefile$(PLATFORM)
-         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
-         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+        cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM)
-         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-uninstall_subdirs: qmake_all FORCE
-         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
-         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+        cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM)
-         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
-         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+        cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" libetpanE.pro -o Makefile$(PLATFORM)
-         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
-         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+        cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM)
-         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-install_subdirs: qmake_all FORCE
-         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
-         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
-         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true
-         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true
-         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true
-         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true
-         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true
-         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
-         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true
-distclean: qmake_all FORCE
-         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-install:  install_subdirs
-uninstall:  uninstall_subdirs
-FORCE:
diff --git a/microkde/kconfig.cpp b/microkde/kconfig.cpp
index 737b3f2..4cbec94 100644
--- a/microkde/kconfig.cpp
+++ b/microkde/kconfig.cpp
@@ -14,8 +14,8 @@ QString KConfig::mGroup = "";
 KConfig::KConfig( const QString &fileName )
  : mFileName( fileName ), mDirty( false )
 {
-  kdDebug() << "KConfig::KConfig(): '" << fileName << "'" << endl;
+  
+  mTempGroup = "";
  load();
 }
@@ -25,10 +25,22 @@ KConfig::~KConfig()
 {
  sync();
 }
+// we need the temp group for plugins on windows
+void KConfig::setTempGroup( const QString &group )
+{
+  mTempGroup = group;
+  if ( mTempGroup.right( 1 ) != "/" ) mTempGroup += "/";
+}
+QString KConfig::tempGroup() const {
+  return mTempGroup;
+}
 void KConfig::setGroup( const QString &group )
 {
-  kdDebug() << "KConfig::setGroup(): '" << group << "'" << endl;
+  
  mGroup = group;
@@ -69,7 +81,7 @@ QValueList<int> KConfig::readIntListEntry( const QString & key)
  
  if (ok2 == false)
  {
-    kdDebug() << "KConfig::readIntListEntry: error while reading one of the intvalues." << endl;
+   
    qDebug("KConfig::readIntListEntry: error while reading one of the intvalues.");
  }
  
@@ -227,7 +239,7 @@ void KConfig::writeEntry( const QString &key, const QDateTime &dt )
 void KConfig::load()
 {
-  kdDebug() << "KConfig::load(): " << mFileName << endl;
+  
  QFile f( mFileName );
  if ( !f.open( IO_ReadOnly ) ) {
diff --git a/microkde/kconfig.h b/microkde/kconfig.h
index bfedf53..a01b1a5 100644
--- a/microkde/kconfig.h
+++ b/microkde/kconfig.h
@@ -15,6 +15,9 @@ class KConfig
    KConfig( const QString & );
    ~KConfig();
  
+    void setTempGroup( const QString &group );
+    QString tempGroup() const;
    void setGroup( const QString & );
 //US
@@ -87,6 +90,7 @@ class KConfig
  private:  
    static QString mGroup;
+    QString mTempGroup;
    
    QString mFileName;
    
diff --git a/microkde/kresources/managerimpl.cpp b/microkde/kresources/managerimpl.cpp
index 1baa6be..785b6b4 100644
--- a/microkde/kresources/managerimpl.cpp
+++ b/microkde/kresources/managerimpl.cpp
@@ -253,13 +253,18 @@ Resource* ManagerImpl::readResourceConfig( const QString& identifier,
 //  qDebug("ManagerImpl::readResourceConfig() %s", identifier.latin1());
  mConfig->setGroup( "Resource_" + identifier );
+#ifdef _WIN32_
+  // we use plugins on win32. the group is stored in a static variable
+  // such that gourp info not avail on win32 plugins
+  // to fix that, it would be a looooot of work
+  mConfig->setTempGroup( "Resource_" + identifier );
+#endif
  QString type = mConfig->readEntry( "ResourceType" );
  QString name = mConfig->readEntry( "ResourceName" );
  Resource *resource = mFactory->resource( type, mConfig );
  if ( !resource ) {
-    kdDebug(5650) << "Failed to create resource with id " << identifier << endl;
+      qDebug("Failed to create resource with id %s ",identifier.latin1() );
-    return 0;
+      return 0;
  }
  if ( resource->identifier().isEmpty() )
diff --git a/microkde/kresources/resource.cpp b/microkde/kresources/resource.cpp
index 7827a67..991d53d 100644
--- a/microkde/kresources/resource.cpp
+++ b/microkde/kresources/resource.cpp
@@ -53,6 +53,13 @@ Resource::Resource( const KConfig* config )
  //US compiler claimed that const discards qualifier
  KConfig* cfg = (KConfig*)config;  
  if ( cfg ) {
+#ifdef _WIN32_
+      // we use plugins on win32. the group is stored in a static variable
+      // such that group info not available on win32 plugins
+      // to fix that, it would be a looooot of work
+      if ( !cfg->tempGroup().isEmpty() )
+          cfg->setGroup( cfg->tempGroup() );
+#endif
    d->mType = cfg->readEntry( "ResourceType" );
    d->mName = cfg->readEntry( "ResourceName" );
    d->mReadOnly = cfg->readBoolEntry( "ResourceIsReadOnly", false );

diff --git a/Makefile b/Makefile index 6eb89e7..d770a05 100644 --- a/Makefile +++ b/Makefile
@@ -1,147 +1,118 @@
1	#############################################################################	1	DISTPATH = $(shell pwd)
2	# Makefile for building: kopi-desktop	2	DISTDIR = $(shell basename $(DISTPATH))
3	# Generated by qmake (1.07a) (Qt 3.3.2) on: Wed Jul 7 14:00:48 2004	3
4	# Project: kopi-desktop.pro	4	SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \
5	# Template: subdirs	5	libkcal libkdepim kabc kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir \
6	# Command: $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kopi-desktop.pro	6	kabc/plugins/opie \
7	#############################################################################	7	korganizer kalarmd kaddressbook kmicromail/libetpan kmicromail/libmailwrapper kmicromail
8		8	all: tmake
9	MAKEFILE =Makefile	9	for i in $(SUBDIRS); do pushd $$i; \
10	QMAKE =qmake	10	make -f Makefile$(PLATFORM) \|\| exit 1; popd; \
11	DEL_FILE = rm -f	11	done
12	CHK_DIR_EXISTS= test -d	12
13	MKDIR = mkdir -p	13	objects:
14	INSTALL_FILE=	14	for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
15	INSTALL_DIR =	15	for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
16	SUBTARGETS = \	16	mkdir -p libical/lib/$(PLATFORM)
17	sub-libical \	17
18	sub-libkcal \	18	clean:
19	sub-microkde \	19	rm -f libical/lib/$(PLATFORM)/*;
20	sub-libkdepim \	20	for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
21	sub-kabc \	21	rm -f obj/$(PLATFORM)/; rm -f moc/$(PLATFORM)/; rm Makefile$(PLATFORM); popd; \
22	sub-korganizer \	22	done
23	sub-kaddressbook \	23	install:
24	sub-kabc-plugins-file \	24	cd bin/kdepim; make install
25	sub-kabc-plugins-dir	25	cp db2file/db2file $(QPEDIR)/bin/db2file
26		26	cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
27	first: all	27	cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop
28		28	cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
29	all: Makefile $(SUBTARGETS)	29
30		30	dist:
31	libical/$(MAKEFILE):	31	@echo Dont forget to do "make install" before "make dist"
32	@$(CHK_DIR_EXISTS) "libical" \|\| $(MKDIR) "libical"	32	rm -f *arm.ipk
33	cd libical && $(QMAKE) libical.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)	33	rm -f *~
34	sub-libical: libical/$(MAKEFILE) FORCE	34	cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim
35	cd libical && $(MAKE) -f $(MAKEFILE)	35	mkipks kmicrokdelibs.control
36		36	mkipks korganizer.control
37	libkcal/$(MAKEFILE):	37	mkipks kaddressbook.control
38	@$(CHK_DIR_EXISTS) "libkcal" \|\| $(MKDIR) "libkcal"	38	mkipks kopiemail.control
39	cd libkcal && $(QMAKE) libkcal.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)	39	mkipks korganizer-alarm.control
40	sub-libkcal: libkcal/$(MAKEFILE) FORCE	40
41	cd libkcal && $(MAKE) -f $(MAKEFILE)	41	tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \
42		42	libkcal/Makefile$(PLATFORM) \
43	microkde/$(MAKEFILE):	43	libkdepim/Makefile$(PLATFORM) korganizer/Makefile$(PLATFORM) \
44	@$(CHK_DIR_EXISTS) "microkde" \|\| $(MKDIR) "microkde"	44	kalarmd/Makefile$(PLATFORM) \
45	cd microkde && $(QMAKE) microkde.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)	45	libical/src/libical/Makefile$(PLATFORM) \
46	sub-microkde: microkde/$(MAKEFILE) FORCE	46	libical/src/libicalss/Makefile$(PLATFORM) \
47	cd microkde && $(MAKE) -f $(MAKEFILE)	47	kabc/Makefile$(PLATFORM) \
48		48	kabc/converter/opie/Makefile$(PLATFORM) \
49	libkdepim/$(MAKEFILE):	49	kabc/formats/binary/Makefile$(PLATFORM) \
50	@$(CHK_DIR_EXISTS) "libkdepim" \|\| $(MKDIR) "libkdepim"	50	kabc/plugins/file/Makefile$(PLATFORM) \
51	cd libkdepim && $(QMAKE) libkdepim.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)	51	kabc/plugins/dir/Makefile$(PLATFORM) \
52	sub-libkdepim: libkdepim/$(MAKEFILE) FORCE	52	kabc/plugins/ldap/Makefile$(PLATFORM) \
53	cd libkdepim && $(MAKE) -f $(MAKEFILE)	53	kabc/plugins/opie/Makefile$(PLATFORM) \
54		54	kaddressbook/Makefile$(PLATFORM) \
55	kabc/$(MAKEFILE):	55	kmicromail/Makefile$(PLATFORM) \
56	@$(CHK_DIR_EXISTS) "kabc" \|\| $(MKDIR) "kabc"	56	kmicromail/libetpan/Makefile$(PLATFORM) \
57	cd kabc && $(QMAKE) kabc.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)	57	kmicromail/libmailwrapper/Makefile$(PLATFORM)
58	sub-kabc: kabc/$(MAKEFILE) FORCE	58
59	cd kabc && $(MAKE) -f $(MAKEFILE)	59
60		60
61	korganizer/$(MAKEFILE):	61	qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
62	@$(CHK_DIR_EXISTS) "korganizer" \|\| $(MKDIR) "korganizer"	62	cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM)
63	cd korganizer && $(QMAKE) korganizer.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)	63
64	sub-korganizer: korganizer/$(MAKEFILE) FORCE	64	microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
65	cd korganizer && $(MAKE) -f $(MAKEFILE)	65	cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM)
66		66
67	kaddressbook/$(MAKEFILE):	67	libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
68	@$(CHK_DIR_EXISTS) "kaddressbook" \|\| $(MKDIR) "kaddressbook"	68	cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM)
69	cd kaddressbook && $(QMAKE) kaddressbook.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)	69
70	sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE	70
71	cd kaddressbook && $(MAKE) -f $(MAKEFILE)	71	libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
72		72	cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" libkdepimE.pro -o Makefile$(PLATFORM)
73	kabc/plugins/file/$(MAKEFILE):	73
74	@$(CHK_DIR_EXISTS) "kabc/plugins/file" \|\| $(MKDIR) "kabc/plugins/file"	74	kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
75	cd kabc/plugins/file && $(QMAKE) file.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)	75	cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" kalarmdE.pro -o Makefile$(PLATFORM)
76	sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE	76
77	cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)	77	korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
78		78	cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM)
79	kabc/plugins/dir/$(MAKEFILE):	79
80	@$(CHK_DIR_EXISTS) "kabc/plugins/dir" \|\| $(MKDIR) "kabc/plugins/dir"	80	libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
81	cd kabc/plugins/dir && $(QMAKE) dir.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)	81	cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM)
82	sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE	82
83	cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)	83	libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
84		84	cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM)
85	Makefile: kopi-desktop.pro /usr/local/qtgcc/mkspecs/default/qmake.conf	85
86	$(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kopi-desktop.pro	86	kabc/Makefile$(PLATFORM): kabc/kabcE.pro
87	qmake: qmake_all	87	cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM)
88	@$(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kopi-desktop.pro	88
89		89	kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro
90	all: $(SUBTARGETS)	90	cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieconverterE.pro -o Makefile$(PLATFORM)
91	qmake_all: libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE)	91
92	( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true	92	kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
93	( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true	93	cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
94	( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true	94
95	( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true	95	kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/kabc_fileE.pro
96	( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true	96	cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_fileE.pro -o Makefile$(PLATFORM)
97	( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true	97
98	( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true	98	kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/kabc_dirE.pro
99	( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true	99	cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_dirE.pro -o Makefile$(PLATFORM)
100	( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true	100
101	clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE	101	kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/kabc_ldapE.pro
102	( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true	102	cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_ldapE.pro -o Makefile$(PLATFORM)
103	( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true	103
104	( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true	104	kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/kabc_opieE.pro
105	( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true	105	cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" kabc_opieE.pro -o Makefile$(PLATFORM)
106	( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true	106
107	( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true	107
108	( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true	108	kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
109	( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true	109	cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM)
110	( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true	110
111	uninstall_subdirs: qmake_all FORCE	111
112	( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true	112	kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
113	( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true	113	cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM)
114	( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true	114	kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
115	( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true	115	cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" libetpanE.pro -o Makefile$(PLATFORM)
116	( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true	116	kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
117	( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true	117	cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM)
118	( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true
119	( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true
120	( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true
121	install_subdirs: qmake_all FORCE
122	( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true
123	( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true
124	( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true
125	( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true
126	( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true
127	( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true
128	( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true
129	( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true
130	( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true
131	distclean: qmake_all FORCE
132	( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true
133	( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true
134	( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true
135	( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true
136	( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true
137	( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true
138	( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true
139	( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true
140	( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true
141
142	install: install_subdirs
143
144	uninstall: uninstall_subdirs
145
146	FORCE:
147		118


diff --git a/microkde/kconfig.cpp b/microkde/kconfig.cpp index 737b3f2..4cbec94 100644 --- a/microkde/kconfig.cpp +++ b/microkde/kconfig.cpp
@@ -14,8 +14,8 @@ QString KConfig::mGroup = "";
14	KConfig::KConfig( const QString &fileName )	14	KConfig::KConfig( const QString &fileName )
15	: mFileName( fileName ), mDirty( false )	15	: mFileName( fileName ), mDirty( false )
16	{	16	{
17	kdDebug() << "KConfig::KConfig(): '" << fileName << "'" << endl;	17
18		18	mTempGroup = "";
19	load();	19	load();
20		20
21	}	21	}
@@ -25,10 +25,22 @@ KConfig::~KConfig()
25	{	25	{
26	sync();	26	sync();
27	}	27	}
		28	// we need the temp group for plugins on windows
		29	void KConfig::setTempGroup( const QString &group )
		30	{
		31	mTempGroup = group;
		32
		33	if ( mTempGroup.right( 1 ) != "/" ) mTempGroup += "/";
		34	}
		35
		36
		37	QString KConfig::tempGroup() const {
		38	return mTempGroup;
		39	}
28		40
29	void KConfig::setGroup( const QString &group )	41	void KConfig::setGroup( const QString &group )
30	{	42	{
31	kdDebug() << "KConfig::setGroup(): '" << group << "'" << endl;	43
32		44
33	mGroup = group;	45	mGroup = group;
34		46
@@ -69,7 +81,7 @@ QValueList<int> KConfig::readIntListEntry( const QString & key)
69		81
70	if (ok2 == false)	82	if (ok2 == false)
71	{	83	{
72	kdDebug() << "KConfig::readIntListEntry: error while reading one of the intvalues." << endl;	84
73	qDebug("KConfig::readIntListEntry: error while reading one of the intvalues.");	85	qDebug("KConfig::readIntListEntry: error while reading one of the intvalues.");
74	}	86	}
75		87
@@ -227,7 +239,7 @@ void KConfig::writeEntry( const QString &key, const QDateTime &dt )
227		239
228	void KConfig::load()	240	void KConfig::load()
229	{	241	{
230	kdDebug() << "KConfig::load(): " << mFileName << endl;	242
231		243
232	QFile f( mFileName );	244	QFile f( mFileName );
233	if ( !f.open( IO_ReadOnly ) ) {	245	if ( !f.open( IO_ReadOnly ) ) {


diff --git a/microkde/kconfig.h b/microkde/kconfig.h index bfedf53..a01b1a5 100644 --- a/microkde/kconfig.h +++ b/microkde/kconfig.h
@@ -15,6 +15,9 @@ class KConfig
15	KConfig( const QString & );	15	KConfig( const QString & );
16	~KConfig();	16	~KConfig();
17		17
		18	void setTempGroup( const QString &group );
		19	QString tempGroup() const;
		20
18	void setGroup( const QString & );	21	void setGroup( const QString & );
19		22
20	//US	23	//US
@@ -87,6 +90,7 @@ class KConfig
87		90
88	private:	91	private:
89	static QString mGroup;	92	static QString mGroup;
		93	QString mTempGroup;
90		94
91	QString mFileName;	95	QString mFileName;
92		96


diff --git a/microkde/kresources/managerimpl.cpp b/microkde/kresources/managerimpl.cpp index 1baa6be..785b6b4 100644 --- a/microkde/kresources/managerimpl.cpp +++ b/microkde/kresources/managerimpl.cpp
@@ -253,13 +253,18 @@ Resource* ManagerImpl::readResourceConfig( const QString& identifier,
253	// qDebug("ManagerImpl::readResourceConfig() %s", identifier.latin1());	253	// qDebug("ManagerImpl::readResourceConfig() %s", identifier.latin1());
254		254
255	mConfig->setGroup( "Resource_" + identifier );	255	mConfig->setGroup( "Resource_" + identifier );
256		256	#ifdef _WIN32_
		257	// we use plugins on win32. the group is stored in a static variable
		258	// such that gourp info not avail on win32 plugins
		259	// to fix that, it would be a looooot of work
		260	mConfig->setTempGroup( "Resource_" + identifier );
		261	#endif
257	QString type = mConfig->readEntry( "ResourceType" );	262	QString type = mConfig->readEntry( "ResourceType" );
258	QString name = mConfig->readEntry( "ResourceName" );	263	QString name = mConfig->readEntry( "ResourceName" );
259	Resource *resource = mFactory->resource( type, mConfig );	264	Resource *resource = mFactory->resource( type, mConfig );
260	if ( !resource ) {	265	if ( !resource ) {
261	kdDebug(5650) << "Failed to create resource with id " << identifier << endl;	266	qDebug("Failed to create resource with id %s ",identifier.latin1() );
262	return 0;	267	return 0;
263	}	268	}
264		269
265	if ( resource->identifier().isEmpty() )	270	if ( resource->identifier().isEmpty() )


diff --git a/microkde/kresources/resource.cpp b/microkde/kresources/resource.cpp index 7827a67..991d53d 100644 --- a/microkde/kresources/resource.cpp +++ b/microkde/kresources/resource.cpp
@@ -53,6 +53,13 @@ Resource::Resource( const KConfig* config )
53	//US compiler claimed that const discards qualifier	53	//US compiler claimed that const discards qualifier
54	KConfig* cfg = (KConfig*)config;	54	KConfig* cfg = (KConfig*)config;
55	if ( cfg ) {	55	if ( cfg ) {
		56	#ifdef _WIN32_
		57	// we use plugins on win32. the group is stored in a static variable
		58	// such that group info not available on win32 plugins
		59	// to fix that, it would be a looooot of work
		60	if ( !cfg->tempGroup().isEmpty() )
		61	cfg->setGroup( cfg->tempGroup() );
		62	#endif
56	d->mType = cfg->readEntry( "ResourceType" );	63	d->mType = cfg->readEntry( "ResourceType" );
57	d->mName = cfg->readEntry( "ResourceName" );	64	d->mName = cfg->readEntry( "ResourceName" );
58	d->mReadOnly = cfg->readBoolEntry( "ResourceIsReadOnly", false );	65	d->mReadOnly = cfg->readBoolEntry( "ResourceIsReadOnly", false );