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

List:       kde-commits
Subject:    kdenetwork/kopete/kopete
From:       Olivier Goffart <ogoffart () tiscalinet ! be>
Date:       2003-09-03 21:15:32
[Download RAW message or body]

CVS commit by ogoffart: 

Port the account configuration to the new KSettings API

the kopeteaccountconfig.* was originaly from kopete/conf/accountconfig.*
same for the addcontactwizard*


  A            config/accounts/Makefile.am   1.1
  A            config/accounts/addaccountwizard.cpp   1.1 [GPL (v2+)]
  A            config/accounts/addaccountwizard.h   1.1 [GPL (v2+)]
  A            config/accounts/addaccountwizardpage1.ui   1.1
  A            config/accounts/addaccountwizardpage2.ui   1.1
  A            config/accounts/addaccountwizardpage3.ui   1.1
  A            config/accounts/kopete_accountconfig.desktop   1.1
  A            config/accounts/kopeteaccountconfig.cpp   1.1 [GPL (v2+)]
  A            config/accounts/kopeteaccountconfig.h   1.1 [GPL (v2+)]
  A            config/accounts/kopeteaccountconfigbase.ui   1.1
  M +0 -2      kopete.cpp   1.148
  M +3 -7      conf/Makefile.am   1.21
  M +3 -0      config/Makefile.am   1.4
  R            conf/accountconfig.cpp   1.18
  R            conf/accountconfig.h   1.4
  R            conf/accountconfigbase.ui   1.8
  R            conf/addaccountwizard.cpp   1.15
  R            conf/addaccountwizard.h   1.8
  R            conf/addaccountwizardpage1.ui   1.3
  R            conf/addaccountwizardpage2.ui   1.5
  R            conf/addaccountwizardpage3.ui   1.5


--- kdenetwork/kopete/kopete/kopete.cpp  #1.147:1.148
@@ -28,5 +28,4 @@
 #include <kcmdlineargs.h>
 
-#include "accountconfig.h"
 #include "kopeteaccount.h"
 #include "kopeteprotocol.h"
@@ -63,5 +62,4 @@ Kopete::Kopete()
         // Create the plugin preferences module
         new PluginConfig( this );
-        new AccountConfig( m_mainWindow );
         new AppearanceConfig( m_mainWindow );
         new BehaviorConfig( m_mainWindow );

--- kdenetwork/kopete/kopete/conf/Makefile.am  #1.20:1.21
@@ -8,6 +8,6 @@
 
 noinst_LTLIBRARIES = libkopeteconf.la
-noinst_HEADERS = pluginconfig.h appearanceconfig.h accountconfig.h \
-        addaccountwizard.h behaviorconfig.h
+noinst_HEADERS = pluginconfig.h appearanceconfig.h  \
+        behaviorconfig.h
 
 libkopeteconf_la_SOURCES = pluginconfig.cpp \
@@ -15,9 +15,5 @@
         appearanceconfig_colors.ui appearanceconfig.cpp \
         behaviorconfig_general.ui behaviorconfig_chat.ui behaviorconfig.cpp \
-        kopeteawayconfigbase.ui kopeteawayconfigui.cpp \
-        accountconfigbase.ui accountconfig.cpp \
-        addaccountwizardpage1.ui addaccountwizardpage2.ui addaccountwizardpage3.ui \
-        addaccountwizard.cpp
-
+        kopeteawayconfigbase.ui kopeteawayconfigui.cpp
 libkopeteconf_la_LDFLAGS = $(all_libraries) -no-undefined
 libkopeteconf_la_LIBADD = ../../libkopete/libkopete.la -lktexteditor $(LIB_KDEUI)

--- kdenetwork/kopete/kopete/config/Makefile.am  #1.3:1.4
@@ -2,4 +2,6 @@
 AM_CPPFLAGS = $(KOPETE_COMPAT_INCLUDES) $(all_includes)
 
+SUBDIRS= accounts
+
 kde_module_LTLIBRARIES = kcm_kopete_pluginconfig.la
 
@@ -7,4 +9,5 @@
 kcm_kopete_pluginconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
 kcm_kopete_pluginconfig_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
+
 
 service_DATA = kopete_pluginconfig.desktop


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