[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-pim
Subject:    [Kde-pim] [PATCH] CalendarResources uses wrong config file
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2003-10-27 12:28:41
[Download RAW message or body]

[Attachment #2 (multipart/signed)]

[Attachment #4 (multipart/mixed)]


Hi,

CalendarResources from libkcal is still using the wrong config file
(~/.kde/share/config/kcalrc), so changes in the resources done with
'kcmshell kresources' are not available in libkcal.

The attached patch correct this, so the config file is
~/.kde/share/config/kresources/calendar/stdrc.

Can I commit?

Ciao,
Tobias
--=20
Can a government that shoots at reporters be democratic?
Separate politics from religion and economy!

["calres.patch" (text/plain)]

Index: calendarresources.cpp
===================================================================
RCS file: /home/kde/kdepim/libkcal/calendarresources.cpp,v
retrieving revision 1.32
diff -p -u -b -r1.32 calendarresources.cpp
--- calendarresources.cpp	24 Oct 2003 23:48:41 -0000	1.32
+++ calendarresources.cpp	27 Oct 2003 12:26:06 -0000
@@ -84,10 +84,8 @@ void CalendarResources::init()
 {
   kdDebug(5800) << "CalendarResources::init" << endl;
 
-  mConfig = new KConfig( "kcalrc" );
-
   mManager = new CalendarResourceManager( "calendar" );
-  mManager->readConfig( mConfig );
+  mManager->readConfig( 0 );
 
   if ( !mManager->standardResource() ) {
     kdDebug() << "Warning! No standard resource yet." << endl;
@@ -124,7 +122,6 @@ CalendarResources::~CalendarResources()
   close();
 
   delete mManager;
-  delete mConfig;
 }
 
 void CalendarResources::setStandardDestinationPolicy()
Index: calendarresources.h
===================================================================
RCS file: /home/kde/kdepim/libkcal/calendarresources.h,v
retrieving revision 1.24
diff -p -u -b -r1.24 calendarresources.h
--- calendarresources.h	24 Oct 2003 23:48:41 -0000	1.24
+++ calendarresources.h	27 Oct 2003 12:26:06 -0000
@@ -264,8 +264,6 @@ class CalendarResources : public Calenda
     StandardDestinationPolicy *mStandardPolicy;
     AskDestinationPolicy *mAskPolicy;
 
-    KConfig *mConfig;
-
     QMap<ResourceCalendar *, Ticket *> mTickets;
     QMap<ResourceCalendar *, int> mChangeCounts;
 };

["signature.asc" (application/pgp-signature)]

_______________________________________________
kde-pim mailing list
kde-pim@mail.kde.org
http://mail.kde.org/mailman/listinfo/kde-pim
kde-pim home page at http://pim.kde.org/

[prev in list] [next in list] [prev in thread] [next in thread]