| d32cf272 | 2014-11-20 15:23:13 | Timothy Pearson |
Add missing text-x-generic-new icons |
||
|
A pics/crystalsvg/cr16-mime-text-x-generic-new.png A pics/crystalsvg/cr22-mime-text-x-generic-new.png A pics/crystalsvg/cr32-mime-text-x-generic-new.png A pics/crystalsvg/cr48-mime-text-x-generic-new.png |
||
diff --git a/pics/crystalsvg/cr16-mime-text-x-generic-new.png b/pics/crystalsvg/cr16-mime-text-x-generic-new.png new file mode 100644 index 0000000..84c4071 --- /dev/null +++ b/pics/crystalsvg/cr16-mime-text-x-generic-new.png Binary files differ diff --git a/pics/crystalsvg/cr22-mime-text-x-generic-new.png b/pics/crystalsvg/cr22-mime-text-x-generic-new.png new file mode 100644 index 0000000..004ca03 --- /dev/null +++ b/pics/crystalsvg/cr22-mime-text-x-generic-new.png Binary files differ diff --git a/pics/crystalsvg/cr32-mime-text-x-generic-new.png b/pics/crystalsvg/cr32-mime-text-x-generic-new.png new file mode 100644 index 0000000..6e838b3 --- /dev/null +++ b/pics/crystalsvg/cr32-mime-text-x-generic-new.png Binary files differ diff --git a/pics/crystalsvg/cr48-mime-text-x-generic-new.png b/pics/crystalsvg/cr48-mime-text-x-generic-new.png new file mode 100644 index 0000000..49a8355 --- /dev/null +++ b/pics/crystalsvg/cr48-mime-text-x-generic-new.png Binary files differ |
||
| d1cb7da7 | 2014-11-20 15:23:55 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs |
||
|
M tdeprint/cups/make_driver_db_cups.cpp |
||
diff --git a/tdeprint/cups/make_driver_db_cups.cpp b/tdeprint/cups/make_driver_db_cups.cpp
index c658181..a6dec11 100644
--- a/tdeprint/cups/make_driver_db_cups.cpp
+++ b/tdeprint/cups/make_driver_db_cups.cpp
@@ -203,6 +203,13 @@
}
}
+void initCompressedPpd(const char *dirname)
+{
+ // HACK
+ // The initPpd function actually handles the compressed PPDs as well, so do nothing here
+ // If we were to rerun initPpd here then all drivers would be duplicated!
+}
+
int parsePpdFile(const char *filename, const char *origin, const char *metadata, FILE *output_file)
{
gzFile ppd_file;
@@ -350,7 +357,7 @@
int main(int argc, char *argv[])
{
registerHandler("ppd:", initPpd, parsePpdFile);
- registerHandler("compressed-ppd:", initPpd, parseCompressedPpdFile);
+ registerHandler("compressed-ppd:", initCompressedPpd, parseCompressedPpdFile);
initFoomatic();
return execute(argc, argv);
}
|
||