Author: arekm                        Date: Fri Feb  3 07:14:12 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updates including sec fix

---- Files affected:
SOURCES:
   kdegraphics-branch.diff (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SOURCES/kdegraphics-branch.diff
diff -u SOURCES/kdegraphics-branch.diff:1.11 
SOURCES/kdegraphics-branch.diff:1.12
--- SOURCES/kdegraphics-branch.diff:1.11        Fri Jan 13 19:47:39 2006
+++ SOURCES/kdegraphics-branch.diff     Fri Feb  3 08:14:07 2006
@@ -1,7093 +1,246 @@
-Index: kpdf/kpdf_part.desktop
-===================================================================
---- kpdf/kpdf_part.desktop     (.../tags/KDE/3.5.0/kdegraphics)        
(revision 497739)
-+++ kpdf/kpdf_part.desktop     (.../branches/KDE/3.5/kdegraphics)      
(revision 497739)
-@@ -4,7 +4,6 @@
- Name=KPDF
- Name[ar]=برنامج KPDF
- Name[hi]=के-पीडीएफ
--Name[xx]=xxKPDFxx
- MimeType=application/pdf
- InitialPreference=7
- ServiceTypes=KParts/ReadOnlyPart
-Index: kpdf/part.cpp
-===================================================================
---- kpdf/part.cpp      (.../tags/KDE/3.5.0/kdegraphics)        (revision 
497739)
-+++ kpdf/part.cpp      (.../branches/KDE/3.5/kdegraphics)      (revision 
497739)
-@@ -274,6 +274,8 @@
-       connect( m_watcher, SIGNAL( dirty( const QString& ) ), this, SLOT( 
slotFileDirty( const QString& ) ) );
-       m_dirtyHandler = new QTimer( this );
-       connect( m_dirtyHandler, SIGNAL( timeout() ),this, SLOT( 
slotDoFileDirty() ) );
-+      m_saveSplitterSizeTimer = new QTimer( this );
-+      connect( m_saveSplitterSizeTimer, SIGNAL( timeout() ),this, SLOT( 
saveSplitterSize() ) );
- 
-       slotNewConfig();
- 
-@@ -478,7 +480,7 @@
- {
-     // if pageView has been resized, save splitter sizes
-     if ( watched == m_pageView && e->type() == QEvent::Resize )
--        saveSplitterSize();
-+        m_saveSplitterSizeTimer->start(500, true);
- 
-     // only intercept events, don't block them
-     return false;
-Index: kpdf/part.h
-===================================================================
---- kpdf/part.h        (.../tags/KDE/3.5.0/kdegraphics)        (revision 
497739)
-+++ kpdf/part.h        (.../branches/KDE/3.5/kdegraphics)      (revision 
497739)
-@@ -146,6 +146,11 @@
-       // static instances counter
-       static unsigned int m_count;
- 
-+      // this is a hack because we can not use writeConfig on part destructor
-+      // and we don't want to writeconfig every time someone moves the 
splitter
-+      // so we use a QTimer each 500 ms
-+      QTimer *m_saveSplitterSizeTimer;
-+
-       KDirWatch *m_watcher;
-       QTimer *m_dirtyHandler;
-       DocumentViewport m_viewportDirty;
-Index: kpdf/xpdf/xpdf/JBIG2Stream.cc
-===================================================================
---- kpdf/xpdf/xpdf/JBIG2Stream.cc      (.../tags/KDE/3.5.0/kdegraphics)        
(revision 497739)
-+++ kpdf/xpdf/xpdf/JBIG2Stream.cc      (.../branches/KDE/3.5/kdegraphics)      
(revision 497739)
-@@ -7,6 +7,7 @@
- //========================================================================
- 
- #include <aconf.h>
-+#include <limits.h>
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -681,6 +682,12 @@
-   w = wA;
-   h = hA;
-   line = (wA + 7) >> 3;
-+
-+  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line ) {
-+    data = NULL;
-+    return;
-+  }
-+  
-   // need to allocate one extra guard byte for use in combine()
-   data = (Guchar *)gmalloc(h * line + 1);
-   data[h * line] = 0;
-@@ -692,6 +699,12 @@
-   w = bitmap->w;
-   h = bitmap->h;
-   line = bitmap->line;
-+
-+  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
-+    data = NULL;
-+    return;
-+  }
-+ 
-   // need to allocate one extra guard byte for use in combine()
-   data = (Guchar *)gmalloc(h * line + 1);
-   memcpy(data, bitmap->data, h * line);
-@@ -720,7 +733,8 @@
- }
- 
- void JBIG2Bitmap::expand(int newH, Guint pixel) {
--  if (newH <= h) {
-+
-+  if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) {
-     return;
-   }
-   // need to allocate one extra guard byte for use in combine()
-@@ -2305,6 +2319,15 @@
-     error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone 
segment");
-     return;
-   }
-+  if (gridH == 0 || gridW >= INT_MAX / gridH) {
-+    error(getPos(), "Bad size in JBIG2 halftone segment");
-+    return;
-+  }
-+  if (h < 0 || w == 0 || h >= INT_MAX / w) {
-+     error(getPos(), "Bad size in JBIG2 bitmap segment");
-+    return;
-+  }
-+
-   patternDict = (JBIG2PatternDict *)seg;
-   bpp = 0;
-   i = 1;
-@@ -2936,6 +2959,9 @@
-   JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2;
-   int x, y, pix;
- 
-+  if (w < 0 || h <= 0 || w >= INT_MAX / h)
-+    return NULL;
-+
-   bitmap = new JBIG2Bitmap(0, w, h);
-   bitmap->clearToZero();
- 
-Index: kpdf/xpdf/xpdf/Stream.cc
-===================================================================
---- kpdf/xpdf/xpdf/Stream.cc   (.../tags/KDE/3.5.0/kdegraphics)        
(revision 497739)
-+++ kpdf/xpdf/xpdf/Stream.cc   (.../branches/KDE/3.5/kdegraphics)      
(revision 497739)
-@@ -15,6 +15,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
-+#include <limits.h>
- #ifndef WIN32
- #include <unistd.h>
- #endif
-@@ -408,13 +409,27 @@
-   width = widthA;
-   nComps = nCompsA;
-   nBits = nBitsA;
-+  predLine = NULL;
-+  ok = gFalse;
- 
-+  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-+      nComps >= INT_MAX / nBits ||
-+      width >= INT_MAX / nComps / nBits)
-+    return;
-+
-   nVals = width * nComps;
-+  if (nVals * nBits + 7 <= 0)
-+    return;
-   pixBytes = (nComps * nBits + 7) >> 3;
-   rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
-+  if (rowBytes < 0)
-+    return;
-+
-   predLine = (Guchar *)gmalloc(rowBytes);
-   memset(predLine, 0, rowBytes);
-   predIdx = rowBytes;
-+
-+  ok = gTrue;
- }
- 
- StreamPredictor::~StreamPredictor() {
-@@ -1006,6 +1021,10 @@
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-@@ -1258,8 +1277,9 @@
-   endOfLine = endOfLineA;
-   byteAlign = byteAlignA;
-   columns = columnsA;
--  if (columns < 1) {
--    columns = 1;
-+  if (columns < 1 || columns >= INT_MAX / sizeof(short)) {
-+     error(getPos(), "Bad number of columns in CCITTFaxStream");
-+     exit(1);
-   }
-   rows = rowsA;
-   endOfBlock = endOfBlockA;
-@@ -2903,7 +2923,12 @@
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
--  if (prec != 8) {
-+  if (numComps <= 0 || numComps > 4) {
-+    numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream", prec);
-+    return gFalse;
-+  }
-+ if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-   }
-@@ -2929,6 +2954,11 @@
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
-+  if (numComps <= 0 || numComps > 4) {
-+    numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream");
-+    return gFalse;
-+  }
-   if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-@@ -2951,6 +2981,11 @@
- 
-   length = read16() - 2;
-   scanInfo.numComps = str->getChar();
-+  if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
-+    scanInfo.numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream");
-+    return gFalse;
-+  }
-   --length;
-   if (length != 2 * scanInfo.numComps + 3) {
-     error(getPos(), "Bad DCT scan info block");
-@@ -3035,12 +3070,12 @@
-   while (length > 0) {
-     index = str->getChar();
-     --length;
--    if ((index & 0x0f) >= 4) {
-+    if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) {
-       error(getPos(), "Bad DCT Huffman table");
-       return gFalse;
-     }
-     if (index & 0x10) {
--      index &= 0x0f;
-+      index &= 0x03;
-       if (index >= numACHuffTables)
-       numACHuffTables = index+1;
-       tbl = &acHuffTables[index];
-@@ -3833,6 +3868,10 @@
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-Index: kpdf/xpdf/xpdf/Stream.h
-===================================================================
---- kpdf/xpdf/xpdf/Stream.h    (.../tags/KDE/3.5.0/kdegraphics)        
(revision 497739)
-+++ kpdf/xpdf/xpdf/Stream.h    (.../branches/KDE/3.5/kdegraphics)      
(revision 497739)
-@@ -232,6 +232,8 @@
- 
-   ~StreamPredictor();
- 
-+  GBool isOk() { return ok; }
-+
-   int lookChar();
-   int getChar();
- 
-@@ -249,6 +251,7 @@
-   int rowBytes;                       // bytes per line
-   Guchar *predLine;           // line buffer
-   int predIdx;                        // current index in predLine
-+  GBool ok;
- };
- 
- //------------------------------------------------------------------------
-Index: kpdf/xpdf/xpdf/Page.cc
-===================================================================
---- kpdf/xpdf/xpdf/Page.cc     (.../tags/KDE/3.5.0/kdegraphics)        
(revision 497739)
-+++ kpdf/xpdf/xpdf/Page.cc     (.../branches/KDE/3.5/kdegraphics)      
(revision 497739)
-@@ -66,6 +66,20 @@
-   if (!haveCropBox) {
-     cropBox = mediaBox;
-   }
-+  else
-+  {
-+    // cropBox can not be bigger than mediaBox
-+    if (cropBox.x2 - cropBox.x1 > mediaBox.x2 - mediaBox.x1)
-+    {
-+      cropBox.x1 = mediaBox.x1;
-+      cropBox.x2 = mediaBox.x2;
-+    }
-+    if (cropBox.y2 - cropBox.y1 > mediaBox.y2 - mediaBox.y1)
-+    {
-+      cropBox.y1 = mediaBox.y1;
-+      cropBox.y2 = mediaBox.y2;
-+    }
-+  }
- 
-   // other boxes
-   bleedBox = cropBox;
-Index: kpdf/xpdf/xpdf/DCTStream.cc
-===================================================================
---- kpdf/xpdf/xpdf/DCTStream.cc        (.../tags/KDE/3.5.0/kdegraphics)        
(revision 497739)
-+++ kpdf/xpdf/xpdf/DCTStream.cc        (.../branches/KDE/3.5/kdegraphics)      
(revision 497739)
-@@ -14,19 +14,25 @@
- 
- static boolean str_fill_input_buffer(j_decompress_ptr cinfo)
- {
-+  int c;
-   struct str_src_mgr * src = (struct str_src_mgr *)cinfo->src;
-   if (src->index == 0) {
--    src->buffer = 0xFF;
-+    c = 0xFF;
-     src->index++;
-   }
-   else if (src->index == 1) {
--    src->buffer = 0xD8;
-+    c = 0xD8;
-     src->index++;
-   }
--  else src->buffer = src->str->getChar();
--  src->pub.next_input_byte = &src->buffer;
--  src->pub.bytes_in_buffer = 1;
--  return TRUE;
-+  else c = src->str->getChar();
-+  if (c != EOF)
-+  {
-+    src->buffer = c;
-+    src->pub.next_input_byte = &src->buffer;
-+    src->pub.bytes_in_buffer = 1;
-+    return TRUE;
-+  }
-+  else return FALSE;
- }
- 
- static void str_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
-@@ -81,18 +87,17 @@
-   // the start marker...
-   bool startFound = false;
-   int c = 0, c2 = 0;
--  int n = 0;
-   while (!startFound)
-   {
-     if (!c)
-     {
-       c = str->getChar();
--      if (c != 0xFF) c = 0;
-       if (c == -1)
-       {
-         error(-1, "Could not find start of jpeg data");
-         exit(1);
-       }
-+      if (c != 0xFF) c = 0;
-     }
-     else
-     {
-@@ -104,7 +109,6 @@
-       }
-       else startFound = true;
-     }
--    n++;
-   }
- 
-   jpeg_read_header(&cinfo, TRUE);
-@@ -119,7 +123,9 @@
- 
-   if (x == 0) {
-     if (cinfo.output_scanline < cinfo.output_height)
--      jpeg_read_scanlines(&cinfo, row_buffer, 1);
-+    {
-+      if (!jpeg_read_scanlines(&cinfo, row_buffer, 1)) return EOF;
-+    }
-     else return EOF;
-   }
-   c = row_buffer[0][x];
-Index: kpdf/xpdf/xpdf/JPXStream.cc
-===================================================================
---- kpdf/xpdf/xpdf/JPXStream.cc        (.../tags/KDE/3.5.0/kdegraphics)        
(revision 497739)
-+++ kpdf/xpdf/xpdf/JPXStream.cc        (.../branches/KDE/3.5/kdegraphics)      
(revision 497739)
-@@ -7,6 +7,7 @@
- //========================================================================
- 
- #include <aconf.h>
-+#include <limits.h>
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -783,7 +784,7 @@
-   int segType;
-   GBool haveSIZ, haveCOD, haveQCD, haveSOT;
-   Guint precinctSize, style;
--  Guint segLen, capabilities, comp, i, j, r;
-+  Guint segLen, capabilities, nTiles, comp, i, j, r;
- 
-   //----- main header
-   haveSIZ = haveCOD = haveQCD = haveSOT = gFalse;
-@@ -818,8 +819,13 @@
-                   / img.xTileSize;
-       img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
-                   / img.yTileSize;
--      img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
--                                   sizeof(JPXTile));
-+      nTiles = img.nXTiles * img.nYTiles;
-+      // check for overflow before allocating memory
-+      if (img.nXTiles <= 0 || img.nYTiles <= 0 || img.nXTiles >= INT_MAX / 
img.nYTiles) {
-+      error(getPos(), "Bad tile count in JPX SIZ marker segment");
-+      return gFalse;
-+      }
-+      img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile));
-       for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
-       img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps,
-                                                       sizeof(JPXTileComp));
-Index: kpdf/xpdf/goo/gmem.c
-===================================================================
---- kpdf/xpdf/goo/gmem.c       (.../tags/KDE/3.5.0/kdegraphics)        
(revision 497739)
-+++ kpdf/xpdf/goo/gmem.c       (.../branches/KDE/3.5/kdegraphics)      
(revision 497739)
-@@ -11,6 +11,7 @@
- #include <stdlib.h>
- #include <stddef.h>
- #include <string.h>
-+#include <limits.h>
- #include "gmem.h"
- 
- #ifdef DEBUG_MEM
-@@ -141,7 +142,7 @@
-   int n;
- 
-   n = nObjs * objSize;
--  if (objSize == 0 || n / objSize != nObjs) {
-+  if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
-     fprintf(stderr, "Bogus memory allocation size\n");
-     exit(1);
-   }
-@@ -152,7 +153,7 @@
-   int n;
- 
-   n = nObjs * objSize;
--  if (objSize == 0 || n / objSize != nObjs) {
-+  if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
-     fprintf(stderr, "Bogus memory allocation size\n");
-     exit(1);
-   }
-Index: kpdf/shell/shell.cpp
-===================================================================
---- kpdf/shell/shell.cpp       (.../tags/KDE/3.5.0/kdegraphics)        
(revision 497739)
-+++ kpdf/shell/shell.cpp       (.../branches/KDE/3.5/kdegraphics)      
(revision 497739)
-@@ -132,31 +132,6 @@
-     KGlobal::config()->setDesktopGroup();
-     bool fullScreen = KGlobal::config()->readBoolEntry( "FullScreen", false );
-     setFullScreen( fullScreen );
--
--    // necessary to make fullscreen mode obey the last showmenubar /  
showtoolbarsettings
--    KGlobal::config()->setGroup("MainWindow");
--    if (KGlobal::config()->readBoolEntry( "MenuBar", true ))
--    {
--      m_showMenuBarAction->setChecked(true);
--      menuBar()->show();
--    }
--    else
--    {
--      m_showMenuBarAction->setChecked(false);
--      menuBar()->hide();
--    }
--
--    KGlobal::config()->setGroup("MainWindow Toolbar mainToolBar");
--    if (KGlobal::config()->readBoolEntry("Hidden", false))
--    {
--      m_showToolBarAction->setChecked(true);
--      toolBar()->hide();
--    }
--    else
--    {
--      m_showToolBarAction->setChecked(false);
--      toolBar()->show();
--    }
- }
- 
- void Shell::writeSettings()
-Index: kpdf/shell/kpdf.desktop
-===================================================================
---- kpdf/shell/kpdf.desktop    (.../tags/KDE/3.5.0/kdegraphics)        
(revision 497739)
-+++ kpdf/shell/kpdf.desktop    (.../branches/KDE/3.5/kdegraphics)      
(revision 497739)
-@@ -5,7 +5,6 @@
- Name=KPDF
- Name[ar]=برنامج KPDF
- Name[hi]=के-पीडीएफ
--Name[xx]=xxKPDFxx
- GenericName=PDF Viewer
- GenericName[ar]=عارض ملفات PDF
- GenericName[az]=PDF Nümayişçisi
-@@ -62,7 +61,6 @@
- GenericName[uz]=PDF кўрувчи
- GenericName[ven]=Tshivhoni tsha PDF
- GenericName[xh]=Umboniseli we PDF
--GenericName[xx]=xxPDF Viewerxx
- GenericName[zh_CN]=PDF 查看器
- GenericName[zu]=Umboniseli we PDF
- Exec=kpdf %U %i %m -caption "%c"
-Index: kpdf/part.rc
-===================================================================
---- kpdf/part.rc       (.../tags/KDE/3.5.0/kdegraphics)        (revision 
497739)
-+++ kpdf/part.rc       (.../branches/KDE/3.5/kdegraphics)      (revision 
497739)
-@@ -35,7 +35,7 @@
-     <Separator/>
-     <Action name="goto_page"/>
-   </Menu>
--  <Menu name="mouseMode"><text>&amp;Tools</text>
-+  <Menu name="tools"><text>&amp;Tools</text>
-     <Action name="mouse_drag"/>
-     <Action name="mouse_zoom"/>
-     <Action name="mouse_select"/>
-Index: kpdf/ui/presentationwidget.cpp
-===================================================================
---- kpdf/ui/presentationwidget.cpp     (.../tags/KDE/3.5.0/kdegraphics)        
(revision 497739)
-+++ kpdf/ui/presentationwidget.cpp     (.../branches/KDE/3.5/kdegraphics)      
(revision 497739)
-@@ -171,12 +171,14 @@
- 
- 
- // <widget events>
-+/* This hack was here to fix 103718 but it's no longer necessary on KDE 3.5 
and Lubos asked me to remove it
- bool PresentationWidget::event ( QEvent * e )
- {
-     if (e -> type() == QEvent::WindowDeactivate) KWin::clearState(winId(), 
NET::StaysOnTop);
-     else if (e -> type() == QEvent::WindowActivate) KWin::setState(winId(), 
NET::StaysOnTop);
-     return QDialog::event(e);
- }
-+*/
- 
- void PresentationWidget::keyPressEvent( QKeyEvent * e )
- {
-Index: kpdf/ui/presentationwidget.h
-===================================================================
---- kpdf/ui/presentationwidget.h       (.../tags/KDE/3.5.0/kdegraphics)        
(revision 497739)
-+++ kpdf/ui/presentationwidget.h       (.../branches/KDE/3.5/kdegraphics)      
(revision 497739)
-@@ -46,7 +46,7 @@
- 
-     protected:
-         // widget events
--        bool event( QEvent * e );
-+//        bool event( QEvent * e );
-         void keyPressEvent( QKeyEvent * e );
-         void wheelEvent( QWheelEvent * e );
-         void mousePressEvent( QMouseEvent * e );
-Index: kfaxview/kfaxmultipage_tiff.desktop
-===================================================================
---- kfaxview/kfaxmultipage_tiff.desktop        
(.../tags/KDE/3.5.0/kdegraphics)        (revision 497739)
-+++ kfaxview/kfaxmultipage_tiff.desktop        
(.../branches/KDE/3.5/kdegraphics)      (revision 497739)
-@@ -3,7 +3,6 @@
- Name=kfaxview_tiff
- Name[da]=Kfaxview TIFF
- Name[sv]=Kfaxview TIFF
--Name[xx]=xxkfaxview_tiffxx
- Name[zh_CN]=KFaxView_tiff
- Icon=kfaxview
- Type=Service
-@@ -14,9 +13,12 @@
- Comment[cs]=KViewShell modul pro faxovĂŠ soubory
- Comment[da]=Kviewshell-plugin for telefaxfiler
- Comment[de]=Ein Modul fĂźr KViewShell zum Betrachten von Faxdateien
-+Comment[el]=Πρόσθετο του KViewShell για αρχεία φαξ
- Comment[es]=ExtensiĂłn KViewShell para archivos de fax
- Comment[et]=KView faksifailide plugin
-+Comment[eu]=Fax fitxategientzatko KViewShell-en plugina
- Comment[fr]=Module KViewShell pour les fichiers fax
-+Comment[hu]=KViewShell-modul faxfĂĄjlokhoz
- Comment[is]=KViewShell Ă­forrit fyrir faxskrĂĄr
- Comment[it]=Plugin KViewShell per file di fax
- Comment[ja]=FAX ファイル用の KViewShell プラグイン
-@@ -33,7 +35,6 @@
- Comment[sv]=Kviewshell-insticksprogram fĂśr telefaxfiler
- Comment[tr]=Faks dosyalarĹ için KViewShell eklentisi
- Comment[uk]=Втулок перегляду файлів факсів для 
KViewShell
--Comment[xx]=xxKViewShell plugin for fax filesxx
- Comment[zh_CN]=传真文件的 KViewShell 插件
- ServiceTypes=KViewShell/MultiPage
- X-KDE-MimeTypes=image/tiff
-Index: kfaxview/kfaxmultipage.desktop
-===================================================================
---- kfaxview/kfaxmultipage.desktop     (.../tags/KDE/3.5.0/kdegraphics)        
(revision 497739)
-+++ kfaxview/kfaxmultipage.desktop     (.../branches/KDE/3.5/kdegraphics)      
(revision 497739)
-@@ -1,10 +1,10 @@
- [Desktop Entry]
- Encoding=UTF-8
- Name=kfaxview
-+Name[hu]=KFaxView
- Name[ja]=KfaxView
- Name[nb]=Kfaxview
- Name[sv]=Kfaxview
--Name[xx]=xxkfaxviewxx
- Name[zh_CN]=KFaxView
- Icon=kfaxview
- Type=Service
-@@ -15,9 +15,12 @@
- Comment[cs]=KViewShell modul pro faxovĂŠ soubory
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdegraphics-branch.diff?r1=1.11&r2=1.12&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to