TDE
/
kmyfirewall
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kmyfirewall
0
0
Fork 0
Code Issues Releases Wiki Activity

Additional kde to tde renaming

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 5c2bcfa6d7
commit 6b64d2b10a
16 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File

2
ChangeLog
Unescape View File

@ -86,7 +86,7 @@
* New Class KMFAppState: Holds some static variables giving information about the app's state * New Class KMFAppState: Holds some static variables giving information about the app's state
* Some minor Fixes * Some minor Fixes
* Started documentaion for plugin framework * Started documentaion for plugin framework
* Enable kdesu for running commands if not started as root * Enable tdesu for running commands if not started as root
* Started implementing Template saving * Started implementing Template saving
* Added HP link URl to about dialog * Added HP link URl to about dialog
* Minor code cleanup * Minor code cleanup

2
KMFIPTInterface/kmfiptinterface_ctl
Unescape View File

@ -2,6 +2,6 @@
SERVER="`dcopserver --serverid 2>&1`" SERVER="`dcopserver --serverid 2>&1`"
echo -n "Server:" echo -n "Server:"
echo $SERVER echo $SERVER
kdesu -t --nonewdcop -u root -c kmfiptinterface --dcopserver=$SERVER tdesu -t --nonewdcop -u root -c kmfiptinterface --dcopserver=$SERVER

2
KMFSysTray/Makefile.am
Unescape View File

@ -7,7 +7,7 @@ bin_PROGRAMS = kmfsystray
kmfsystray_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kmfsystray_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kmfsystray_LDADD = ../kmyfirewall/core/libkmfcore.la ../kmyfirewall/kmfwidgets/libkmfwidgets.la $(LIB_KDEUI) $(LIB_KPARTS) kmfsystray_LDADD = ../kmyfirewall/core/libkmfcore.la ../kmyfirewall/kmfwidgets/libkmfwidgets.la $(LIB_KDEUI) $(LIB_KPARTS)
kmfsystray_DATA = kmfsystray.desktop kmfsystray_DATA = kmfsystray.desktop

2
KMFSysTray/kmfsystray.cpp
Unescape View File

@ -99,7 +99,7 @@ void KMFSysTray::slotSetRunningtqStatus( bool on ) {
void KMFSysTray::slotLaunchKMF () { void KMFSysTray::slotLaunchKMF () {
KProcess *childproc = new KProcess(); KProcess *childproc = new KProcess();
*childproc << "kdesu"; *childproc << "tdesu";
*childproc << "kmyfirewall"; *childproc << "kmyfirewall";
childproc->start( KProcess:: DontCare, KProcess::NoCommunication ); childproc->start( KProcess:: DontCare, KProcess::NoCommunication );
} }

26
acinclude.m4
Unescape View File

@ -371,7 +371,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi fi
AC_MSG_CHECKING([for KDE libraries installed]) AC_MSG_CHECKING([for KDE libraries installed])
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir) AC_SUBST(kde_moduledir)
AC_SUBST(kdeinitdir, '$(kde_moduledir)') AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir) AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir) AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
@ -2064,12 +2064,12 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
case $host in case $host in
*cygwin*) lib_kded="-lkdeinit_kded" ;; *cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;; *) lib_kded="" ;;
esac esac
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_KDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
@ -2078,9 +2078,9 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_KUTILS, "-lkutils")
AC_SUBST(LIB_KDEPIM, "-lkdepim") AC_SUBST(LIB_KDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@ -2089,8 +2089,8 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_KFILE, "-lkio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_KDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
@ -2099,10 +2099,10 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else else
AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi fi
]) ])

2
config.log
Unescape View File

@ -318,7 +318,7 @@ kde_styledir=''
kde_templatesdir='' kde_templatesdir=''
kde_wallpaperdir='' kde_wallpaperdir=''
kde_widgetdir='' kde_widgetdir=''
kdeinitdir='' tdeinitdir=''
libdir='${exec_prefix}/lib' libdir='${exec_prefix}/lib'
libexecdir='${exec_prefix}/libexec' libexecdir='${exec_prefix}/libexec'
localedir='${datarootdir}/locale' localedir='${datarootdir}/locale'

10
doc/Makefile
Unescape View File

@ -154,11 +154,11 @@ LIBUTIL = -lutil
LIBZ = -lz LIBZ = -lz
LIB_KAB = -lkab LIB_KAB = -lkab
LIB_KABC = -lkabc LIB_KABC = -lkabc
LIB_KDECORE = -lkdecore LIB_KDECORE = -ltdecore
LIB_KDED = LIB_KDED =
LIB_KDEPIM = -lkdepim LIB_KDEPIM = -ltdepim
LIB_KDEPRINT = -lkdeprint LIB_KDEPRINT = -ltdeprint
LIB_KDEUI = -lkdeui LIB_KDEUI = -ltdeui
LIB_KDNSSD = -lkdnssd LIB_KDNSSD = -lkdnssd
LIB_KFILE = -lkio LIB_KFILE = -lkio
LIB_KFM = LIB_KFM =
@ -284,7 +284,7 @@ kde_styledir = ${libdir}/trinity/plugins/styles
kde_templatesdir = /usr/share/templates kde_templatesdir = /usr/share/templates
kde_wallpaperdir = /usr/share/wallpapers kde_wallpaperdir = /usr/share/wallpapers
kde_widgetdir = /usr/lib/trinity/plugins/designer kde_widgetdir = /usr/lib/trinity/plugins/designer
kdeinitdir = $(kde_moduledir) tdeinitdir = $(kde_moduledir)
libdir = ${exec_prefix}/lib libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale localedir = ${datarootdir}/locale

10
doc/kmyfirewall/Makefile
Unescape View File

@ -138,11 +138,11 @@ LIBUTIL = -lutil
LIBZ = -lz LIBZ = -lz
LIB_KAB = -lkab LIB_KAB = -lkab
LIB_KABC = -lkabc LIB_KABC = -lkabc
LIB_KDECORE = -lkdecore LIB_KDECORE = -ltdecore
LIB_KDED = LIB_KDED =
LIB_KDEPIM = -lkdepim LIB_KDEPIM = -ltdepim
LIB_KDEPRINT = -lkdeprint LIB_KDEPRINT = -ltdeprint
LIB_KDEUI = -lkdeui LIB_KDEUI = -ltdeui
LIB_KDNSSD = -lkdnssd LIB_KDNSSD = -lkdnssd
LIB_KFILE = -lkio LIB_KFILE = -lkio
LIB_KFM = LIB_KFM =
@ -268,7 +268,7 @@ kde_styledir = ${libdir}/trinity/plugins/styles
kde_templatesdir = /usr/share/templates kde_templatesdir = /usr/share/templates
kde_wallpaperdir = /usr/share/wallpapers kde_wallpaperdir = /usr/share/wallpapers
kde_widgetdir = /usr/lib/trinity/plugins/designer kde_widgetdir = /usr/lib/trinity/plugins/designer
kdeinitdir = $(kde_moduledir) tdeinitdir = $(kde_moduledir)
libdir = ${exec_prefix}/lib libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale localedir = ${datarootdir}/locale

2
doc/kmyfirewall/index.docbook
Unescape View File

@ -1511,7 +1511,7 @@ You may find a downloadlink and some more information about it there.
<!-- <!--
List any special requirements for your application here. This should include: List any special requirements for your application here. This should include:
.Libraries or other software that is not included in kdesupport, .Libraries or other software that is not included in tdesupport,
kdelibs, or kdebase. kdelibs, or kdebase.
.Hardware requirements like amount of RAM, disk space, graphics card .Hardware requirements like amount of RAM, disk space, graphics card
capabilities, screen resolution, special expansion cards, etc. capabilities, screen resolution, special expansion cards, etc.

2
kmyfirewall.kdevelop
Unescape View File

@ -128,7 +128,7 @@
<globalcwd>/home/animal/devel/KDE-SVN/kmyfirewall</globalcwd> <globalcwd>/home/animal/devel/KDE-SVN/kmyfirewall</globalcwd>
<useglobalprogram>true</useglobalprogram> <useglobalprogram>true</useglobalprogram>
<autoinstall>false</autoinstall> <autoinstall>false</autoinstall>
<autokdesu>false</autokdesu> <autotdesu>false</autotdesu>
</run> </run>
<general> <general>
<useconfiguration>default</useconfiguration> <useconfiguration>default</useconfiguration>

2
kmyfirewall/Makefile.am
Unescape View File

@ -11,7 +11,7 @@ METASOURCES = AUTO
######################################################################### #########################################################################
bin_PROGRAMS = kmyfirewall bin_PROGRAMS = kmyfirewall
kmyfirewall_SOURCES = kmfconfigdialog.cpp kmyfirewall.cpp main.cpp kmyfirewall_SOURCES = kmfconfigdialog.cpp kmyfirewall.cpp main.cpp
kmyfirewall_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kmyfirewall_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kmyfirewall_LDADD = kmfwidgets/libkmfwidgets.la \ kmyfirewall_LDADD = kmfwidgets/libkmfwidgets.la \
core/libkmfcore.la $(LIB_KPARTS) core/libkmfcore.la $(LIB_KPARTS)

2
kmyfirewall/core/kprocesswrapper.cpp
Unescape View File

@ -83,7 +83,7 @@ void KProcessWrapper::slotStartLocalJob( const TQString& jobName, const TQString
m_childproc->clearArguments(); m_childproc->clearArguments();
if ( useKdeSu ) { if ( useKdeSu ) {
*m_childproc << "kdesu" << "-t" << "-i" << "kmyfirewall" << "--noignorebutton" << "-d" << "-c" << localScriptFile; *m_childproc << "tdesu" << "-t" << "-i" << "kmyfirewall" << "--noignorebutton" << "-d" << "-c" << localScriptFile;
} else { } else {
*m_childproc << "bash" << localScriptFile; *m_childproc << "bash" << localScriptFile;
} }

2
kmyfirewall/core/xmlnames.cpp
Unescape View File

@ -145,7 +145,7 @@ const TQString& Constants::StopFirewallJob_Name = "stop_firewall_job";
const TQString& Constants::InstallFirewallJob_Name = "install_firewall_job"; const TQString& Constants::InstallFirewallJob_Name = "install_firewall_job";
const TQString& Constants::UninstallFirewallJob_Name = "uninstall_firewall_job"; const TQString& Constants::UninstallFirewallJob_Name = "uninstall_firewall_job";
const TQString& Constants::ShowConfigJob_Name = "show_config_job"; const TQString& Constants::ShowConfigJob_Name = "show_config_job";
// const TQString& Constants::KdeSu_Cmd = "kdesu -t -i kmyfirewall -d -c "; // const TQString& Constants::KdeSu_Cmd = "tdesu -t -i kmyfirewall -d -c ";
} }

10
kmyfirewall/installer/openbsd/Makefile
Unescape View File

@ -192,11 +192,11 @@ LIBUTIL = -lutil
LIBZ = -lz LIBZ = -lz
LIB_KAB = -lkab LIB_KAB = -lkab
LIB_KABC = -lkabc LIB_KABC = -lkabc
LIB_KDECORE = -lkdecore LIB_KDECORE = -ltdecore
LIB_KDED = LIB_KDED =
LIB_KDEPIM = -lkdepim LIB_KDEPIM = -ltdepim
LIB_KDEPRINT = -lkdeprint LIB_KDEPRINT = -ltdeprint
LIB_KDEUI = -lkdeui LIB_KDEUI = -ltdeui
LIB_KDNSSD = -lkdnssd LIB_KDNSSD = -lkdnssd
LIB_KFILE = -lkio LIB_KFILE = -lkio
LIB_KFM = LIB_KFM =
@ -321,7 +321,7 @@ kde_styledir = ${libdir}/trinity/plugins/styles
kde_templatesdir = ${datadir}/templates kde_templatesdir = ${datadir}/templates
kde_wallpaperdir = ${datadir}/wallpapers kde_wallpaperdir = ${datadir}/wallpapers
kde_widgetdir = /usr/lib/trinity/plugins/designer kde_widgetdir = /usr/lib/trinity/plugins/designer
kdeinitdir = $(kde_moduledir) tdeinitdir = $(kde_moduledir)
libdir = ${exec_prefix}/lib libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale localedir = ${datarootdir}/locale

2
kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
Unescape View File

@ -73,7 +73,7 @@ KMFPFInstaller::KMFPFInstaller( TQObject* parent, const char* name ) : KMFPlugi
temp_file = new KTempFile(); temp_file = new KTempFile();
temp_file2 = new KTempFile(); temp_file2 = new KTempFile();
m_execWidget = 0; m_execWidget = 0;
// m_kdesuCommand = Constants::KdeSu_Cmd + " -i kmyfirewall -d -c "; // m_tdesuCommand = Constants::KdeSu_Cmd + " -i kmyfirewall -d -c ";
loadIcons(); loadIcons();
execWidget();*/ execWidget();*/
} }

2
kmyfirewall/kmfwidgets/kmfprocout.cpp
Unescape View File

@ -102,7 +102,7 @@ void KMFProcOut::startJob( const TQString &cmd, bool useKdeSu ) {
childproc->clearArguments(); childproc->clearArguments();
if( useKdeSu ) { if( useKdeSu ) {
*childproc << "kdesu" << "-t" << "-i" << "kmyfirewall" << "--noignorebutton" << "-d" << "-c" << cmd; *childproc << "tdesu" << "-t" << "-i" << "kmyfirewall" << "--noignorebutton" << "-d" << "-c" << cmd;
} else { } else {
*childproc << "bash" << cmd; *childproc << "bash" << cmd;
} }

Write Preview
Loading…
Cancel
Save