[prev in list] [next in list] [prev in thread] [next in thread]
List: klik-devel
Subject: [klik-devel] [klikclient commit] r1435 - in trunk/client/trunk:
From: codesite-noreply () google ! com
Date: 2008-03-24 13:01:41
Message-ID: 0016e64135bc04492e6fe92eb0e238c6 () google ! com
[Download RAW message or body]
Author: lionel.tricon
Date: Mon Mar 24 06:00:50 2008
New Revision: 1435
Modified:
trunk/client/trunk/cmg_kfile/Makefile.in
trunk/client/trunk/cmg_kfile/doc/Makefile.in
trunk/client/trunk/cmg_kfile/doc/en/Makefile.in
trunk/client/trunk/cmg_kfile/po/Makefile.in
trunk/client/trunk/cmg_kfile/src/Makefile.in
trunk/client/trunk/cmg_kfile/src/kfile_cmg.cpp
trunk/client/trunk/cmg_kfile/src/kfile_cmg.desktop
trunk/client/trunk/cmg_kthumbnail/src/isofscreator.cpp
trunk/client/trunk/cmg_kthumbnail/src/isofsthumbnail.desktop
Log:
Change x-extension-cmg to x-application-cmg
Modified: trunk/client/trunk/cmg_kfile/Makefile.in
==============================================================================
--- trunk/client/trunk/cmg_kfile/Makefile.in (original)
+++ trunk/client/trunk/cmg_kfile/Makefile.in Mon Mar 24 06:00:50 2008
@@ -844,28 +844,6 @@
-clean-bcheck:
- rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-recursive
-
-bcheck-am:
- @for i in ; do \
- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c \
$$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
- perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f \
$$i.bchecktest.cc; exit 1; }; \
- rm -f a.out; \
- fi ; \
- done
-
-
-
#>+ 2
KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs \
aclocal.m4 Doxyfile README.devel acinclude.m4 configure Makefile.am
Modified: trunk/client/trunk/cmg_kfile/doc/Makefile.in
==============================================================================
--- trunk/client/trunk/cmg_kfile/doc/Makefile.in (original)
+++ trunk/client/trunk/cmg_kfile/doc/Makefile.in Mon Mar 24 06:00:50 2008
@@ -654,8 +654,6 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-
#>+ 2
KDE_DIST=Makefile.in Makefile.am
Modified: trunk/client/trunk/cmg_kfile/doc/en/Makefile.in
==============================================================================
--- trunk/client/trunk/cmg_kfile/doc/en/Makefile.in (original)
+++ trunk/client/trunk/cmg_kfile/doc/en/Makefile.in Mon Mar 24 06:00:50 2008
@@ -487,8 +487,6 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-
#>+ 2
KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
Modified: trunk/client/trunk/cmg_kfile/po/Makefile.in
==============================================================================
--- trunk/client/trunk/cmg_kfile/po/Makefile.in (original)
+++ trunk/client/trunk/cmg_kfile/po/Makefile.in Mon Mar 24 06:00:50 2008
@@ -34,7 +34,7 @@
host_triplet = @host@
target_triplet = @target@
subdir = po
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.in
@@ -493,9 +493,8 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
#>+ 2
-KDE_DIST=kfile_cmg.es.po Makefile.in kfile_cmg.es.mo kfile_cmg.fr.po kfile_cmg.fr.mo \
Makefile.am README +KDE_DIST=kfile_cmg.es.po kfile_cmg.mo Makefile.in kfile_cmg.fr.po \
Makefile.am
#>+ 7
kfile_cmg.es.gmo: kfile_cmg.es.po
Modified: trunk/client/trunk/cmg_kfile/src/Makefile.in
==============================================================================
--- trunk/client/trunk/cmg_kfile/src/Makefile.in (original)
+++ trunk/client/trunk/cmg_kfile/src/Makefile.in Mon Mar 24 06:00:50 2008
@@ -686,8 +686,6 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-
#>+ 3
kfile_cmg.moc: $(srcdir)/kfile_cmg.h
$(MOC) $(srcdir)/kfile_cmg.h -o kfile_cmg.moc
Modified: trunk/client/trunk/cmg_kfile/src/kfile_cmg.cpp
==============================================================================
--- trunk/client/trunk/cmg_kfile/src/kfile_cmg.cpp (original)
+++ trunk/client/trunk/cmg_kfile/src/kfile_cmg.cpp Mon Mar 24 06:00:50 2008
@@ -51,7 +51,7 @@
) : KFilePlugin(parent, name, args)
{
// add the mimetype here
- KFileMimeTypeInfo* info = addMimeTypeInfo("application/x-extension-cmg");
+ KFileMimeTypeInfo* info = addMimeTypeInfo("application/x-application-cmg");
// create all groups
KFileMimeTypeInfo::GroupInfo *group=0L;
Modified: trunk/client/trunk/cmg_kfile/src/kfile_cmg.desktop
==============================================================================
--- trunk/client/trunk/cmg_kfile/src/kfile_cmg.desktop (original)
+++ trunk/client/trunk/cmg_kfile/src/kfile_cmg.desktop Mon Mar 24 06:00:50 2008
@@ -27,7 +27,7 @@
Name[zh_CN]=cmg的信息
ServiceTypes=KFilePlugin
X-KDE-Library=kfile_cmg
-MimeType=application/x-extension-cmg
+MimeType=application/x-application-cmg
# change PreferredGroups here! (example: FolderInfo)
PreferredGroups=
# change PreferredItems here! (example: Items;Size)
Modified: trunk/client/trunk/cmg_kthumbnail/src/isofscreator.cpp
==============================================================================
--- trunk/client/trunk/cmg_kthumbnail/src/isofscreator.cpp (original)
+++ trunk/client/trunk/cmg_kthumbnail/src/isofscreator.cpp Mon Mar 24 06:00:50 2008
@@ -149,6 +149,7 @@
{
QString v_image = "/.DirIcon";
+printf("hello world\n");
// initialize the CIsoUtl class with the cmg file
_isoUtl = new CIsoUtl(p_path.latin1());
Modified: trunk/client/trunk/cmg_kthumbnail/src/isofsthumbnail.desktop
==============================================================================
--- trunk/client/trunk/cmg_kthumbnail/src/isofsthumbnail.desktop (original)
+++ trunk/client/trunk/cmg_kthumbnail/src/isofsthumbnail.desktop Mon Mar 24 06:00:50 2008
@@ -3,6 +3,6 @@
Type=Service
Name=Compressed Application Image (klik)
ServiceTypes=ThumbCreator
-MimeTypes=application/x-extension-cmg
+MimeTypes=application/x-application-cmg
X-KDE-Library=isofsthumbnail
CacheThumbnail=true
_______________________________________________
klik-devel mailing list
klik-devel@kde.org
https://mail.kde.org/mailman/listinfo/klik-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic