diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-05-26 02:21:38 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-05-26 02:21:38 -0500 |
commit | 37b408928efbcf6e3ff569eff42c69557749d6ec (patch) | |
tree | b74a8fc841e1e400737bcc2955303649c3dec6d2 | |
parent | 15cbe6d94327f69b793312be6b6b132bb50af651 (diff) | |
download | kcmldapmanager-37b408928efbcf6e3ff569eff42c69557749d6ec.tar.gz kcmldapmanager-37b408928efbcf6e3ff569eff42c69557749d6ec.zip |
Fix conflict with existing ldap joiner module
-rw-r--r-- | src/Makefile.am | 12 | ||||
-rw-r--r-- | src/ldapmanager.desktop (renamed from src/ldap.desktop) | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index dc6eb14..8a9cf31 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,18 +2,18 @@ INCLUDES = $(all_includes) METASOURCES = AUTO # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = kcm_ldap.la +kde_module_LTLIBRARIES = kcm_ldapmanager.la -kcm_ldap_la_SOURCES = ldap.cpp ldapconfigbase.ui -kcm_ldap_la_LIBADD = -lkio $(LIB_TDEUI) -kcm_ldap_la_LDFLAGS = -avoid-version -module -no-undefined \ +kcm_ldapmanager_la_SOURCES = ldap.cpp ldapconfigbase.ui +kcm_ldapmanager_la_LIBADD = -lkio $(LIB_TDEUI) +kcm_ldapmanager_la_LDFLAGS = -avoid-version -module -no-undefined \ $(all_libraries) -xdg_apps_DATA = ldap.desktop +xdg_apps_DATA = ldapmanager.desktop messages: rc.cpp $(EXTRACTRC) `find -name \*.ui -o -name \*.rc` > rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kcmldap.pot + $(XGETTEXT) *.cpp -o $(podir)/kcmldapmanager.pot diff --git a/src/ldap.desktop b/src/ldapmanager.desktop index 72246c2..4d0ba8a 100644 --- a/src/ldap.desktop +++ b/src/ldapmanager.desktop @@ -1,17 +1,17 @@ [Desktop Entry] Encoding=UTF-8 -Exec=kcmshell ldap +Exec=kcmshell ldapmanager Icon=tdmconfig Type=Application X-KDE-ModuleType=Library -X-KDE-Library=ldap +X-KDE-Library=ldapmanager X-KDE-HasReadOnlyMode=false X-KDE-ParentApp=kcontrol [Desktop Entry] Encoding=UTF-8 -Comment=A KControl tool for managing TDE connections to LDAP realms. +Comment=A KControl tool for managing users, groups, and machines in LDAP realms Keywords=ldap manager Name=LDAP Realm Manager Categories=Qt;KDE;X-KDE-settings-components; |