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

List:       kde-commits
Subject:    KDE/kdebase/runtime/kioslave
From:       David Faure <faure () kde ! org>
Date:       2008-10-27 18:21:51
Message-ID: 1225131711.884997.28535.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 876632 by dfaure:

Rewrote kio_settings so that it actually works.
* Splitted out a kio_applications since the code has nothing in common anymore
* Used the logic from systemsettings for extracting a category structure out of \
ksycoca and putting the config modules into that.


 M  +1 -0      CMakeLists.txt  
 AM            applications (directory)   settings#874160
 M  +5 -13     applications/CMakeLists.txt  
 M  +1 -1      applications/Messages.sh  
 M  +1 -1      applications/applications.protocol  
 AM            applications/kio_applications.cpp   settings/kio_settings.cc#874160 \
[License: LGPL (v2+)]  D             applications/kio_settings.cc  
 D             applications/kio_settings.h  
 M  +1 -1      applications/programs.protocol  
 D             applications/settings.protocol  
 M  +3 -12     settings/CMakeLists.txt  
 D             settings/applications.protocol  
 D             settings/kio_settings.cc  
 AM            settings/kio_settings.cpp   settings/kio_settings.cc#876494 [License: \
LGPL (v2+)]  D             settings/kio_settings.h  
 D             settings/programs.protocol  


--- trunk/KDE/kdebase/runtime/kioslave/CMakeLists.txt #876631:876632
@@ -12,6 +12,7 @@
 add_subdirectory( info )
 add_subdirectory( archive )
 add_subdirectory( settings )
+add_subdirectory( applications )
 add_subdirectory( trash )
 add_subdirectory( remote )
 add_subdirectory( desktop )
** trunk/KDE/kdebase/runtime/kioslave/applications #property svn:ignore
   + .libs
Makefile
Makefile.in
Makefile.rules.in
--- trunk/KDE/kdebase/runtime/kioslave/applications/CMakeLists.txt #874160:876632
@@ -1,20 +1,12 @@
+########### kio_applications ###############
 
+kde4_add_plugin(kio_applications kio_applications.cpp)
 
+target_link_libraries(kio_applications  ${KDE4_KIO_LIBS} )
 
+install(TARGETS kio_applications  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
-########### next target ###############
 
-set(kio_settings_PART_SRCS kio_settings.cc )
-
-
-kde4_add_plugin(kio_settings ${kio_settings_PART_SRCS})
-
-
-target_link_libraries(kio_settings  ${KDE4_KIO_LIBS} )
-
-install(TARGETS kio_settings  DESTINATION ${PLUGIN_INSTALL_DIR} )
-
-
 ########### install files ###############
 
-install( FILES settings.protocol programs.protocol applications.protocol  \
DESTINATION  ${SERVICES_INSTALL_DIR} ) +install( FILES  programs.protocol \
                applications.protocol  DESTINATION  ${SERVICES_INSTALL_DIR} )
--- trunk/KDE/kdebase/runtime/kioslave/applications/Messages.sh #874160:876632
@@ -1,2 +1,2 @@
 #! /usr/bin/env bash
-$XGETTEXT `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o \
$podir/kio_settings.pot +$XGETTEXT `find . -name "*.cc" -o -name "*.cpp" -o -name \
                "*.h"` -o $podir/kio_applications.pot
--- trunk/KDE/kdebase/runtime/kioslave/applications/applications.protocol \
#874160:876632 @@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_settings
+exec=kio_applications
 protocol=applications
 input=none
 output=filesystem
** trunk/KDE/kdebase/runtime/kioslave/applications/kio_applications.cpp #property \
svn:eol-style  + native
** trunk/KDE/kdebase/runtime/kioslave/applications/kio_applications.cpp #property \
svn:keywords  + Author Date Id Revision
** trunk/KDE/kdebase/runtime/kioslave/applications/kio_applications.cpp #property \
svn:mergeinfo  + 
** trunk/KDE/kdebase/runtime/kioslave/applications/kio_applications.cpp #property \
svn:mime-type  + text/x-c++src
--- trunk/KDE/kdebase/runtime/kioslave/applications/programs.protocol #874160:876632
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_settings
+exec=kio_applications
 protocol=programs
 input=none
 output=filesystem
--- trunk/KDE/kdebase/runtime/kioslave/settings/CMakeLists.txt #876631:876632
@@ -1,20 +1,11 @@
+########### kio_settings ###############
 
+kde4_add_plugin(kio_settings kio_settings.cpp)
 
-
-
-########### next target ###############
-
-set(kio_settings_PART_SRCS kio_settings.cc )
-
-
-kde4_add_plugin(kio_settings ${kio_settings_PART_SRCS})
-
-
 target_link_libraries(kio_settings  ${KDE4_KIO_LIBS} )
 
 install(TARGETS kio_settings  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
-
 ########### install files ###############
 
-install( FILES settings.protocol programs.protocol applications.protocol  \
DESTINATION  ${SERVICES_INSTALL_DIR} ) +install( FILES settings.protocol DESTINATION  \
                ${SERVICES_INSTALL_DIR} )
** trunk/KDE/kdebase/runtime/kioslave/settings/kio_settings.cpp #property \
svn:eol-style  + native
** trunk/KDE/kdebase/runtime/kioslave/settings/kio_settings.cpp #property \
svn:keywords  + Author Date Id Revision
** trunk/KDE/kdebase/runtime/kioslave/settings/kio_settings.cpp #property \
svn:mergeinfo  + 
** trunk/KDE/kdebase/runtime/kioslave/settings/kio_settings.cpp #property \
svn:mime-type  + text/x-c++src


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