head	1.10;
access;
symbols
	pkgsrc-2013Q2:1.10.0.48
	pkgsrc-2013Q2-base:1.10
	pkgsrc-2012Q4:1.10.0.46
	pkgsrc-2012Q4-base:1.10
	pkgsrc-2011Q4:1.10.0.44
	pkgsrc-2011Q4-base:1.10
	pkgsrc-2011Q2:1.10.0.42
	pkgsrc-2011Q2-base:1.10
	pkgsrc-2009Q4:1.10.0.40
	pkgsrc-2009Q4-base:1.10
	pkgsrc-2008Q4:1.10.0.38
	pkgsrc-2008Q4-base:1.10
	pkgsrc-2008Q3:1.10.0.36
	pkgsrc-2008Q3-base:1.10
	cube-native-xorg:1.10.0.34
	cube-native-xorg-base:1.10
	pkgsrc-2008Q2:1.10.0.32
	pkgsrc-2008Q2-base:1.10
	pkgsrc-2008Q1:1.10.0.30
	pkgsrc-2008Q1-base:1.10
	pkgsrc-2007Q4:1.10.0.28
	pkgsrc-2007Q4-base:1.10
	pkgsrc-2007Q3:1.10.0.26
	pkgsrc-2007Q3-base:1.10
	pkgsrc-2007Q2:1.10.0.24
	pkgsrc-2007Q2-base:1.10
	pkgsrc-2007Q1:1.10.0.22
	pkgsrc-2007Q1-base:1.10
	pkgsrc-2006Q4:1.10.0.20
	pkgsrc-2006Q4-base:1.10
	pkgsrc-2006Q3:1.10.0.18
	pkgsrc-2006Q3-base:1.10
	pkgsrc-2006Q2:1.10.0.16
	pkgsrc-2006Q2-base:1.10
	pkgsrc-2006Q1:1.10.0.14
	pkgsrc-2006Q1-base:1.10
	pkgsrc-2005Q4:1.10.0.12
	pkgsrc-2005Q4-base:1.10
	pkgsrc-2005Q3:1.10.0.10
	pkgsrc-2005Q3-base:1.10
	pkgsrc-2005Q2:1.10.0.8
	pkgsrc-2005Q2-base:1.10
	pkgsrc-2005Q1:1.10.0.6
	pkgsrc-2005Q1-base:1.10
	pkgsrc-2004Q4:1.10.0.4
	pkgsrc-2004Q4-base:1.10
	pkgsrc-2004Q3:1.10.0.2
	pkgsrc-2004Q3-base:1.10
	pkgsrc-2004Q2:1.8.0.4
	pkgsrc-2004Q2-base:1.8
	pkgsrc-2004Q1:1.8.0.2
	pkgsrc-2004Q1-base:1.8
	pkgsrc-2003Q4:1.6.0.2
	pkgsrc-2003Q4-base:1.6
	netbsd-1-6-1:1.3.0.2
	netbsd-1-6-1-base:1.3
	netbsd-1-6:1.1.1.1.0.4
	netbsd-1-6-RELEASE-base:1.1
	pkgviews:1.1.1.1.0.6
	pkgviews-base:1.1
	buildlink2-base:1.1
	buildlink2:1.1.1.1.0.2
	pkg-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.10
date	2004.08.21.12.16.45;	author markd;	state dead;
branches;
next	1.9;

1.9
date	2004.08.11.13.51.14;	author markd;	state Exp;
branches;
next	1.8;

1.8
date	2004.02.04.13.58.39;	author markd;	state dead;
branches
	1.8.4.1;
next	1.7;

1.7
date	2004.01.15.09.52.51;	author markd;	state Exp;
branches;
next	1.6;

1.6
date	2003.07.30.13.16.57;	author markd;	state Exp;
branches;
next	1.5;

1.5
date	2003.05.22.02.42.41;	author markd;	state Exp;
branches;
next	1.4;

1.4
date	2003.03.11.13.10.35;	author markd;	state Exp;
branches;
next	1.3;

1.3
date	2003.01.02.09.12.39;	author skrll;	state Exp;
branches;
next	1.2;

1.2
date	2002.08.25.19.23.53;	author jlam;	state Exp;
branches;
next	1.1;

1.1
date	2002.05.31.13.16.47;	author skrll;	state Exp;
branches
	1.1.1.1;
next	;

1.8.4.1
date	2004.08.13.13.05.05;	author agc;	state Exp;
branches;
next	;

1.1.1.1
date	2002.05.31.13.16.47;	author skrll;	state Exp;
branches
	1.1.1.1.2.1;
next	;

1.1.1.1.2.1
date	2002.05.31.13.16.47;	author jlam;	state dead;
branches;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	2002.06.23.19.06.22;	author jlam;	state Exp;
branches;
next	;


desc
@@


1.10
log
@Update to KDE 3.3

* Rewrite the name-resolution routines so that true asynchronous lookups
  are possible (multithreaded). Thiago Macieira
* kconf_update has now support for updating files other than config
  files. Waldo Bastian
* Crypto certificates import without user interaction Helge Deller
* KEditToolbar: Add support for arranging actions via drag&drop. Sandro
  Giessl
* Move KNewStuff to kdelibs, making it usable for KDE-Edu etc. Josef
  Spillner
* Introduce KIMIface, a generic DCOP interface to instant messaging/chat
  clients, and support libraries for other KDE apps, enabling loosely
  coupled integration. Will Stephenson
* Show actions icons in the configure shortcut dialog. Olivier Goffart
* KKeyDialog: add widget (based on klistviewsearchline) for searching
  shortcuts Cristian Tibirna
* User visible feedback if invocation of browser, help Center or mailer
  fails
* KImgIO
  o Add EXR image plugin, supports reading high dynamic range files.
    Brad Hards
  o Add support for SGI images (a.k.a. "RGB" images). These do typically
    have file extensions *.rgb, *.rgba, *.sgi, or *.bw. The SGI image
    file format is a de-facto standard for textures, for example in 3D
    modeling. Melchior Franz
  o Add read support for DDS images (Direct Draw Surface). This format
    is mainly used for textures in DirectX. Ignacio Castaño
* libkabc
  o Write support and SSL/TLS for the LDAP resource Szombathelyi György
* KLocale
  o Try harder to find message translations if a string is not translated
    in the primary language of the user, but available in other languages
    that the user has chosen in kcontrol. Heiko Evermann
* KSpell2
  o Introduction of the new spellchecking library fixing all of KSpell
    shortcomings. Zack Rusin
* KHTML part
  o KHTML: Merge text shifting from WebCore. Leo Savernik
  o KHTML: Type-ahead find Arend van Beelen jr.
  o Copy To->IM Contact... context menu entry. Using kimproxy, allow one
    to initiate a file transfer from Konqueror. Will Stephenson
  o Added "Open in This Window" in popup frame submenu
  o New context menu when text is selected which allows lookup in default
    search engine
  o Fixed and improved Access Key support: now activated by pressing and
    releasing the ctrl key. When activated, the accesskey mode displays all
    accesskeys available in tooltips Jean-Baptiste Mardelle
@
text
@$NetBSD: patch-av,v 1.9 2004/08/11 13:51:14 markd Exp $

Index: khtml/khtml_part.cpp
===================================================================
RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v
retrieving revision 1.959.2.20
diff -u -p -r1.959.2.20 khtml_part.cpp
--- khtml/khtml_part.cpp	29 Jun 2004 09:08:16 -0000	1.959.2.20
+++ khtml/khtml_part.cpp	3 Aug 2004 14:36:46 -0000
@@@@ -757,12 +757,16 @@@@ DOM::Document KHTMLPart::document() cons
     return d->m_doc;
 }
 
-
 KParts::BrowserExtension *KHTMLPart::browserExtension() const
 {
   return d->m_extension;
 }
 
+KParts::BrowserHostExtension *KHTMLPart::browserHostExtension() const
+{
+  return d->m_hostExtension;
+}
+
 KHTMLView *KHTMLPart::view() const
 {
   return d->m_view;
@@@@ -880,29 +884,18 @@@@ QVariant KHTMLPart::crossFrameExecuteScr
     // we always allow these
   }
   else {
-    while (destpart->parentPart())
-      destpart = destpart->parentPart();
-    destpart = destpart->findFrame(target);
-
+    destpart = findFrame(target);
     if (!destpart)
-      destpart = this; // ### doesn't make sense, does it?
+       destpart = this;
   }
 
   // easy way out?
   if (destpart == this)
     return executeScript(DOM::Node(), script);
 
-
   // now compare the domains
-  if (!destpart->htmlDocument().isNull() &&
-      !htmlDocument().isNull())  {
-    DOM::DOMString actDomain = htmlDocument().domain();
-    DOM::DOMString destDomain = destpart->htmlDocument().domain();
-
-    if (actDomain == destDomain)
-      return destpart->executeScript(DOM::Node(), script);
-  }
-
+  if (destpart->checkFrameAccess(this))
+    return destpart->executeScript(DOM::Node(), script);
 
   // eww, something went wrong. better execute it in our frame
   return executeScript(DOM::Node(), script);
@@@@ -3358,7 +3351,7 @@@@ void KHTMLPart::urlSelected( const QStri
   if ( hasTarget )
   {
     // unknown frame names should open in a new window.
-    khtml::ChildFrame *frame = recursiveFrameRequest( cURL, args, false );
+    khtml::ChildFrame *frame = recursiveFrameRequest( this, cURL, args, false );
     if ( frame )
     {
       args.metaData()["referrer"] = d->m_referrer;
@@@@ -4364,6 +4357,7 @@@@ void KHTMLPart::slotChildDocCreated()
 void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args )
 {
   khtml::ChildFrame *child = frame( sender()->parent() );
+  KHTMLPart *callingHtmlPart = const_cast<KHTMLPart *>(dynamic_cast<const KHTMLPart *>(sender()->parent()));
 
   // TODO: handle child target correctly! currently the script are always executed fur the parent
   QString urlStr = url.url();
@@@@ -4395,7 +4389,7 @@@@ void KHTMLPart::slotChildURLRequest( con
     }
     else if ( frameName != QString::fromLatin1( "_self" ) )
     {
-      khtml::ChildFrame *_frame = recursiveFrameRequest( url, args );
+      khtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args );
 
       if ( !_frame )
       {
@@@@ -4437,46 +4431,92 @@@@ khtml::ChildFrame *KHTMLPart::frame( con
     return 0L;
 }
 
-//#define DEBUG_FINDFRAME
+//#define DEBUG_FINDFRAME
 
-KHTMLPart *KHTMLPart::findFrame( const QString &f )
+bool KHTMLPart::checkFrameAccess(KHTMLPart *callingHtmlPart)
 {
+  if (callingHtmlPart == this)
+    return true; // trivial
+
+  if (htmlDocument().isNull()) {
 #ifdef DEBUG_FINDFRAME
-  kdDebug(6050) << "KHTMLPart::findFrame '" << f << "'" << endl;
-  FrameIt it2 = d->m_frames.begin();
-  FrameIt end = d->m_frames.end();
-  for (; it2 != end; ++it2 )
-      kdDebug(6050) << "  - having frame '" << (*it2).m_name << "'" << endl;
+    kdDebug(6050) << "KHTMLPart::checkFrameAccess: Empty part " << this << " URL = " << m_url << endl;
 #endif
-  // ### http://www.w3.org/TR/html4/appendix/notes.html#notes-frames
-  ConstFrameIt it = d->m_frames.find( f );
-  if ( it == d->m_frames.end() )
-  {
+    return false; // we are empty?
+  }
+
+  // now compare the domains
+  if (callingHtmlPart && !callingHtmlPart->htmlDocument().isNull() &&
+      !htmlDocument().isNull())  {
+    DOM::DOMString actDomain = callingHtmlPart->htmlDocument().domain();
+    DOM::DOMString destDomain = htmlDocument().domain();
+
 #ifdef DEBUG_FINDFRAME
-    kdDebug(6050) << "KHTMLPart::findFrame frame " << f << " not found" << endl;
+    kdDebug(6050) << "KHTMLPart::checkFrameAccess: actDomain = '" << actDomain.string() << "' destDomain = '" << destDomain.string() << "'" << endl;
 #endif
-    return 0L;
+
+    if (actDomain == destDomain)
+      return true;
   }
-  else {
-    KParts::ReadOnlyPart *p = (*it).m_part;
-    if ( p && p->inherits( "KHTMLPart" ))
-    {
 #ifdef DEBUG_FINDFRAME
-      kdDebug(6050) << "KHTMLPart::findFrame frame " << f << " is a KHTMLPart, ok" << endl;
+  else
+  {
+    kdDebug(6050) << "KHTMLPart::checkFrameAccess: Unknown part/domain " << callingHtmlPart << " tries to access part " << this << endl;
+  }
 #endif
-      return (KHTMLPart*)p;
-    }
-    else
-    {
+  return false;
+}
+
+KHTMLPart *
+KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame )
+{
 #ifdef DEBUG_FINDFRAME
-      if (p)
-        kdWarning() << "KHTMLPart::findFrame frame " << f << " found but isn't a KHTMLPart ! " << p->className() << endl;
-      else
-        kdWarning() << "KHTMLPart::findFrame frame " << f << " found but m_part=0L" << endl;
+  kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl;
+#endif
+  // Check access
+  KHTMLPart *callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart);
+  
+  if (!checkFrameAccess(callingHtmlPart))
+     return 0;
+
+  FrameIt it = d->m_frames.find( f );
+  FrameIt end = d->m_frames.end();
+  if ( it != end )
+  {
+#ifdef DEBUG_FINDFRAME
+     kdDebug(6050) << "KHTMLPart::findFrameParent: FOUND!" << endl;
 #endif
-      return 0L;
+     if (childFrame)
+        *childFrame = &(*it);
+     return this;
+  }
+     
+  it = d->m_frames.begin();
+  for (; it != end; ++it )
+  {
+    KParts::ReadOnlyPart *p = (*it).m_part;
+    if ( p && p->inherits( "KHTMLPart" ))
+    {
+      KHTMLPart *frameParent = static_cast<KHTMLPart*>(p)->findFrameParent(callingPart, f, childFrame);
+      if (frameParent)
+         return frameParent;
     }
   }
+  return 0;
+}
+
+
+KHTMLPart *KHTMLPart::findFrame( const QString &f )
+{
+  khtml::ChildFrame *childFrame;
+  KHTMLPart *parentFrame = findFrameParent(this, f, &childFrame);
+  if (parentFrame)
+  {
+     KParts::ReadOnlyPart *p = childFrame->m_part;
+     if ( p && p->inherits( "KHTMLPart" ))
+        return static_cast<KHTMLPart *>(p);
+  }
+  return 0;
 }
 
 KParts::ReadOnlyPart *KHTMLPart::currentFrame() const
@@@@ -4514,37 +4554,29 @@@@ KHTMLPart *KHTMLPart::parentPart()
   return (KHTMLPart *)parent();
 }
 
-khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( const KURL &url, const KParts::URLArgs &args,
-                                                     bool callParent )
+khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, 
+                                                     const KParts::URLArgs &args, bool callParent )
 {
-  FrameIt it = d->m_frames.find( args.frameName );
-
-  if ( it != d->m_frames.end() )
-    return &(*it);
-
-  it = d->m_frames.begin();
-  FrameIt end = d->m_frames.end();
-  for (; it != end; ++it )
-    if ( (*it).m_part && (*it).m_part->inherits( "KHTMLPart" ) )
-    {
-      KHTMLPart *childPart = (KHTMLPart *)(KParts::ReadOnlyPart *)(*it).m_part;
-
-      khtml::ChildFrame *res = childPart->recursiveFrameRequest( url, args, false );
-      if ( !res )
-        continue;
-
-      childPart->requestObject( res, url, args );
-      return 0L;
-    }
+#ifdef DEBUG_FINDFRAME
+  kdDebug( 6050 ) << "KHTMLPart::recursiveFrameRequest this = " << this << ", frame = " << args.frameName << ", url = " << url << endl;
+#endif  
+  khtml::ChildFrame *childFrame;
+  KHTMLPart *childPart = findFrameParent(callingHtmlPart, args.frameName, &childFrame);
+  if (childPart)
+  {
+     if (childPart == this)
+        return childFrame;
+     
+     childPart->requestObject( childFrame, url, args );
+     return 0;
+  }
 
   if ( parentPart() && callParent )
   {
-    khtml::ChildFrame *res = parentPart()->recursiveFrameRequest( url, args );
+     khtml::ChildFrame *res = parentPart()->recursiveFrameRequest( callingHtmlPart, url, args, callParent );
 
-    if ( res )
-      parentPart()->requestObject( res, url, args );
-
-    return 0L;
+     if ( res )
+       parentPart()->requestObject( res, url, args );
   }
 
   return 0L;
@@@@ -4552,7 +4584,7 @@@@ khtml::ChildFrame *KHTMLPart::recursiveF
 
 void KHTMLPart::saveState( QDataStream &stream )
 {
-  kdDebug( 6050 ) << "KHTMLPart::saveState saving URL " << m_url.url() << endl;
+  kdDebug( 6050 ) << "KHTMLPart::saveState this = " << this << " saving URL " << m_url.url() << endl;
 
   stream << m_url << (Q_INT32)d->m_view->contentsX() << (Q_INT32)d->m_view->contentsY()
          << (Q_INT32) d->m_view->contentsWidth() << (Q_INT32) d->m_view->contentsHeight() << (Q_INT32) d->m_view->marginWidth() << (Q_INT32) d->m_view->marginHeight();
@


1.9
log
@Fix some issues related to html frames, cookie handling and temporary filenames.
From KDE cvs.
Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
@


1.8
log
@Update to KDE-3.2.0.

Changes:
Libraries

* Hidden methods in DCOP interfaces - DCOPIDLng Alexander Kellett
* Documentation parsing (kdoc based) and inclusion in generated .dcopidl files
  (note: kdebindings dcopidlng only) Alexander Kellett
* Kalyptus based rewrite of DCOPIDL - DCOPIDLng Alexander Kellett
* Thumbnail generator for DVI files. Stefan Kebekus
* Thumbnail generator for Xcursor files. Fredrik Hoeglund
* KMainWindow can now maintain the statusbar and corresponding action (duplicate
  (99% of the time broken) code removed from countless applications in KDE).
  Benjamin Meyer
* KMainWindow, KToolbar, and several other core classes now will only stores
  settings if those settings are not the default values (helping to reduce the
  huge size of config files). Benjamin Meyer
* Add support for International Domain Names (IDN). Thiago Macieira, Waldo
  Bastian
* KDE Password Registry and Wallet. George Staikos
* SSL session ID reuse. George Staikos
* KCookiejar: Support HttpOnly cookies. Waldo Bastian
* KLocale: support for different calendar systems Hans Petter Bieker
* KCalendarSystem: support for Hebrew calendar system Hans Petter Bieker
* Support data urls. See rfc 2397. Leo Savernik
* New tab widget classes KTabBar and KTabWidget in kdeui Stephan Binner
* New KFile permissions panel Tim Jansen
* Support for mimetype inheritance and aliases David Faure
* KDialogBase: Replace setButtonOkText() & co. with setButtonOk() that takes a
  KGuiItem instead (deprecating the old methods) Martijn Klingens
* Move KPrefs from libkdepim to kdelibs. Cornelius Schumacher
* Support for "extra fields" in KIO slaves and in Konqueror / KFileDialog
  David Faure <faure@@kde.org>
* Add KSplashScreen, a splash screen class based on QSplashScreen (with support
  for KDE's Xinerama options) Chris Howells
* KPasteTextAction: enhanced action for pasting text by offering a list with
  the clipboard history. Andras Mantia

KHTML
* Non-modal find dialog David Faure

KDEfx
* Added KCPUInfo class which makes it possible for applications to do runtime
  checks for architecture specific CPU features, such MMX, 3DNow! and AltiVec.
  Fredrik Hoeglund
* Added MMX and SSE2 optimizations to the blending functions in KImageEffect,
  that among other things are used to blend the translucent menus when the menu
  effect is set to software blend, and to tint icons when they're selected in
  icon views. Fredrik Hoeglund

Kate Part
* File type specific settings Christoph Cullmann
* vi style cmd line Christoph Cullmann
* Support variable lines in files Anders Lund
* Color Schemes Christoph Cullmann
* Indentation based code folding Christoph Cullmann
* Implement more DCOP interfaces and clean up the ktexteditor dcop interfaces
  Christoph Cullmann

KImgIO
* Add PCX image plugin, supports reading and writing 1, 4, 8 and 24bpp images
  Nadeem Hasan
* Add TGA image plugin, supports reading and writing true color TGA images
  (compressed and uncompressed) Dominik Seichter

Interfaces
* Interfaces for KBytesEdit widget part Friedrich W. H. Kossebau

KSpell
* Adding ability to spell check HTML, TeX and nroff documents. Zack Rusin
* Completely reworking the spell checking dialog. Adding language selection
  combo. Zack Rusin
@
text
@d1 1
a1 1
$NetBSD: patch-av,v 1.7 2004/01/15 09:52:51 markd Exp $
d3 21
a23 21
--- kdeprint/management/Makefile.in.orig	2003-12-29 11:16:54.000000000 +1300
+++ kdeprint/management/Makefile.in
@@@@ -376,15 +376,19 @@@@ x_includes = @@x_includes@@
 x_libraries = @@x_libraries@@
 INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdeprint -I$(top_builddir)/kdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes)
 
-lib_LTLIBRARIES = libkdeprint_management.la kaddprinterwizard.la
+lib_LTLIBRARIES = libkdeprint_management.la libkaddprinterwizard_main.la kaddprinterwizard.la
 bin_PROGRAMS = kaddprinterwizard
 
-kaddprinterwizard_SOURCES = dummy.cpp
-kaddprinterwizard_LDADD = kaddprinterwizard.la
+kaddprinterwizard_SOURCES = kaddprinterwizard_main.cpp
+kaddprinterwizard_LDADD = libkaddprinterwizard_main.la
 kaddprinterwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
-kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp
-kaddprinterwizard_la_LIBADD = libkdeprint_management.la
+libkaddprinterwizard_main_la_SOURCES = kaddprinterwizard.cpp
+libkaddprinterwizard_main_la_LIBADD = libkdeprint_management.la
+libkaddprinterwizard_main_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH)
d25 20
a44 129
+kaddprinterwizard_la_SOURCES = kaddprinterwizard_main.cpp
+kaddprinterwizard_la_LIBADD = libkaddprinterwizard_main.la libkdeprint_management.la
 kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
 
 libkdeprint_management_la_SOURCES = \
@@@@ -430,11 +434,18 @@@@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(lib_LTLIBRARIES)
 
-kaddprinterwizard_la_DEPENDENCIES = libkdeprint_management.la
-am_kaddprinterwizard_la_OBJECTS = kaddprinterwizard.lo
+kaddprinterwizard_la_DEPENDENCIES = libkaddprinterwizard_main.la \
+	libkdeprint_management.la
+am_kaddprinterwizard_la_OBJECTS = kaddprinterwizard_main.lo
 #>- kaddprinterwizard_la_OBJECTS = $(am_kaddprinterwizard_la_OBJECTS)
 #>+ 1
-kaddprinterwizard_la_OBJECTS = kaddprinterwizard.lo
+kaddprinterwizard_la_OBJECTS = kaddprinterwizard_main.lo
+libkaddprinterwizard_main_la_DEPENDENCIES = libkdeprint_management.la
+am_libkaddprinterwizard_main_la_OBJECTS = kaddprinterwizard.lo
+#>- libkaddprinterwizard_main_la_OBJECTS = \
+#>- 	$(am_libkaddprinterwizard_main_la_OBJECTS)
+#>+ 1
+libkaddprinterwizard_main_la_OBJECTS = kaddprinterwizard.lo
 libkdeprint_management_la_DEPENDENCIES = ../libkdeprint.la
 am_libkdeprint_management_la_OBJECTS = kmdbcreator.lo kmdriverdb.lo \
 	kmdriverdbwidget.lo kmiconview.lo kminfopage.lo kmmainview.lo \
@@@@ -479,18 +490,20 @@@@ libkdeprint_management_la_nofinal_OBJECT
 bin_PROGRAMS = kaddprinterwizard$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
-am_kaddprinterwizard_OBJECTS = dummy.$(OBJEXT)
+am_kaddprinterwizard_OBJECTS = kaddprinterwizard_main.$(OBJEXT)
 #>- kaddprinterwizard_OBJECTS = $(am_kaddprinterwizard_OBJECTS)
 #>+ 1
-kaddprinterwizard_OBJECTS = dummy.$(OBJEXT)
-kaddprinterwizard_DEPENDENCIES = kaddprinterwizard.la
+kaddprinterwizard_OBJECTS = kaddprinterwizard_main.$(OBJEXT)
+kaddprinterwizard_DEPENDENCIES = libkaddprinterwizard_main.la
 
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- @@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/cjanuswidget.Plo \
-#>- @@AMDEP_TRUE@@	./$(DEPDIR)/dummy.Po ./$(DEPDIR)/jobitem.Plo \
+#>- @@AMDEP_TRUE@@	./$(DEPDIR)/jobitem.Plo \
 #>- @@AMDEP_TRUE@@	./$(DEPDIR)/kaddprinterwizard.Plo \
+#>- @@AMDEP_TRUE@@	./$(DEPDIR)/kaddprinterwizard_main.Plo \
+#>- @@AMDEP_TRUE@@	./$(DEPDIR)/kaddprinterwizard_main.Po \
 #>- @@AMDEP_TRUE@@	./$(DEPDIR)/kiconselectaction.Plo \
 #>- @@AMDEP_TRUE@@	./$(DEPDIR)/kmconfigcommand.Plo \
 #>- @@AMDEP_TRUE@@	./$(DEPDIR)/kmconfigdialog.Plo \
@@@@ -537,10 +550,12 @@@@ am__depfiles_maybe = depfiles
 #>- @@AMDEP_TRUE@@	./$(DEPDIR)/networkscanner.Plo \
 #>- @@AMDEP_TRUE@@	./$(DEPDIR)/pluginaction.Plo \
 #>- @@AMDEP_TRUE@@	./$(DEPDIR)/sidepixmap.Plo ./$(DEPDIR)/smbview.Plo
-#>+ 99
+#>+ 103
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES =   $(DEPDIR)/libkdeprint_management_la.all_cpp.P  ./$(DEPDIR)/cjanuswidget.Plo \
-@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/dummy.Po ./$(DEPDIR)/jobitem.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/jobitem.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/kaddprinterwizard.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/kaddprinterwizard_main.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/kaddprinterwizard_main.Po \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/kiconselectaction.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/kmconfigcommand.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/kmconfigdialog.Plo \
@@@@ -588,8 +603,10 @@@@ am__depfiles_maybe = depfiles
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/pluginaction.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/sidepixmap.Plo ./$(DEPDIR)/smbview.Plo
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES =   ./$(DEPDIR)/cjanuswidget.Plo \
-@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/dummy.Po ./$(DEPDIR)/jobitem.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/jobitem.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/kaddprinterwizard.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/kaddprinterwizard_main.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/kaddprinterwizard_main.Po \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/kiconselectaction.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/kmconfigcommand.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/kmconfigdialog.Plo \
@@@@ -656,6 +673,7 @@@@ CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@@
 DIST_SOURCES = $(kaddprinterwizard_la_SOURCES) \
+	$(libkaddprinterwizard_main_la_SOURCES) \
 	$(libkdeprint_management_la_SOURCES) \
 	$(kaddprinterwizard_SOURCES)
 DATA = $(dataicon_DATA)
@@@@ -664,7 +682,7 @@@@ HEADERS = $(kdeprint_HEADERS) $(noinst_H
 
 DIST_COMMON = $(kdeprint_HEADERS) $(noinst_HEADERS) Makefile.am \
 	Makefile.in
-SOURCES = $(kaddprinterwizard_la_SOURCES) $(libkdeprint_management_la_SOURCES) $(kaddprinterwizard_SOURCES)
+SOURCES = $(kaddprinterwizard_la_SOURCES) $(libkaddprinterwizard_main_la_SOURCES) $(libkdeprint_management_la_SOURCES) $(kaddprinterwizard_SOURCES)
 
 #>- all: all-am
 #>+ 1
@@@@ -711,6 +729,8 @@@@ clean-libLTLIBRARIES:
 	done
 kaddprinterwizard.la: $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_DEPENDENCIES) 
 	$(CXXLINK) -rpath $(libdir) $(kaddprinterwizard_la_LDFLAGS) $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_LIBADD) $(LIBS)
+libkaddprinterwizard_main.la: $(libkaddprinterwizard_main_la_OBJECTS) $(libkaddprinterwizard_main_la_DEPENDENCIES) 
+	$(CXXLINK) -rpath $(libdir) $(libkaddprinterwizard_main_la_LDFLAGS) $(libkaddprinterwizard_main_la_OBJECTS) $(libkaddprinterwizard_main_la_LIBADD) $(LIBS)
 #>- libkdeprint_management.la: $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) 
 #>+ 2
 @@KDE_USE_CLOSURE_TRUE@@libkdeprint_management.la: libkdeprint_management.la.closure $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) 
@@@@ -756,9 +776,10 @@@@ distclean-compile:
 	-rm -f *.tab.c
 
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/cjanuswidget.Plo@@am__quote@@
-@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dummy.Po@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/jobitem.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kaddprinterwizard.Plo@@am__quote@@
+@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kaddprinterwizard_main.Plo@@am__quote@@
+@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kaddprinterwizard_main.Po@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kiconselectaction.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kmconfigcommand.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kmconfigdialog.Plo@@am__quote@@
@@@@ -951,7 +972,7 @@@@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 #>+ 4
-KDE_DIST=tiledown.png tileup.png side.png 
+KDE_DIST=Makefile.in.rej side.png tiledown.png tileup.png 
 
 DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
 
@@@@ -1087,9 +1108,6 @@@@ uninstall-am: uninstall-binPROGRAMS unin
 	uninstall-binPROGRAMS uninstall-dataiconDATA uninstall-info-am \
 	uninstall-kdeprintHEADERS uninstall-libLTLIBRARIES
d47 12
a58 6
-dummy.cpp:
-	echo > dummy.cpp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
@@@@ -1104,83 +1122,77 @@@@ libkdeprint_management.la.closure: $(lib
d60 194
d255 2
a256 3
 #>+ 3
-kmjobviewer.moc: $(srcdir)/kmjobviewer.h
-	$(MOC) $(srcdir)/kmjobviewer.h -o kmjobviewer.moc
d258 15
a272 476
-#>+ 1
-mocs: kmjobviewer.moc
-#>+ 3
-kmwsocketutil.moc: $(srcdir)/kmwsocketutil.h
-	$(MOC) $(srcdir)/kmwsocketutil.h -o kmwsocketutil.moc
+kmmainview.moc: $(srcdir)/kmmainview.h
+	$(MOC) $(srcdir)/kmmainview.h -o kmmainview.moc
 
 #>+ 1
-mocs: kmwsocketutil.moc
+mocs: kmmainview.moc
 #>+ 3
-kmwsmb.moc: $(srcdir)/kmwsmb.h
-	$(MOC) $(srcdir)/kmwsmb.h -o kmwsmb.moc
+kmconfigfonts.moc: $(srcdir)/kmconfigfonts.h
+	$(MOC) $(srcdir)/kmconfigfonts.h -o kmconfigfonts.moc
 
 #>+ 1
-mocs: kmwsmb.moc
+mocs: kmconfigfonts.moc
 #>+ 3
-kmwdrivertest.moc: $(srcdir)/kmwdrivertest.h
-	$(MOC) $(srcdir)/kmwdrivertest.h -o kmwdrivertest.moc
+kmdriverdbwidget.moc: $(srcdir)/kmdriverdbwidget.h
+	$(MOC) $(srcdir)/kmdriverdbwidget.h -o kmdriverdbwidget.moc
 
 #>+ 1
-mocs: kmwdrivertest.moc
+mocs: kmdriverdbwidget.moc
 #>+ 3
-kmconfigdialog.moc: $(srcdir)/kmconfigdialog.h
-	$(MOC) $(srcdir)/kmconfigdialog.h -o kmconfigdialog.moc
+kmconfigpage.moc: $(srcdir)/kmconfigpage.h
+	$(MOC) $(srcdir)/kmconfigpage.h -o kmconfigpage.moc
 
 #>+ 1
-mocs: kmconfigdialog.moc
+mocs: kmconfigpage.moc
 #>+ 3
-pluginaction.moc: $(srcdir)/pluginaction.h
-	$(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc
+smbview.moc: $(srcdir)/smbview.h
+	$(MOC) $(srcdir)/smbview.h -o smbview.moc
 
 #>+ 1
-mocs: pluginaction.moc
+mocs: smbview.moc
 #>+ 3
-kmdriverdb.moc: $(srcdir)/kmdriverdb.h
-	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
+kmwsmb.moc: $(srcdir)/kmwsmb.h
+	$(MOC) $(srcdir)/kmwsmb.h -o kmwsmb.moc
 
 #>+ 1
-mocs: kmdriverdb.moc
+mocs: kmwsmb.moc
 #>+ 3
-kmtimer.moc: $(srcdir)/kmtimer.h
-	$(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc
+cjanuswidget.moc: $(srcdir)/cjanuswidget.h
+	$(MOC) $(srcdir)/cjanuswidget.h -o cjanuswidget.moc
 
 #>+ 1
-mocs: kmtimer.moc
+mocs: cjanuswidget.moc
 #>+ 3
-kmiconview.moc: $(srcdir)/kmiconview.h
-	$(MOC) $(srcdir)/kmiconview.h -o kmiconview.moc
+networkscanner.moc: $(srcdir)/networkscanner.h
+	$(MOC) $(srcdir)/networkscanner.h -o networkscanner.moc
 
 #>+ 1
-mocs: kmiconview.moc
+mocs: networkscanner.moc
 #>+ 3
-kmmainview.moc: $(srcdir)/kmmainview.h
-	$(MOC) $(srcdir)/kmmainview.h -o kmmainview.moc
+kmlistview.moc: $(srcdir)/kmlistview.h
+	$(MOC) $(srcdir)/kmlistview.h -o kmlistview.moc
 
 #>+ 1
-mocs: kmmainview.moc
+mocs: kmlistview.moc
 #>+ 3
-kmconfigpage.moc: $(srcdir)/kmconfigpage.h
-	$(MOC) $(srcdir)/kmconfigpage.h -o kmconfigpage.moc
+pluginaction.moc: $(srcdir)/pluginaction.h
+	$(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc
 
 #>+ 1
-mocs: kmconfigpage.moc
+mocs: pluginaction.moc
 #>+ 3
-kmpropcontainer.moc: $(srcdir)/kmpropcontainer.h
-	$(MOC) $(srcdir)/kmpropcontainer.h -o kmpropcontainer.moc
+kmconfiggeneral.moc: $(srcdir)/kmconfiggeneral.h
+	$(MOC) $(srcdir)/kmconfiggeneral.h -o kmconfiggeneral.moc
 
 #>+ 1
-mocs: kmpropcontainer.moc
+mocs: kmconfiggeneral.moc
 #>+ 3
-kmdbcreator.moc: $(srcdir)/kmdbcreator.h
-	$(MOC) $(srcdir)/kmdbcreator.h -o kmdbcreator.moc
+kmwclass.moc: $(srcdir)/kmwclass.h
+	$(MOC) $(srcdir)/kmwclass.h -o kmwclass.moc
 
 #>+ 1
-mocs: kmdbcreator.moc
+mocs: kmwclass.moc
 #>+ 3
 kminstancepage.moc: $(srcdir)/kminstancepage.h
 	$(MOC) $(srcdir)/kminstancepage.h -o kminstancepage.moc
@@@@ -1188,17 +1200,23 @@@@ kminstancepage.moc: $(srcdir)/kminstance
 #>+ 1
 mocs: kminstancepage.moc
 #>+ 3
-networkscanner.moc: $(srcdir)/networkscanner.h
-	$(MOC) $(srcdir)/networkscanner.h -o networkscanner.moc
+kmprinterview.moc: $(srcdir)/kmprinterview.h
+	$(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc
 
 #>+ 1
-mocs: networkscanner.moc
+mocs: kmprinterview.moc
 #>+ 3
-kmwclass.moc: $(srcdir)/kmwclass.h
-	$(MOC) $(srcdir)/kmwclass.h -o kmwclass.moc
+kmiconview.moc: $(srcdir)/kmiconview.h
+	$(MOC) $(srcdir)/kmiconview.h -o kmiconview.moc
 
 #>+ 1
-mocs: kmwclass.moc
+mocs: kmiconview.moc
+#>+ 3
+kmpropcontainer.moc: $(srcdir)/kmpropcontainer.h
+	$(MOC) $(srcdir)/kmpropcontainer.h -o kmpropcontainer.moc
+
+#>+ 1
+mocs: kmpropcontainer.moc
 #>+ 3
 kmwdriverselect.moc: $(srcdir)/kmwdriverselect.h
 	$(MOC) $(srcdir)/kmwdriverselect.h -o kmwdriverselect.moc
@@@@ -1206,65 +1224,65 @@@@ kmwdriverselect.moc: $(srcdir)/kmwdriver
 #>+ 1
 mocs: kmwdriverselect.moc
 #>+ 3
-kmwizardpage.moc: $(srcdir)/kmwizardpage.h
-	$(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc
+kmdbcreator.moc: $(srcdir)/kmdbcreator.h
+	$(MOC) $(srcdir)/kmdbcreator.h -o kmdbcreator.moc
 
 #>+ 1
-mocs: kmwizardpage.moc
+mocs: kmdbcreator.moc
 #>+ 3
-kmwlocal.moc: $(srcdir)/kmwlocal.h
-	$(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc
+kmpropwidget.moc: $(srcdir)/kmpropwidget.h
+	$(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc
 
 #>+ 1
-mocs: kmwlocal.moc
+mocs: kmpropwidget.moc
 #>+ 3
-kmconfigjobs.moc: $(srcdir)/kmconfigjobs.h
-	$(MOC) $(srcdir)/kmconfigjobs.h -o kmconfigjobs.moc
+kmconfigdialog.moc: $(srcdir)/kmconfigdialog.h
+	$(MOC) $(srcdir)/kmconfigdialog.h -o kmconfigdialog.moc
 
 #>+ 1
-mocs: kmconfigjobs.moc
+mocs: kmconfigdialog.moc
 #>+ 3
-kmconfigfilter.moc: $(srcdir)/kmconfigfilter.h
-	$(MOC) $(srcdir)/kmconfigfilter.h -o kmconfigfilter.moc
+kmwlocal.moc: $(srcdir)/kmwlocal.h
+	$(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc
 
 #>+ 1
-mocs: kmconfigfilter.moc
+mocs: kmwlocal.moc
 #>+ 3
-kmwsocket.moc: $(srcdir)/kmwsocket.h
-	$(MOC) $(srcdir)/kmwsocket.h -o kmwsocket.moc
+kmjobviewer.moc: $(srcdir)/kmjobviewer.h
+	$(MOC) $(srcdir)/kmjobviewer.h -o kmjobviewer.moc
 
 #>+ 1
-mocs: kmwsocket.moc
+mocs: kmjobviewer.moc
 #>+ 3
-kmconfigfonts.moc: $(srcdir)/kmconfigfonts.h
-	$(MOC) $(srcdir)/kmconfigfonts.h -o kmconfigfonts.moc
+kmspecialprinterdlg.moc: $(srcdir)/kmspecialprinterdlg.h
+	$(MOC) $(srcdir)/kmspecialprinterdlg.h -o kmspecialprinterdlg.moc
 
 #>+ 1
-mocs: kmconfigfonts.moc
+mocs: kmspecialprinterdlg.moc
 #>+ 3
-kmpropwidget.moc: $(srcdir)/kmpropwidget.h
-	$(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc
+kiconselectaction.moc: $(srcdir)/kiconselectaction.h
+	$(MOC) $(srcdir)/kiconselectaction.h -o kiconselectaction.moc
 
 #>+ 1
-mocs: kmpropwidget.moc
+mocs: kiconselectaction.moc
 #>+ 3
-kxmlcommanddlg.moc: $(srcdir)/kxmlcommanddlg.h
-	$(MOC) $(srcdir)/kxmlcommanddlg.h -o kxmlcommanddlg.moc
+kmwsocketutil.moc: $(srcdir)/kmwsocketutil.h
+	$(MOC) $(srcdir)/kmwsocketutil.h -o kmwsocketutil.moc
 
 #>+ 1
-mocs: kxmlcommanddlg.moc
+mocs: kmwsocketutil.moc
 #>+ 3
-kmwizard.moc: $(srcdir)/kmwizard.h
-	$(MOC) $(srcdir)/kmwizard.h -o kmwizard.moc
+kmconfigfilter.moc: $(srcdir)/kmconfigfilter.h
+	$(MOC) $(srcdir)/kmconfigfilter.h -o kmconfigfilter.moc
 
 #>+ 1
-mocs: kmwizard.moc
+mocs: kmconfigfilter.moc
 #>+ 3
-kxmlcommandselector.moc: $(srcdir)/kxmlcommandselector.h
-	$(MOC) $(srcdir)/kxmlcommandselector.h -o kxmlcommandselector.moc
+kxmlcommanddlg.moc: $(srcdir)/kxmlcommanddlg.h
+	$(MOC) $(srcdir)/kxmlcommanddlg.h -o kxmlcommanddlg.moc
 
 #>+ 1
-mocs: kxmlcommandselector.moc
+mocs: kxmlcommanddlg.moc
 #>+ 3
 kmpropertypage.moc: $(srcdir)/kmpropertypage.h
 	$(MOC) $(srcdir)/kmpropertypage.h -o kmpropertypage.moc
@@@@ -1272,62 +1290,62 @@@@ kmpropertypage.moc: $(srcdir)/kmproperty
 #>+ 1
 mocs: kmpropertypage.moc
 #>+ 3
-kmdriverdialog.moc: $(srcdir)/kmdriverdialog.h
-	$(MOC) $(srcdir)/kmdriverdialog.h -o kmdriverdialog.moc
+kxmlcommandselector.moc: $(srcdir)/kxmlcommandselector.h
+	$(MOC) $(srcdir)/kxmlcommandselector.h -o kxmlcommandselector.moc
 
 #>+ 1
-mocs: kmdriverdialog.moc
+mocs: kxmlcommandselector.moc
 #>+ 3
-kmdriverdbwidget.moc: $(srcdir)/kmdriverdbwidget.h
-	$(MOC) $(srcdir)/kmdriverdbwidget.h -o kmdriverdbwidget.moc
+kmwdrivertest.moc: $(srcdir)/kmwdrivertest.h
+	$(MOC) $(srcdir)/kmwdrivertest.h -o kmwdrivertest.moc
 
 #>+ 1
-mocs: kmdriverdbwidget.moc
+mocs: kmwdrivertest.moc
 #>+ 3
-smbview.moc: $(srcdir)/smbview.h
-	$(MOC) $(srcdir)/smbview.h -o smbview.moc
+kmwsocket.moc: $(srcdir)/kmwsocket.h
+	$(MOC) $(srcdir)/kmwsocket.h -o kmwsocket.moc
 
 #>+ 1
-mocs: smbview.moc
+mocs: kmwsocket.moc
 #>+ 3
-kmlistview.moc: $(srcdir)/kmlistview.h
-	$(MOC) $(srcdir)/kmlistview.h -o kmlistview.moc
+kmwizard.moc: $(srcdir)/kmwizard.h
+	$(MOC) $(srcdir)/kmwizard.h -o kmwizard.moc
 
 #>+ 1
-mocs: kmlistview.moc
+mocs: kmwizard.moc
 #>+ 3
-kmconfiggeneral.moc: $(srcdir)/kmconfiggeneral.h
-	$(MOC) $(srcdir)/kmconfiggeneral.h -o kmconfiggeneral.moc
+kmdriverdb.moc: $(srcdir)/kmdriverdb.h
+	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
 
 #>+ 1
-mocs: kmconfiggeneral.moc
+mocs: kmdriverdb.moc
 #>+ 3
-kmspecialprinterdlg.moc: $(srcdir)/kmspecialprinterdlg.h
-	$(MOC) $(srcdir)/kmspecialprinterdlg.h -o kmspecialprinterdlg.moc
+kmtimer.moc: $(srcdir)/kmtimer.h
+	$(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc
 
 #>+ 1
-mocs: kmspecialprinterdlg.moc
+mocs: kmtimer.moc
 #>+ 3
-kiconselectaction.moc: $(srcdir)/kiconselectaction.h
-	$(MOC) $(srcdir)/kiconselectaction.h -o kiconselectaction.moc
+kmconfigjobs.moc: $(srcdir)/kmconfigjobs.h
+	$(MOC) $(srcdir)/kmconfigjobs.h -o kmconfigjobs.moc
 
 #>+ 1
-mocs: kiconselectaction.moc
+mocs: kmconfigjobs.moc
 #>+ 3
-kmprinterview.moc: $(srcdir)/kmprinterview.h
-	$(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc
+kmwizardpage.moc: $(srcdir)/kmwizardpage.h
+	$(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc
 
 #>+ 1
-mocs: kmprinterview.moc
+mocs: kmwizardpage.moc
 #>+ 3
-cjanuswidget.moc: $(srcdir)/cjanuswidget.h
-	$(MOC) $(srcdir)/cjanuswidget.h -o cjanuswidget.moc
+kmdriverdialog.moc: $(srcdir)/kmdriverdialog.h
+	$(MOC) $(srcdir)/kmdriverdialog.h -o kmdriverdialog.moc
 
 #>+ 1
-mocs: cjanuswidget.moc
+mocs: kmdriverdialog.moc
 #>+ 3
 clean-metasources:
-	-rm -f  kmjobviewer.moc kmwsocketutil.moc kmwsmb.moc kmwdrivertest.moc kmconfigdialog.moc pluginaction.moc kmdriverdb.moc kmtimer.moc kmiconview.moc kmmainview.moc kmconfigpage.moc kmpropcontainer.moc kmdbcreator.moc kminstancepage.moc networkscanner.moc kmwclass.moc kmwdriverselect.moc kmwizardpage.moc kmwlocal.moc kmconfigjobs.moc kmconfigfilter.moc kmwsocket.moc kmconfigfonts.moc kmpropwidget.moc kxmlcommanddlg.moc kmwizard.moc kxmlcommandselector.moc kmpropertypage.moc kmdriverdialog.moc kmdriverdbwidget.moc smbview.moc kmlistview.moc kmconfiggeneral.moc kmspecialprinterdlg.moc kiconselectaction.moc kmprinterview.moc cjanuswidget.moc
+	-rm -f  kmmainview.moc kmconfigfonts.moc kmdriverdbwidget.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc networkscanner.moc kmlistview.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmwdriverselect.moc kmdbcreator.moc kmpropwidget.moc kmconfigdialog.moc kmwlocal.moc kmjobviewer.moc kmspecialprinterdlg.moc kiconselectaction.moc kmwsocketutil.moc kmconfigfilter.moc kxmlcommanddlg.moc kmpropertypage.moc kxmlcommandselector.moc kmwdrivertest.moc kmwsocket.moc kmwizard.moc kmdriverdb.moc kmtimer.moc kmconfigjobs.moc kmwizardpage.moc kmdriverdialog.moc
 
 #>+ 3
 clean-closures:
@@@@ -1344,7 +1362,7 @@@@ force-reedit:
 
 
 #>+ 11
-libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp $(srcdir)/kmconfigfonts.cpp $(srcdir)/kmconfigjobs.cpp $(srcdir)/networkscanner.cpp  kmwsmb.moc kmwsocketutil.moc kmjobviewer.moc kmwdrivertest.moc kmconfigdialog.moc pluginaction.moc kmdriverdb.moc kmtimer.moc kmiconview.moc kmmainview.moc kmconfigpage.moc kmpropcontainer.moc kmdbcreator.moc kminstancepage.moc networkscanner.moc kmwclass.moc kmwdriverselect.moc kmwizardpage.moc kmwlocal.moc kmconfigjobs.moc kmconfigfilter.moc kmwsocket.moc kmconfigfonts.moc kmpropwidget.moc kxmlcommanddlg.moc kmwizard.moc kxmlcommandselector.moc kmpropertypage.moc kmdriverdialog.moc kmdriverdbwidget.moc smbview.moc kmspecialprinterdlg.moc kmconfiggeneral.moc kmlistview.moc kmprinterview.moc kiconselectaction.moc cjanuswidget.moc
+libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp $(srcdir)/kmconfigfonts.cpp $(srcdir)/kmconfigjobs.cpp $(srcdir)/networkscanner.cpp  kmconfigfonts.moc kmmainview.moc kmdriverdbwidget.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc networkscanner.moc kmlistview.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmwdriverselect.moc kmdbcreator.moc kmpropwidget.moc kmconfigdialog.moc kmwlocal.moc kmjobviewer.moc kmspecialprinterdlg.moc kiconselectaction.moc kmwsocketutil.moc kmconfigfilter.moc kxmlcommanddlg.moc kmpropertypage.moc kxmlcommandselector.moc kmwdrivertest.moc kmwsocket.moc kmwizard.moc kmdriverdb.moc kmtimer.moc kmconfigjobs.moc kmdriverdialog.moc kmwizardpage.moc
 	@@echo 'creating libkdeprint_management_la.all_cpp.cpp ...'; \
 	rm -f libkdeprint_management_la.all_cpp.files libkdeprint_management_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libkdeprint_management_la.all_cpp.final; \
@@@@ -1380,77 +1398,77 @@@@ kde-rpo-clean:
 	-rm -f *.rpo
 
 #>+ 75
-kiconselectaction.lo: kiconselectaction.moc 
-kmwsmb.o: kmwsmb.moc 
-kmwsocket.lo: kmwsocket.moc 
-kmconfigfilter.o: kmconfigfilter.moc 
-kmconfiggeneral.o: kmconfiggeneral.moc 
-kmdriverdialog.o: kmdriverdialog.moc 
-kmconfigjobs.o: kmconfigjobs.moc 
-kxmlcommandselector.lo: kxmlcommandselector.moc 
-cjanuswidget.lo: cjanuswidget.moc 
-kmdriverdbwidget.lo: kmdriverdbwidget.moc 
-kmiconview.lo: kmiconview.moc 
-kminstancepage.o: kminstancepage.moc 
-kmwsocketutil.o: kmwsocketutil.moc 
-kmdriverdb.o: kmdriverdb.moc 
-kmconfigpage.lo: kmconfigpage.moc 
-kmwdrivertest.o: kmwdrivertest.moc 
-kmdbcreator.o: kmdbcreator.moc 
-kmconfigdialog.lo: kmconfigdialog.moc 
-kmtimer.o: kmtimer.moc 
+kmmainview.o: kmmainview.moc 
+kmpropcontainer.lo: kmpropcontainer.moc 
 kmmainview.lo: kmmainview.moc 
-kmwsocket.o: kmwsocket.moc 
-kmdriverdialog.lo: kmdriverdialog.moc 
-kmdbcreator.lo: kmdbcreator.moc 
-kmjobviewer.lo: kmjobviewer.moc 
-kminstancepage.lo: kminstancepage.moc 
-kmconfigfilter.lo: kmconfigfilter.moc 
+kmconfigjobs.o: kmconfigjobs.moc 
 kmpropwidget.o: kmpropwidget.moc 
-kmpropcontainer.lo: kmpropcontainer.moc 
-kmconfiggeneral.lo: kmconfiggeneral.moc 
-kmpropertypage.lo: kmpropertypage.moc 
-pluginaction.lo: pluginaction.moc 
-kmspecialprinterdlg.lo: kmspecialprinterdlg.moc 
-kmconfigfonts.lo: kmconfigfonts.moc 
-kmwlocal.lo: kmwlocal.moc 
-kmconfigfonts.o: kmconfigfonts.moc 
+kmdbcreator.o: kmdbcreator.moc 
 kmwizardpage.lo: kmwizardpage.moc 
+kmwclass.o: kmwclass.moc 
+kmwlocal.lo: kmwlocal.moc 
 kmconfigpage.o: kmconfigpage.moc 
-kmwsocketutil.lo: kmwsocketutil.moc 
+pluginaction.lo: pluginaction.moc 
+kmwdrivertest.o: kmwdrivertest.moc 
+smbview.lo: smbview.moc 
+kmconfigdialog.lo: kmconfigdialog.moc 
+kmwizardpage.o: kmwizardpage.moc 
 kmwdrivertest.lo: kmwdrivertest.moc 
+kiconselectaction.o: kiconselectaction.moc 
 kmiconview.o: kmiconview.moc 
-kmwdriverselect.o: kmwdriverselect.moc 
+kmdriverdb.o: kmdriverdb.moc 
+kmpropcontainer.o: kmpropcontainer.moc 
+kmtimer.o: kmtimer.moc 
+kmjobviewer.o: kmjobviewer.moc 
+kmtimer.lo: kmtimer.moc 
+kmwdriverselect.lo: kmwdriverselect.moc 
 cjanuswidget.o: cjanuswidget.moc 
-kmprinterview.o: kmprinterview.moc 
+kmwlocal.o: kmwlocal.moc 
+kmjobviewer.lo: kmjobviewer.moc 
+kmdriverdbwidget.o: kmdriverdbwidget.moc 
+kmconfiggeneral.lo: kmconfiggeneral.moc 
+kmconfigdialog.o: kmconfigdialog.moc 
+smbview.o: smbview.moc 
+kmwsmb.lo: kmwsmb.moc 
+kiconselectaction.lo: kiconselectaction.moc 
 kxmlcommandselector.o: kxmlcommandselector.moc 
+kminstancepage.o: kminstancepage.moc 
+kmconfiggeneral.o: kmconfiggeneral.moc 
+kmwclass.lo: kmwclass.moc 
+kmwdriverselect.o: kmwdriverselect.moc 
 networkscanner.lo: networkscanner.moc 
+kmdbcreator.lo: kmdbcreator.moc 
+kmconfigfonts.o: kmconfigfonts.moc 
+networkscanner.o: networkscanner.moc 
+kmconfigfilter.lo: kmconfigfilter.moc 
+kmconfigfonts.lo: kmconfigfonts.moc 
+kmdriverdbwidget.lo: kmdriverdbwidget.moc 
+kmwsocketutil.lo: kmwsocketutil.moc 
+kminstancepage.lo: kminstancepage.moc 
+kmwizard.lo: kmwizard.moc 
 kmpropwidget.lo: kmpropwidget.moc 
+kmprinterview.lo: kmprinterview.moc 
+kmwsocket.lo: kmwsocket.moc 
+cjanuswidget.lo: cjanuswidget.moc 
+kmwsmb.o: kmwsmb.moc 
+kmlistview.o: kmlistview.moc 
+kmspecialprinterdlg.lo: kmspecialprinterdlg.moc 
 pluginaction.o: pluginaction.moc 
-kmpropertypage.o: kmpropertypage.moc 
 kxmlcommanddlg.lo: kxmlcommanddlg.moc 
-kmwclass.lo: kmwclass.moc 
-kxmlcommanddlg.o: kxmlcommanddlg.moc 
-kmwlocal.o: kmwlocal.moc 
+kxmlcommandselector.lo: kxmlcommandselector.moc 
 kmspecialprinterdlg.o: kmspecialprinterdlg.moc 
-kmmainview.o: kmmainview.moc 
+kmconfigpage.lo: kmconfigpage.moc 
+kmiconview.lo: kmiconview.moc 
+kxmlcommanddlg.o: kxmlcommanddlg.moc 
+kmconfigfilter.o: kmconfigfilter.moc 
+kmwsocketutil.o: kmwsocketutil.moc 
 kmconfigjobs.lo: kmconfigjobs.moc 
-kmlistview.o: kmlistview.moc 
-networkscanner.o: networkscanner.moc 
-kmwizardpage.o: kmwizardpage.moc 
-kmwizard.o: kmwizard.moc 
-kmprinterview.lo: kmprinterview.moc 
-kmconfigdialog.o: kmconfigdialog.moc 
-kmwsmb.lo: kmwsmb.moc 
-kmwdriverselect.lo: kmwdriverselect.moc 
-kiconselectaction.o: kiconselectaction.moc 
-kmdriverdbwidget.o: kmdriverdbwidget.moc 
-kmtimer.lo: kmtimer.moc 
-kmjobviewer.o: kmjobviewer.moc 
-kmpropcontainer.o: kmpropcontainer.moc 
-kmlistview.lo: kmlistview.moc 
-kmwizard.lo: kmwizard.moc 
-smbview.o: smbview.moc 
 kmdriverdb.lo: kmdriverdb.moc 
-kmwclass.o: kmwclass.moc 
-smbview.lo: smbview.moc 
+kmprinterview.o: kmprinterview.moc 
+kmwsocket.o: kmwsocket.moc 
+kmpropertypage.o: kmpropertypage.moc 
+kmdriverdialog.lo: kmdriverdialog.moc 
+kmlistview.lo: kmlistview.moc 
+kmdriverdialog.o: kmdriverdialog.moc 
+kmpropertypage.lo: kmpropertypage.moc 
+kmwizard.o: kmwizard.moc 
@


1.8.4.1
log
@Pullup ticket 102 to the pkgsrc-2004Q2 branch, requested by Mark Davies

Security fix for kdelibs3


	Module Name:	pkgsrc
	Committed By:	markd
	Date:		Wed Aug 11 13:51:14 UTC 2004

	Modified Files:
		pkgsrc/x11/kdelibs3: Makefile distinfo
		pkgsrc/x11/kdelibs3/patches: patch-an
	Added Files:
		pkgsrc/x11/kdelibs3/patches: patch-ap patch-aq patch-ar patch-as
		    patch-at patch-au patch-av patch-aw patch-ax patch-ay

	Log Message:
	Fix some issues related to html frames, cookie handling and temporary
	 filenames. From KDE cvs.
	Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
d3 21
a23 21
Index: khtml/khtml_part.cpp
===================================================================
RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v
retrieving revision 1.959.2.20
diff -u -p -r1.959.2.20 khtml_part.cpp
--- khtml/khtml_part.cpp	29 Jun 2004 09:08:16 -0000	1.959.2.20
+++ khtml/khtml_part.cpp	3 Aug 2004 14:36:46 -0000
@@@@ -757,12 +757,16 @@@@ DOM::Document KHTMLPart::document() cons
     return d->m_doc;
 }
 
-
 KParts::BrowserExtension *KHTMLPart::browserExtension() const
 {
   return d->m_extension;
 }
 
+KParts::BrowserHostExtension *KHTMLPart::browserHostExtension() const
+{
+  return d->m_hostExtension;
+}
d25 129
a153 20
 KHTMLView *KHTMLPart::view() const
 {
   return d->m_view;
@@@@ -880,29 +884,18 @@@@ QVariant KHTMLPart::crossFrameExecuteScr
     // we always allow these
   }
   else {
-    while (destpart->parentPart())
-      destpart = destpart->parentPart();
-    destpart = destpart->findFrame(target);
-
+    destpart = findFrame(target);
     if (!destpart)
-      destpart = this; // ### doesn't make sense, does it?
+       destpart = this;
   }
 
   // easy way out?
   if (destpart == this)
     return executeScript(DOM::Node(), script);
d156 6
a161 12
   // now compare the domains
-  if (!destpart->htmlDocument().isNull() &&
-      !htmlDocument().isNull())  {
-    DOM::DOMString actDomain = htmlDocument().domain();
-    DOM::DOMString destDomain = destpart->htmlDocument().domain();
-
-    if (actDomain == destDomain)
-      return destpart->executeScript(DOM::Node(), script);
-  }
-
+  if (destpart->checkFrameAccess(this))
+    return destpart->executeScript(DOM::Node(), script);
a162 194
   // eww, something went wrong. better execute it in our frame
   return executeScript(DOM::Node(), script);
@@@@ -3358,7 +3351,7 @@@@ void KHTMLPart::urlSelected( const QStri
   if ( hasTarget )
   {
     // unknown frame names should open in a new window.
-    khtml::ChildFrame *frame = recursiveFrameRequest( cURL, args, false );
+    khtml::ChildFrame *frame = recursiveFrameRequest( this, cURL, args, false );
     if ( frame )
     {
       args.metaData()["referrer"] = d->m_referrer;
@@@@ -4364,6 +4357,7 @@@@ void KHTMLPart::slotChildDocCreated()
 void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args )
 {
   khtml::ChildFrame *child = frame( sender()->parent() );
+  KHTMLPart *callingHtmlPart = const_cast<KHTMLPart *>(dynamic_cast<const KHTMLPart *>(sender()->parent()));
 
   // TODO: handle child target correctly! currently the script are always executed fur the parent
   QString urlStr = url.url();
@@@@ -4395,7 +4389,7 @@@@ void KHTMLPart::slotChildURLRequest( con
     }
     else if ( frameName != QString::fromLatin1( "_self" ) )
     {
-      khtml::ChildFrame *_frame = recursiveFrameRequest( url, args );
+      khtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args );
 
       if ( !_frame )
       {
@@@@ -4437,46 +4431,92 @@@@ khtml::ChildFrame *KHTMLPart::frame( con
     return 0L;
 }
 
-//#define DEBUG_FINDFRAME
+//#define DEBUG_FINDFRAME
 
-KHTMLPart *KHTMLPart::findFrame( const QString &f )
+bool KHTMLPart::checkFrameAccess(KHTMLPart *callingHtmlPart)
 {
+  if (callingHtmlPart == this)
+    return true; // trivial
+
+  if (htmlDocument().isNull()) {
 #ifdef DEBUG_FINDFRAME
-  kdDebug(6050) << "KHTMLPart::findFrame '" << f << "'" << endl;
-  FrameIt it2 = d->m_frames.begin();
-  FrameIt end = d->m_frames.end();
-  for (; it2 != end; ++it2 )
-      kdDebug(6050) << "  - having frame '" << (*it2).m_name << "'" << endl;
+    kdDebug(6050) << "KHTMLPart::checkFrameAccess: Empty part " << this << " URL = " << m_url << endl;
 #endif
-  // ### http://www.w3.org/TR/html4/appendix/notes.html#notes-frames
-  ConstFrameIt it = d->m_frames.find( f );
-  if ( it == d->m_frames.end() )
-  {
+    return false; // we are empty?
+  }
+
+  // now compare the domains
+  if (callingHtmlPart && !callingHtmlPart->htmlDocument().isNull() &&
+      !htmlDocument().isNull())  {
+    DOM::DOMString actDomain = callingHtmlPart->htmlDocument().domain();
+    DOM::DOMString destDomain = htmlDocument().domain();
+
 #ifdef DEBUG_FINDFRAME
-    kdDebug(6050) << "KHTMLPart::findFrame frame " << f << " not found" << endl;
+    kdDebug(6050) << "KHTMLPart::checkFrameAccess: actDomain = '" << actDomain.string() << "' destDomain = '" << destDomain.string() << "'" << endl;
 #endif
-    return 0L;
+
+    if (actDomain == destDomain)
+      return true;
   }
-  else {
-    KParts::ReadOnlyPart *p = (*it).m_part;
-    if ( p && p->inherits( "KHTMLPart" ))
-    {
 #ifdef DEBUG_FINDFRAME
-      kdDebug(6050) << "KHTMLPart::findFrame frame " << f << " is a KHTMLPart, ok" << endl;
+  else
+  {
+    kdDebug(6050) << "KHTMLPart::checkFrameAccess: Unknown part/domain " << callingHtmlPart << " tries to access part " << this << endl;
+  }
 #endif
-      return (KHTMLPart*)p;
-    }
-    else
-    {
+  return false;
+}
+
+KHTMLPart *
+KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame )
+{
 #ifdef DEBUG_FINDFRAME
-      if (p)
-        kdWarning() << "KHTMLPart::findFrame frame " << f << " found but isn't a KHTMLPart ! " << p->className() << endl;
-      else
-        kdWarning() << "KHTMLPart::findFrame frame " << f << " found but m_part=0L" << endl;
+  kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl;
+#endif
+  // Check access
+  KHTMLPart *callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart);
+  
+  if (!checkFrameAccess(callingHtmlPart))
+     return 0;
+
+  FrameIt it = d->m_frames.find( f );
+  FrameIt end = d->m_frames.end();
+  if ( it != end )
+  {
+#ifdef DEBUG_FINDFRAME
+     kdDebug(6050) << "KHTMLPart::findFrameParent: FOUND!" << endl;
 #endif
-      return 0L;
+     if (childFrame)
+        *childFrame = &(*it);
+     return this;
+  }
+     
+  it = d->m_frames.begin();
+  for (; it != end; ++it )
+  {
+    KParts::ReadOnlyPart *p = (*it).m_part;
+    if ( p && p->inherits( "KHTMLPart" ))
+    {
+      KHTMLPart *frameParent = static_cast<KHTMLPart*>(p)->findFrameParent(callingPart, f, childFrame);
+      if (frameParent)
+         return frameParent;
     }
   }
+  return 0;
+}
+
+
+KHTMLPart *KHTMLPart::findFrame( const QString &f )
+{
+  khtml::ChildFrame *childFrame;
+  KHTMLPart *parentFrame = findFrameParent(this, f, &childFrame);
+  if (parentFrame)
+  {
+     KParts::ReadOnlyPart *p = childFrame->m_part;
+     if ( p && p->inherits( "KHTMLPart" ))
+        return static_cast<KHTMLPart *>(p);
+  }
+  return 0;
 }
 
 KParts::ReadOnlyPart *KHTMLPart::currentFrame() const
@@@@ -4514,37 +4554,29 @@@@ KHTMLPart *KHTMLPart::parentPart()
   return (KHTMLPart *)parent();
 }
 
-khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( const KURL &url, const KParts::URLArgs &args,
-                                                     bool callParent )
+khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, 
+                                                     const KParts::URLArgs &args, bool callParent )
 {
-  FrameIt it = d->m_frames.find( args.frameName );
-
-  if ( it != d->m_frames.end() )
-    return &(*it);
-
-  it = d->m_frames.begin();
-  FrameIt end = d->m_frames.end();
-  for (; it != end; ++it )
-    if ( (*it).m_part && (*it).m_part->inherits( "KHTMLPart" ) )
-    {
-      KHTMLPart *childPart = (KHTMLPart *)(KParts::ReadOnlyPart *)(*it).m_part;
-
-      khtml::ChildFrame *res = childPart->recursiveFrameRequest( url, args, false );
-      if ( !res )
-        continue;
-
-      childPart->requestObject( res, url, args );
-      return 0L;
-    }
+#ifdef DEBUG_FINDFRAME
+  kdDebug( 6050 ) << "KHTMLPart::recursiveFrameRequest this = " << this << ", frame = " << args.frameName << ", url = " << url << endl;
+#endif  
+  khtml::ChildFrame *childFrame;
+  KHTMLPart *childPart = findFrameParent(callingHtmlPart, args.frameName, &childFrame);
+  if (childPart)
+  {
+     if (childPart == this)
+        return childFrame;
+     
+     childPart->requestObject( childFrame, url, args );
+     return 0;
+  }
 
   if ( parentPart() && callParent )
   {
-    khtml::ChildFrame *res = parentPart()->recursiveFrameRequest( url, args );
+     khtml::ChildFrame *res = parentPart()->recursiveFrameRequest( callingHtmlPart, url, args, callParent );
d164 3
a166 2
-    if ( res )
-      parentPart()->requestObject( res, url, args );
d168 476
a643 15
-    return 0L;
+     if ( res )
+       parentPart()->requestObject( res, url, args );
   }
 
   return 0L;
@@@@ -4552,7 +4584,7 @@@@ khtml::ChildFrame *KHTMLPart::recursiveF
 
 void KHTMLPart::saveState( QDataStream &stream )
 {
-  kdDebug( 6050 ) << "KHTMLPart::saveState saving URL " << m_url.url() << endl;
+  kdDebug( 6050 ) << "KHTMLPart::saveState this = " << this << " saving URL " << m_url.url() << endl;
 
   stream << m_url << (Q_INT32)d->m_view->contentsX() << (Q_INT32)d->m_view->contentsY()
          << (Q_INT32) d->m_view->contentsWidth() << (Q_INT32) d->m_view->contentsHeight() << (Q_INT32) d->m_view->marginWidth() << (Q_INT32) d->m_view->marginHeight();
@


1.7
log
@Update to KDE-3.1.5

Changes:
* networking: Fix crash related to SOCKS
* kate: C syntax highlighting
* konqueror: Improved handling of long filenames in icon view.
* khtml: Minor rendering fixes
* khtml: Improved loading of large images
* java: Crash fix
* webdav: Fixed renaming of files via secure connection
@
text
@d1 1
a1 1
$NetBSD$
@


1.6
log
@Update kdelibs to 3.1.3.

Changes:
* build system updates, gcc 3.4+ compilation fixes (Dirk Mueller)
* ensure that each installed header file can be compiled on its own (has all
  necessary includes/forward declarations)
* SECURITY: kio/khtml: Improve referer handling, always strip out username and
  password.
* Roaming user support (Helge Deller)
* kabc: add quotes around names from LDAP which contain non-alphanumeric characters
* kabc: unterminated string handling fixes
* kbugreport: only refer to http://bugs.kde.org if the bug-address is
  submit@@bugs.kde.org
* kcookiejar: don't deliver cookies when the url is "strange"
* kcookiejar: unbreak cookies for https sites once again
* kcookiejar: make kcookiejar --remove <domain> work
* kdecore: never unload dante socks library, it crashes when doing so
* kdecore: Adding KMacroExpander, class for shell-safe expansion of filenames in
  shellcode
* kdeinit: Handle X errors instead of just crashing when they occur.
* kdeprint: improvements to handling of cups network printers
* kdeprint/smbview: use nmblookup -M -- to make it work with samba 3.0
* kdeui: dragging from the "konqueror wheel" button no longer duplicates the window
* kdeui: rewritten mouse cursor-autohide code (hopefully much more stable now)
* kdeui/kfontdialog: Try very hard to match the font name that was passed with one
  that actually exists
* kdeui/kmainwindow: fix for saving statusbar state when autosave is enabled
* kdewidgets: Add some new widgets
* keramik: Major fixes to toolbar gradient alignment, as well as some miscellaneous
  fixes.
* khtml: avoid endless-relayout-loop
* khtml: several backports of fixes from 3.2 development branch
* khtml: several fixes to bugs exposed by DOM2 testsuite
* khtml jpeg loader: use memmove in places where memory regions overlap (valgrind
  we love you)
* kio: crash/memory leak fixes
* kio: added ability to add host:port to the no-proxy list
* kio: speedup handling local files
* kio: improvements to the layout of the HTTP Authentication password dialog
* kio: allow rtsp:// protocol redirecting to mms://
* kio: KIOSK restriction fixes
* kio: signal handling fixes (SIGPIPE etc)
* kio_http: text/html mimetype in Accept: gets preference over other text/* types
* kio_http: improvements in HTTP referer handling
* kiconloader: memory leak fix
* kjava: thread handling fixes
* kjava: don't send text to the console window if its not visible (saves huge
  amount of memory on some pages)
* kjava: catch exceptions thrown inside Applet.destroy
* klocale: Support Macedonian plural forms
@
text
@d3 1
a3 1
--- kdeprint/management/Makefile.in.orig	2003-07-16 12:59:54.000000000 +1200
d5 1
a5 1
@@@@ -375,15 +375,19 @@@@ x_includes = @@x_includes@@
d30 1
a30 1
@@@@ -428,11 +432,18 @@@@ CONFIG_HEADER = $(top_builddir)/config.h
d52 1
a52 1
@@@@ -477,18 +488,20 @@@@ libkdeprint_management_la_nofinal_OBJECT
d77 1
a77 1
@@@@ -535,10 +548,12 @@@@ am__depfiles_maybe = depfiles
d92 1
a92 1
@@@@ -586,8 +601,10 @@@@ am__depfiles_maybe = depfiles
d104 1
a104 1
@@@@ -654,6 +671,7 @@@@ CXXLD = $(CXX)
d112 1
a112 1
@@@@ -662,7 +680,7 @@@@ HEADERS = $(kdeprint_HEADERS) $(noinst_H
d121 1
a121 1
@@@@ -709,6 +727,8 @@@@ clean-libLTLIBRARIES:
d130 1
a130 1
@@@@ -754,9 +774,10 @@@@ distclean-compile:
d142 1
a142 1
@@@@ -949,7 +970,7 @@@@ distclean-tags:
d146 1
a146 1
-KDE_DIST=tileup.png tiledown.png side.png 
d151 1
a151 1
@@@@ -1086,9 +1107,6 @@@@ uninstall-am: uninstall-binPROGRAMS unin
d161 1
a161 1
@@@@ -1103,11 +1121,11 @@@@ libkdeprint_management.la.closure: $(lib
d165 8
a172 2
-kmpropcontainer.moc: $(srcdir)/kmpropcontainer.h
-	$(MOC) $(srcdir)/kmpropcontainer.h -o kmpropcontainer.moc
d177 1
a177 1
-mocs: kmpropcontainer.moc
d180 5
a184 3
 kmconfigfonts.moc: $(srcdir)/kmconfigfonts.h
 	$(MOC) $(srcdir)/kmconfigfonts.h -o kmconfigfonts.moc
@@@@ -1115,107 +1133,107 @@@@ kmconfigfonts.moc: $(srcdir)/kmconfigfon
d186 2
a187 1
 mocs: kmconfigfonts.moc
d189 2
a190 2
-kmwsocketutil.moc: $(srcdir)/kmwsocketutil.h
-	$(MOC) $(srcdir)/kmwsocketutil.h -o kmwsocketutil.moc
d195 1
a195 1
-mocs: kmwsocketutil.moc
d198 2
a199 2
-kmspecialprinterdlg.moc: $(srcdir)/kmspecialprinterdlg.h
-	$(MOC) $(srcdir)/kmspecialprinterdlg.h -o kmspecialprinterdlg.moc
d204 1
a204 1
-mocs: kmspecialprinterdlg.moc
d207 2
a208 2
-kmconfigfilter.moc: $(srcdir)/kmconfigfilter.h
-	$(MOC) $(srcdir)/kmconfigfilter.h -o kmconfigfilter.moc
d213 1
a213 1
-mocs: kmconfigfilter.moc
d216 2
a217 2
-kmwclass.moc: $(srcdir)/kmwclass.h
-	$(MOC) $(srcdir)/kmwclass.h -o kmwclass.moc
d222 1
a222 1
-mocs: kmwclass.moc
d225 2
a226 2
-kmconfigpage.moc: $(srcdir)/kmconfigpage.h
-	$(MOC) $(srcdir)/kmconfigpage.h -o kmconfigpage.moc
d231 1
a231 1
-mocs: kmconfigpage.moc
d234 2
a235 2
-pluginaction.moc: $(srcdir)/pluginaction.h
-	$(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc
d240 1
a240 1
-mocs: pluginaction.moc
d243 2
a244 2
-kmwdriverselect.moc: $(srcdir)/kmwdriverselect.h
-	$(MOC) $(srcdir)/kmwdriverselect.h -o kmwdriverselect.moc
d249 1
a249 1
-mocs: kmwdriverselect.moc
d252 2
a253 2
-kxmlcommanddlg.moc: $(srcdir)/kxmlcommanddlg.h
-	$(MOC) $(srcdir)/kxmlcommanddlg.h -o kxmlcommanddlg.moc
d258 1
a258 1
-mocs: kxmlcommanddlg.moc
d261 2
a262 2
-kmwizardpage.moc: $(srcdir)/kmwizardpage.h
-	$(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc
d267 1
a267 1
-mocs: kmwizardpage.moc
d270 2
a271 2
-kmdriverdbwidget.moc: $(srcdir)/kmdriverdbwidget.h
-	$(MOC) $(srcdir)/kmdriverdbwidget.h -o kmdriverdbwidget.moc
d276 1
a276 1
-mocs: kmdriverdbwidget.moc
d279 3
a281 5
-kmdbcreator.moc: $(srcdir)/kmdbcreator.h
-	$(MOC) $(srcdir)/kmdbcreator.h -o kmdbcreator.moc
+kminstancepage.moc: $(srcdir)/kminstancepage.h
+	$(MOC) $(srcdir)/kminstancepage.h -o kminstancepage.moc
 
d283 1
a283 2
-mocs: kmdbcreator.moc
+mocs: kminstancepage.moc
d285 2
a286 2
-kxmlcommandselector.moc: $(srcdir)/kxmlcommandselector.h
-	$(MOC) $(srcdir)/kxmlcommandselector.h -o kxmlcommandselector.moc
d291 1
a291 1
-mocs: kxmlcommandselector.moc
d294 2
a295 2
-kmwdrivertest.moc: $(srcdir)/kmwdrivertest.h
-	$(MOC) $(srcdir)/kmwdrivertest.h -o kmwdrivertest.moc
d300 1
a300 1
-mocs: kmwdrivertest.moc
d302 1
a302 3
 #>+ 3
-kmmainview.moc: $(srcdir)/kmmainview.h
-	$(MOC) $(srcdir)/kmmainview.h -o kmmainview.moc
d305 2
a306 3
 
 #>+ 1
-mocs: kmmainview.moc
d309 3
a311 5
-kmwizard.moc: $(srcdir)/kmwizard.h
-	$(MOC) $(srcdir)/kmwizard.h -o kmwizard.moc
+kmwdriverselect.moc: $(srcdir)/kmwdriverselect.h
+	$(MOC) $(srcdir)/kmwdriverselect.h -o kmwdriverselect.moc
 
d313 1
a313 2
-mocs: kmwizard.moc
+mocs: kmwdriverselect.moc
d315 2
a316 2
-kmpropwidget.moc: $(srcdir)/kmpropwidget.h
-	$(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc
d321 1
a321 1
-mocs: kmpropwidget.moc
d324 2
a325 2
-cjanuswidget.moc: $(srcdir)/cjanuswidget.h
-	$(MOC) $(srcdir)/cjanuswidget.h -o cjanuswidget.moc
d330 1
a330 1
-mocs: cjanuswidget.moc
d333 5
a337 3
 kmconfigdialog.moc: $(srcdir)/kmconfigdialog.h
 	$(MOC) $(srcdir)/kmconfigdialog.h -o kmconfigdialog.moc
@@@@ -1223,83 +1241,83 @@@@ kmconfigdialog.moc: $(srcdir)/kmconfigdi
d339 2
a340 1
 mocs: kmconfigdialog.moc
d342 2
a343 2
-kminstancepage.moc: $(srcdir)/kminstancepage.h
-	$(MOC) $(srcdir)/kminstancepage.h -o kminstancepage.moc
d348 1
a348 1
-mocs: kminstancepage.moc
d351 2
a352 2
-kiconselectaction.moc: $(srcdir)/kiconselectaction.h
-	$(MOC) $(srcdir)/kiconselectaction.h -o kiconselectaction.moc
d357 1
a357 1
-mocs: kiconselectaction.moc
d360 2
a361 2
-kmdriverdialog.moc: $(srcdir)/kmdriverdialog.h
-	$(MOC) $(srcdir)/kmdriverdialog.h -o kmdriverdialog.moc
d366 1
a366 1
-mocs: kmdriverdialog.moc
d369 2
a370 2
-kmlistview.moc: $(srcdir)/kmlistview.h
-	$(MOC) $(srcdir)/kmlistview.h -o kmlistview.moc
d375 1
a375 1
-mocs: kmlistview.moc
d378 2
a379 2
-kmwsmb.moc: $(srcdir)/kmwsmb.h
-	$(MOC) $(srcdir)/kmwsmb.h -o kmwsmb.moc
d384 1
a384 1
-mocs: kmwsmb.moc
d387 2
a388 2
-kmconfiggeneral.moc: $(srcdir)/kmconfiggeneral.h
-	$(MOC) $(srcdir)/kmconfiggeneral.h -o kmconfiggeneral.moc
d393 1
a393 1
-mocs: kmconfiggeneral.moc
d396 2
a397 2
-kmwlocal.moc: $(srcdir)/kmwlocal.h
-	$(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc
d402 1
a402 1
-mocs: kmwlocal.moc
d405 3
a407 5
-kmprinterview.moc: $(srcdir)/kmprinterview.h
-	$(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc
+kmpropertypage.moc: $(srcdir)/kmpropertypage.h
+	$(MOC) $(srcdir)/kmpropertypage.h -o kmpropertypage.moc
 
d409 1
a409 2
-mocs: kmprinterview.moc
+mocs: kmpropertypage.moc
d411 2
a412 2
-smbview.moc: $(srcdir)/smbview.h
-	$(MOC) $(srcdir)/smbview.h -o smbview.moc
d417 1
a417 1
-mocs: smbview.moc
d420 2
a421 2
-kmconfigjobs.moc: $(srcdir)/kmconfigjobs.h
-	$(MOC) $(srcdir)/kmconfigjobs.h -o kmconfigjobs.moc
d426 1
a426 1
-mocs: kmconfigjobs.moc
d429 2
a430 2
-networkscanner.moc: $(srcdir)/networkscanner.h
-	$(MOC) $(srcdir)/networkscanner.h -o networkscanner.moc
d435 1
a435 1
-mocs: networkscanner.moc
d438 2
a439 2
-kmdriverdb.moc: $(srcdir)/kmdriverdb.h
-	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
d444 1
a444 1
-mocs: kmdriverdb.moc
d447 2
a448 2
-kmwsocket.moc: $(srcdir)/kmwsocket.h
-	$(MOC) $(srcdir)/kmwsocket.h -o kmwsocket.moc
d453 1
a453 1
-mocs: kmwsocket.moc
d456 5
a460 3
 kmtimer.moc: $(srcdir)/kmtimer.h
 	$(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc
@@@@ -1307,26 +1325,26 @@@@ kmtimer.moc: $(srcdir)/kmtimer.h
d462 2
a463 1
 mocs: kmtimer.moc
d465 2
a466 2
-kmiconview.moc: $(srcdir)/kmiconview.h
-	$(MOC) $(srcdir)/kmiconview.h -o kmiconview.moc
d471 1
a471 1
-mocs: kmiconview.moc
d474 2
a475 2
-kmpropertypage.moc: $(srcdir)/kmpropertypage.h
-	$(MOC) $(srcdir)/kmpropertypage.h -o kmpropertypage.moc
d480 1
a480 1
-mocs: kmpropertypage.moc
d483 2
a484 2
-kmjobviewer.moc: $(srcdir)/kmjobviewer.h
-	$(MOC) $(srcdir)/kmjobviewer.h -o kmjobviewer.moc
d489 1
a489 1
-mocs: kmjobviewer.moc
d493 1
a493 1
-	-rm -f  kmpropcontainer.moc kmconfigfonts.moc kmwsocketutil.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmwclass.moc kmconfigpage.moc pluginaction.moc kmwdriverselect.moc kxmlcommanddlg.moc kmwizardpage.moc kmdriverdbwidget.moc kmdbcreator.moc kxmlcommandselector.moc kmwdrivertest.moc kmmainview.moc kmwizard.moc kmpropwidget.moc cjanuswidget.moc kmconfigdialog.moc kminstancepage.moc kiconselectaction.moc kmdriverdialog.moc kmlistview.moc kmwsmb.moc kmconfiggeneral.moc kmwlocal.moc kmprinterview.moc smbview.moc kmconfigjobs.moc networkscanner.moc kmdriverdb.moc kmwsocket.moc kmtimer.moc kmiconview.moc kmpropertypage.moc kmjobviewer.moc
d498 1
a498 1
@@@@ -1343,7 +1361,7 @@@@ force-reedit:
d502 1
a502 1
-libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp $(srcdir)/kmconfigfonts.cpp $(srcdir)/kmconfigjobs.cpp $(srcdir)/networkscanner.cpp  kmpropcontainer.moc kmwsocketutil.moc kmconfigfonts.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmwclass.moc kmconfigpage.moc pluginaction.moc kmwdriverselect.moc kxmlcommanddlg.moc kmwizardpage.moc kmdriverdbwidget.moc kmdbcreator.moc kxmlcommandselector.moc kmwdrivertest.moc kmmainview.moc kmpropwidget.moc kmwizard.moc cjanuswidget.moc kmconfigdialog.moc kiconselectaction.moc kminstancepage.moc kmdriverdialog.moc kmlistview.moc kmwsmb.moc kmconfiggeneral.moc kmwlocal.moc kmprinterview.moc smbview.moc kmconfigjobs.moc networkscanner.moc kmdriverdb.moc kmwsocket.moc kmiconview.moc kmtimer.moc kmjobviewer.moc kmpropertypage.moc
d507 1
a507 1
@@@@ -1379,77 +1397,77 @@@@ kde-rpo-clean:
d511 18
d530 3
a532 7
-kmpropertypage.o: kmpropertypage.moc 
-smbview.lo: smbview.moc 
-kmdriverdialog.o: kmdriverdialog.moc 
 kmmainview.o: kmmainview.moc 
-kmwsmb.o: kmwsmb.moc 
-kmwclass.lo: kmwclass.moc 
-kmconfigfonts.o: kmconfigfonts.moc 
d534 5
a538 2
+kmpropcontainer.lo: kmpropcontainer.moc 
+kmmainview.lo: kmmainview.moc 
d540 9
a548 1
+kmpropwidget.o: kmpropwidget.moc 
d550 1
a550 1
+kmwizardpage.lo: kmwizardpage.moc 
d552 3
a554 2
 kmwlocal.lo: kmwlocal.moc 
+kmconfigpage.o: kmconfigpage.moc 
d556 1
a556 14
 kmwdrivertest.o: kmwdrivertest.moc 
-kmpropertypage.lo: kmpropertypage.moc 
-kmwlocal.o: kmwlocal.moc 
-kxmlcommanddlg.lo: kxmlcommanddlg.moc 
-kminstancepage.lo: kminstancepage.moc 
-kiconselectaction.lo: kiconselectaction.moc 
-kxmlcommandselector.lo: kxmlcommandselector.moc 
-kmconfigfonts.lo: kmconfigfonts.moc 
-kmwsocket.lo: kmwsocket.moc 
-kmmainview.lo: kmmainview.moc 
-kxmlcommanddlg.o: kxmlcommanddlg.moc 
-kmconfiggeneral.lo: kmconfiggeneral.moc 
-kmlistview.lo: kmlistview.moc 
-kmwsocketutil.lo: kmwsocketutil.moc 
d558 3
a560 8
 kmconfigdialog.lo: kmconfigdialog.moc 
-kmdriverdbwidget.lo: kmdriverdbwidget.moc 
-kmdbcreator.lo: kmdbcreator.moc 
-kmjobviewer.o: kmjobviewer.moc 
-kmpropcontainer.lo: kmpropcontainer.moc 
-kmwclass.o: kmwclass.moc 
 kmwizardpage.o: kmwizardpage.moc 
+kmwdrivertest.lo: kmwdrivertest.moc 
d562 2
a563 1
+kmiconview.o: kmiconview.moc 
d569 3
a571 2
 kmwdriverselect.lo: kmwdriverselect.moc 
+cjanuswidget.o: cjanuswidget.moc 
d574 1
a574 9
 kmdriverdbwidget.o: kmdriverdbwidget.moc 
-pluginaction.lo: pluginaction.moc 
-kxmlcommandselector.o: kxmlcommandselector.moc 
-smbview.o: smbview.moc 
-kmwdrivertest.lo: kmwdrivertest.moc 
-kmspecialprinterdlg.o: kmspecialprinterdlg.moc 
-kmprinterview.o: kmprinterview.moc 
-kmpropwidget.o: kmpropwidget.moc 
-kmwizardpage.lo: kmwizardpage.moc 
d576 1
a576 2
 kmconfigdialog.o: kmconfigdialog.moc 
-cjanuswidget.lo: cjanuswidget.moc 
d580 1
a580 1
+kxmlcommandselector.o: kxmlcommandselector.moc 
d585 1
a585 1
+networkscanner.lo: networkscanner.moc 
d589 1
a589 5
 kmconfigfilter.lo: kmconfigfilter.moc 
-kmconfigfilter.o: kmconfigfilter.moc 
-pluginaction.o: pluginaction.moc 
-kmiconview.o: kmiconview.moc 
-kiconselectaction.o: kiconselectaction.moc 
d594 3
a596 12
 kmwizard.lo: kmwizard.moc 
-kmconfigjobs.lo: kmconfigjobs.moc 
-kmconfigpage.o: kmconfigpage.moc 
-kmdbcreator.o: kmdbcreator.moc 
-networkscanner.lo: networkscanner.moc 
-kmwsocketutil.o: kmwsocketutil.moc 
-cjanuswidget.o: cjanuswidget.moc 
-kmlistview.o: kmlistview.moc 
+kmpropwidget.lo: kmpropwidget.moc 
 kmprinterview.lo: kmprinterview.moc 
-kmtimer.lo: kmtimer.moc 
-kmconfigjobs.o: kmconfigjobs.moc 
d601 7
a607 4
 kmspecialprinterdlg.lo: kmspecialprinterdlg.moc 
-kmdriverdb.lo: kmdriverdb.moc 
+pluginaction.o: pluginaction.moc 
+kxmlcommanddlg.lo: kxmlcommanddlg.moc 
d609 11
a619 4
+kmspecialprinterdlg.o: kmspecialprinterdlg.moc 
 kmconfigpage.lo: kmconfigpage.moc 
-kmdriverdb.o: kmdriverdb.moc 
-kmjobviewer.lo: kmjobviewer.moc 
d621 2
a622 3
-kmpropwidget.lo: kmpropwidget.moc 
-networkscanner.o: networkscanner.moc 
-kmconfiggeneral.o: kmconfiggeneral.moc 
d624 5
a628 3
 kmiconview.lo: kmiconview.moc 
-kminstancepage.o: kminstancepage.moc 
-kmwdriverselect.o: kmwdriverselect.moc 
d630 6
a635 5
+kxmlcommanddlg.o: kxmlcommanddlg.moc 
+kmconfigfilter.o: kmconfigfilter.moc 
+kmwsocketutil.o: kmwsocketutil.moc 
+kmconfigjobs.lo: kmconfigjobs.moc 
+kmdriverdb.lo: kmdriverdb.moc 
d639 1
a639 1
 kmdriverdialog.lo: kmdriverdialog.moc 
@


1.5
log
@Update KDE to 3.1.2.

Changes:

kdelibs:
* https authentication through proxy fixed.
* KZip failed for some .zip archives.
* Fixed a bug in socket code that made KDEPrint crash.
* kspell: Support for Hebrew spell checking using hspell (requires hspell 0.5).

kdebase:
* kwin: Alt+Tab works while drag'n'drop (unless the application also grabs keyboard).
* kio_smtp: Doesn't eat 100% CPU when connection breaks and fixed a confusing error
  message when AUTH failed ("Unknown Command" vs. "Authorization failed")
* kscreensaver: Fixed issue where kdesktop_lock would stay running indefinitely in
  the background if it could not grab the keyboard/mouse, preventing the screen from
  being locked manually.
* kscreensaver: Screensavers are now stopped when asking for the password [#56803]
* kio_smb: Several bugfixes for the smbro-ioslave.
* kdesktop: fixed minicli layout problem with Qt 3.1.2
* kdm: fixed incorrect user window width with Qt 3.1.2
* Konqueror: Create DCOP interface for mainwindow when object begins to exist.
* Konqueror: Fixed tab open delays when it can't reach website.
* Konsole: Don't flicker when selecting entire lines.
* Konsole: Crash, selection and sort fixes in schema and session editors.
* Konsole: Fixed mouse-wheel in mouse mode.
* Konsole: Allow programs to resize windows if enabled.
* Konsole: Keep output steady when triple-click selecting.
* Konsole: Added "Print" menu command.
* kicker: Fixed kasbar only drawing last icon from a group.
@
text
@d3 1
a3 1
--- kdeprint/management/Makefile.in.orig	Thu May  8 05:24:06 2003
d5 1
a5 1
@@@@ -374,15 +374,19 @@@@ x_includes = @@x_includes@@
d30 1
a30 1
@@@@ -427,11 +431,18 @@@@ CONFIG_HEADER = $(top_builddir)/config.h
d52 1
a52 1
@@@@ -476,18 +487,20 @@@@ libkdeprint_management_la_nofinal_OBJECT
d77 1
a77 1
@@@@ -534,10 +547,12 @@@@ am__depfiles_maybe = depfiles
d92 1
a92 1
@@@@ -585,8 +600,10 @@@@ am__depfiles_maybe = depfiles
d104 1
a104 1
@@@@ -653,6 +670,7 @@@@ CXXLD = $(CXX)
d112 1
a112 1
@@@@ -661,7 +679,7 @@@@ HEADERS = $(kdeprint_HEADERS) $(noinst_H
d121 1
a121 1
@@@@ -708,6 +726,8 @@@@ clean-libLTLIBRARIES:
d130 1
a130 1
@@@@ -753,9 +773,10 @@@@ distclean-compile:
d142 1
a142 1
@@@@ -948,7 +969,7 @@@@ distclean-tags:
d147 1
a147 1
+KDE_DIST=side.png tiledown.png tileup.png 
d151 1
a151 1
@@@@ -1085,9 +1106,6 @@@@ uninstall-am: uninstall-binPROGRAMS unin
d161 1
a161 1
@@@@ -1102,156 +1120,156 @@@@ libkdeprint_management.la.closure: $(lib
d170 3
d176 3
a178 1
 
d185 3
d194 3
d203 3
d212 3
d221 3
d230 3
d239 3
d248 3
d257 3
d266 3
d275 3
d284 3
d293 3
d302 3
d311 3
d320 3
d329 3
d335 3
a337 1
 
d344 3
d353 3
d362 3
d371 3
d380 3
d389 3
d398 3
d407 3
d416 3
d425 3
d434 3
d443 3
d452 3
d458 3
a460 1
 
d467 3
d476 3
d485 3
d495 1
a495 1
@@@@ -1268,7 +1286,7 @@@@ force-reedit:
d504 1
a504 1
@@@@ -1304,77 +1322,77 @@@@ kde-rpo-clean:
@


1.4
log
@Update KDE to 3.1.

Many bugfixes and functionality enhancements including:

General

 New default widget style: Keramik
 New default icon theme: Crystal

 Created and enhanced framework to effectively disable certain features of
 the GUI, like for example shell access, disallowing to select custom wall
 papers. "Kiosk mode"
 Usability improvements:
   Kicker: Context menu, applet menus, wording and panel feature consistency
   improved
   Kicker: Redesigned control module.
   KCalc: Usability Improvements.
   KSnapshot: Usability Improvements.
   KsCD: User Interface Improvements in configuration and information dialogs


kdelibs

 Extended the DCOP commandline client to
   enable nonGUI applications (such as shell scripts) to use DCOP
   send DCOP messages to multiple users and/or sessions concurrently
 Added to notification dialog to allow applications to configure their
 notifications with a common GUI.
 Added "Open File", "Open Destination" and "Keep window open" to download
 progress dialog.
 KDatePicker has now week number display and selection.
 Added KLocale support for setting/retrieving the first day of a week
 Support for "Multimedia keys" on your keyboard.
 Added on-demand icon loading support to improve startup performance of
 applications.
 KHTML:
   Improvements to printing support.
   Page Info and Frame info dialog.
   Auto-Scroll support of webpages using Shift combined with arrow keys.
   Many, many Bugfixes and improvements.
   Small codebase merges with Safari. The main merge is planned for a future
   release however, as it requires more testing.
 KIO:
   Modified thumbnail ioslave that can extract a thumbnail from the file
   directly if it contains one, rather than generating one itself.
   Added fish:// protocol slave, which can access remote filesystems via
   SSH and SCP
   Cleanups and Corrections in smtp:// protocol slave.
   Activated rtsp:// protocol slave.
   Added support for Public Key Authentication and interopability with newer
   versions of OpenSSH to sftp:// protocol slave.
 KSSL:
   SSL certificate policies can now be configured based on the host name
@
text
@d3 1
a3 1
--- kdeprint/management/Makefile.in.orig	Thu Jan 23 12:30:35 2003
d5 1
a5 1
@@@@ -283,15 +283,19 @@@@
d30 1
a30 1
@@@@ -336,11 +340,18 @@@@
d52 1
a52 1
@@@@ -385,11 +396,11 @@@@
a64 1
 DEFS = @@DEFS@@
a65 1
@@@@ -399,8 +410,10 @@@@
d77 1
a77 1
@@@@ -447,10 +460,12 @@@@
d92 1
a92 1
@@@@ -498,8 +513,10 @@@@
d104 2
a105 1
@@@@ -567,6 +584,7 @@@@
a106 1
 CXXFLAGS = @@CXXFLAGS@@
d112 1
a112 1
@@@@ -575,7 +593,7 @@@@
d121 1
a121 1
@@@@ -622,6 +640,8 @@@@
d130 1
a130 1
@@@@ -667,9 +687,10 @@@@
d142 2
a143 2
@@@@ -830,7 +851,7 @@@@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
d151 2
a152 2
@@@@ -953,9 +974,6 @@@@
 	uninstall-dataiconDATA uninstall-info-am \
d161 1
a161 1
@@@@ -970,156 +988,156 @@@@
d387 1
a387 1
@@@@ -1136,7 +1154,7 @@@@
d396 1
a396 1
@@@@ -1172,77 +1190,77 @@@@
@


1.3
log
@Update KDE to the 3.0.5a distribution. Packages are numbered 3.0.5.1 or
1.0.5.1 accordingly.

Fixes and changes are:

Multiple vulnerabilities.

kdelibs
	KHTML : Fixed several crashes and misrenderings.
	rlogin.protocol: fixed command execution in specially crafted
	urls.

kdebase
	KAddressbook: Don't squeeze columns on startup/properly restore
	column width settings.

kdenetwork
	lisa, reslisa: Fixed several security vulnerabilities.

kdesdk
	Cervisia: Show long lines in diff view always completely.
@
text
@d3 1
a3 1
--- kdeprint/management/Makefile.in.orig	Tue Nov 26 08:57:39 2002
d5 2
a6 2
@@@@ -264,15 +264,19 @@@@ x_libraries = @@x_libraries@@
 
d30 1
a30 1
@@@@ -317,11 +321,18 @@@@ CONFIG_HEADER = $(top_builddir)/config.h
d52 1
a52 1
@@@@ -364,11 +375,11 @@@@ libkdeprint_management_la_nofinal_OBJECT
d67 1
a67 3
@@@@ -376,9 +387,10 @@@@ CPPFLAGS = @@CPPFLAGS@@
 LDFLAGS = @@LDFLAGS@@
 LIBS = @@LIBS@@
d69 38
a106 38
-#>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/dummy.Po \
-#>- @@AMDEP_TRUE@@	$(DEPDIR)/jobitem.Plo \
+#>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/jobitem.Plo \
 #>- @@AMDEP_TRUE@@	$(DEPDIR)/kaddprinterwizard.Plo \
+#>- @@AMDEP_TRUE@@	$(DEPDIR)/kaddprinterwizard_main.Plo \
+#>- @@AMDEP_TRUE@@	$(DEPDIR)/kaddprinterwizard_main.Po \
 #>- @@AMDEP_TRUE@@	$(DEPDIR)/kiconselectaction.Plo \
 #>- @@AMDEP_TRUE@@	$(DEPDIR)/kmconfigcommand.Plo \
 #>- @@AMDEP_TRUE@@	$(DEPDIR)/kmconfigdialog.Plo \
@@@@ -416,10 +428,11 @@@@ depcomp = $(SHELL) $(top_srcdir)/admin/d
 #>- @@AMDEP_TRUE@@	$(DEPDIR)/kxmlcommandselector.Plo \
 #>- @@AMDEP_TRUE@@	$(DEPDIR)/pluginaction.Plo $(DEPDIR)/sidepixmap.Plo \
 #>- @@AMDEP_TRUE@@	$(DEPDIR)/smbview.Plo
-#>+ 81
-@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES =   $(DEPDIR)/libkdeprint_management_la.all_cpp.P  $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/dummy.Po \
-@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/jobitem.Plo \
+#>+ 83
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES =   $(DEPDIR)/libkdeprint_management_la.all_cpp.P  $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/jobitem.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/kaddprinterwizard.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/kaddprinterwizard_main.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/kaddprinterwizard_main.Po \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/kiconselectaction.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/kmconfigcommand.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/kmconfigdialog.Plo \
@@@@ -457,9 +470,10 @@@@ depcomp = $(SHELL) $(top_srcdir)/admin/d
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/kxmlcommandselector.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/pluginaction.Plo $(DEPDIR)/sidepixmap.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/smbview.Plo
-@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES =   $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/dummy.Po \
-@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	$(DEPDIR)/jobitem.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES =   $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/jobitem.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	$(DEPDIR)/kaddprinterwizard.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	$(DEPDIR)/kaddprinterwizard_main.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	$(DEPDIR)/kaddprinterwizard_main.Po \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	$(DEPDIR)/kiconselectaction.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	$(DEPDIR)/kmconfigcommand.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	$(DEPDIR)/kmconfigdialog.Plo \
@@@@ -518,6 +532,7 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
d114 1
a114 1
@@@@ -526,7 +541,7 @@@@ HEADERS = $(kdeprint_HEADERS) $(noinst_H
d123 2
a124 2
@@@@ -575,6 +590,8 @@@@ clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
d132 1
a132 1
@@@@ -615,9 +632,10 @@@@ distclean-compile:
d135 11
a145 11
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/cjanuswidget.Plo@@am__quote@@
-@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/jobitem.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kaddprinterwizard.Plo@@am__quote@@
+@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kaddprinterwizard_main.Plo@@am__quote@@
+@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kaddprinterwizard_main.Po@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kiconselectaction.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmconfigcommand.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmconfigdialog.Plo@@am__quote@@
@@@@ -761,7 +779,7 @@@@ distclean-tags:
 
d153 1
a153 1
@@@@ -878,9 +896,6 @@@@ uninstall-am: uninstall-binPROGRAMS unin
d163 1
a163 1
@@@@ -895,140 +910,140 @@@@ libkdeprint_management.la.closure: $(lib
d173 4
d209 6
d263 6
d273 4
a276 2
 kmpropwidget.moc: $(srcdir)/kmpropwidget.h
 	$(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc
a278 4
-cjanuswidget.moc: $(srcdir)/cjanuswidget.h
-	$(MOC) $(srcdir)/cjanuswidget.h -o cjanuswidget.moc
-
-#>+ 3
d337 2
a338 2
-kmdriverdb.moc: $(srcdir)/kmdriverdb.h
-	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
d343 4
a346 2
 kmwsocket.moc: $(srcdir)/kmwsocket.h
 	$(MOC) $(srcdir)/kmwsocket.h -o kmwsocket.moc
d349 2
a350 2
-kmtimer.moc: $(srcdir)/kmtimer.h
-	$(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc
d355 10
d367 2
a368 2
+kmdriverdb.moc: $(srcdir)/kmdriverdb.h
+	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
d373 2
a374 2
+kmtimer.moc: $(srcdir)/kmtimer.h
+	$(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc
a378 4
+kmwizardpage.moc: $(srcdir)/kmwizardpage.h
+	$(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc
+
+#>+ 3
d384 2
a385 2
-	-rm -f  kmpropcontainer.moc kmwsocketutil.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmwclass.moc kmconfigpage.moc pluginaction.moc kxmlcommanddlg.moc kmwizardpage.moc kmdriverdbwidget.moc kmdbcreator.moc kxmlcommandselector.moc kmwdrivertest.moc kmmainview.moc kmwizard.moc kmpropwidget.moc cjanuswidget.moc kmconfigdialog.moc kminstancepage.moc kiconselectaction.moc kmdriverdialog.moc kmlistview.moc kmwsmb.moc kmconfiggeneral.moc kmwlocal.moc kmprinterview.moc smbview.moc kmdriverdb.moc kmwsocket.moc kmtimer.moc kmiconview.moc kmpropertypage.moc kmjobviewer.moc
+	-rm -f  kmmainview.moc kmdriverdbwidget.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc kmlistview.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmdbcreator.moc kmpropwidget.moc kmconfigdialog.moc kmwlocal.moc kmjobviewer.moc kmspecialprinterdlg.moc kiconselectaction.moc kmwsocketutil.moc kmconfigfilter.moc kxmlcommanddlg.moc kmpropertypage.moc kxmlcommandselector.moc kmwdrivertest.moc kmwsocket.moc kmwizard.moc kmdriverdb.moc kmtimer.moc kmwizardpage.moc kmdriverdialog.moc
d389 1
a389 1
@@@@ -1045,7 +1060,7 @@@@ force-reedit:
d393 2
a394 2
-libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp  kmdriverdialog.moc kmpropcontainer.moc kmlistview.moc kmwsocketutil.moc kmwsmb.moc kmconfiggeneral.moc kmprinterview.moc kmwlocal.moc smbview.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmdriverdb.moc kmwclass.moc kmwsocket.moc kmconfigpage.moc pluginaction.moc kxmlcommanddlg.moc kmwizardpage.moc kmdriverdbwidget.moc kmdbcreator.moc kxmlcommandselector.moc kmwdrivertest.moc kmiconview.moc kmtimer.moc kmmainview.moc kmwizard.moc kmpropwidget.moc cjanuswidget.moc kmjobviewer.moc kmpropertypage.moc kmconfigdialog.moc kiconselectaction.moc kminstancepage.moc
+libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp  kmmainview.moc kmdriverdbwidget.moc kmjobviewer.moc kmwlocal.moc kmconfigdialog.moc kmspecialprinterdlg.moc kiconselectaction.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc kmconfigfilter.moc kmwsocketutil.moc kmlistview.moc kmpropertypage.moc kxmlcommanddlg.moc kxmlcommandselector.moc kmwdrivertest.moc kmwsocket.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmwizard.moc kmdriverdb.moc kmtimer.moc kmdbcreator.moc kmdriverdialog.moc kmwizardpage.moc kmpropwidget.moc
d398 1
a398 1
@@@@ -1081,69 +1096,69 @@@@ kde-rpo-clean:
d401 1
a401 1
 #>+ 67
d409 1
d413 1
d428 1
d441 1
a442 1
-kmwclass.o: kmwclass.moc 
d451 1
d458 1
a458 2
+kmconfiggeneral.lo: kmconfiggeneral.moc 
 smbview.o: smbview.moc 
d462 1
d464 1
a464 1
-kmpropwidget.o: kmpropwidget.moc 
d467 1
d474 2
d477 2
d484 1
d489 1
d492 1
d499 1
d515 1
d520 1
d525 1
@


1.2
log
@Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk.
@
text
@d1 1
a1 1
$NetBSD: patch-av,v 1.1.2.1 2002/06/23 19:06:22 jlam Exp $
d3 1
a3 1
--- kdeprint/management/Makefile.in.orig	Tue May 21 15:42:07 2002
d5 1
a5 1
@@@@ -264,15 +264,19 @@@@
d30 1
a30 1
@@@@ -317,11 +321,18 @@@@
d46 1
a46 1
+#>- $(am_libkaddprinterwizard_main_la_OBJECTS)
d52 1
a52 1
@@@@ -365,11 +376,11 @@@@
d67 1
a67 1
@@@@ -377,9 +388,10 @@@@
d71 38
a108 10
-@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/dummy.Po \
-	@@AMDEP_TRUE@@	$(DEPDIR)/jobitem.Plo \
+@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/jobitem.Plo \
 	@@AMDEP_TRUE@@	$(DEPDIR)/kaddprinterwizard.Plo \
+	@@AMDEP_TRUE@@	$(DEPDIR)/kaddprinterwizard_main.Plo \
+	@@AMDEP_TRUE@@	$(DEPDIR)/kaddprinterwizard_main.Po \
 	@@AMDEP_TRUE@@	$(DEPDIR)/kiconselectaction.Plo \
 	@@AMDEP_TRUE@@	$(DEPDIR)/kmconfigcommand.Plo \
 	@@AMDEP_TRUE@@	$(DEPDIR)/kmconfigdialog.Plo \
@@@@ -437,6 +449,7 @@@@
d116 1
a116 1
@@@@ -445,7 +458,7 @@@@
d125 1
a125 1
@@@@ -494,6 +507,8 @@@@
d134 1
a134 1
@@@@ -534,9 +549,10 @@@@
d146 10
a155 1
@@@@ -797,9 +813,6 @@@@
d165 205
a369 2
@@@@ -981,11 +994,11 @@@@
 	-rm -f  libkdeprint_management_la_meta_unload.cpp
a370 13
 #>+ 11
-kaddprinterwizard_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaddprinterwizard.cpp  
+kaddprinterwizard_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaddprinterwizard_main.cpp  
 	@@echo 'creating kaddprinterwizard_la.all_cpp.cpp ...'; \
 	rm -f kaddprinterwizard_la.all_cpp.files kaddprinterwizard_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> kaddprinterwizard_la.all_cpp.final; \
-	for file in kaddprinterwizard.cpp ; do \
+	for file in kaddprinterwizard_main.cpp ; do \
 	  echo "#include \"$$file\"" >> kaddprinterwizard_la.all_cpp.files; \
 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaddprinterwizard_la.all_cpp.final; \
 	done; \
@@@@ -993,6 +1006,18 @@@@
 	rm -f kaddprinterwizard_la.all_cpp.final kaddprinterwizard_la.all_cpp.files
d373 2
a374 13
+libkaddprinterwizard_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaddprinterwizard.cpp  
+	@@echo 'creating libkaddprinterwizard_main_la.all_cpp.cpp ...'; \
+	rm -f libkaddprinterwizard_main_la.all_cpp.files libkaddprinterwizard_main_la.all_cpp.final; \
+	echo "#define KDE_USE_FINAL 1" >> libkaddprinterwizard_main_la.all_cpp.final; \
+	for file in kaddprinterwizard.cpp ; do \
+	  echo "#include \"$$file\"" >> libkaddprinterwizard_main_la.all_cpp.files; \
+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkaddprinterwizard_main_la.all_cpp.final; \
+	done; \
+	cat libkaddprinterwizard_main_la.all_cpp.final libkaddprinterwizard_main_la.all_cpp.files  > libkaddprinterwizard_main_la.all_cpp.cpp; \
+	rm -f libkaddprinterwizard_main_la.all_cpp.final libkaddprinterwizard_main_la.all_cpp.files
+
+#>+ 11
 libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp libkdeprint_management_la_meta_unload.cpp   kmmainview.moc kmdriverdbwidget.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc kmlistview.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmdbcreator.moc kmpropwidget.moc kmconfigdialog.moc kmwlocal.moc kmjobviewer.moc kmspecialprinterdlg.moc kiconselectaction.moc kmwsocketutil.moc kmconfigfilter.moc kxmlcommanddlg.moc kmpropertypage.moc kxmlcommandselector.moc kmwdrivertest.moc kmwsocket.moc kmwizard.moc kmdriverdb.moc kmtimer.moc kmwizardpage.moc kmdriverdialog.moc 
d377 122
a498 23
@@@@ -1005,11 +1030,11 @@@@
 	rm -f libkdeprint_management_la.all_cpp.final libkdeprint_management_la.all_cpp.files
 
 #>+ 11
-kaddprinterwizard.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
+kaddprinterwizard.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaddprinterwizard_main.cpp  
 	@@echo 'creating kaddprinterwizard.all_cpp.cpp ...'; \
 	rm -f kaddprinterwizard.all_cpp.files kaddprinterwizard.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> kaddprinterwizard.all_cpp.final; \
-	for file in dummy.cpp ; do \
+	for file in kaddprinterwizard_main.cpp ; do \
 	  echo "#include \"$$file\"" >> kaddprinterwizard.all_cpp.files; \
 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaddprinterwizard.all_cpp.final; \
 	done; \
@@@@ -1018,7 +1043,7 @@@@
 
 #>+ 3
 clean-final:
-	-rm -f kaddprinterwizard_la.all_cpp.cpp libkdeprint_management_la.all_cpp.cpp kaddprinterwizard.all_cpp.cpp
+	-rm -f kaddprinterwizard_la.all_cpp.cpp libkaddprinterwizard_main_la.all_cpp.cpp libkdeprint_management_la.all_cpp.cpp kaddprinterwizard.all_cpp.cpp
 
 #>+ 2
 final:
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.1.1
log
@Initial import of a kdelibs3 pkg.
@
text
@@


1.1.1.1.2.1
log
@file patch-av was added on branch buildlink2 on 2002-06-23 19:06:22 +0000
@
text
@d1 183
@


1.1.1.1.2.2
log
@Merge from pkgsrc-current to buildlink2 branch.
@
text
@a0 183
$NetBSD: patch-av,v 1.1.1.1.2.1 2002/06/23 19:06:22 jlam Exp $

--- kdeprint/management/Makefile.in.orig	Tue May 21 15:42:07 2002
+++ kdeprint/management/Makefile.in
@@@@ -264,15 +264,19 @@@@
 
 INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdeprint -I$(top_builddir)/kdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes)
 
-lib_LTLIBRARIES = libkdeprint_management.la kaddprinterwizard.la
+lib_LTLIBRARIES = libkdeprint_management.la libkaddprinterwizard_main.la kaddprinterwizard.la
 bin_PROGRAMS = kaddprinterwizard
 
-kaddprinterwizard_SOURCES = dummy.cpp
-kaddprinterwizard_LDADD = kaddprinterwizard.la
+kaddprinterwizard_SOURCES = kaddprinterwizard_main.cpp
+kaddprinterwizard_LDADD = libkaddprinterwizard_main.la
 kaddprinterwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
-kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp
-kaddprinterwizard_la_LIBADD = libkdeprint_management.la
+libkaddprinterwizard_main_la_SOURCES = kaddprinterwizard.cpp
+libkaddprinterwizard_main_la_LIBADD = libkdeprint_management.la
+libkaddprinterwizard_main_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH)
+
+kaddprinterwizard_la_SOURCES = kaddprinterwizard_main.cpp
+kaddprinterwizard_la_LIBADD = libkaddprinterwizard_main.la libkdeprint_management.la
 kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
 
 libkdeprint_management_la_SOURCES = \
@@@@ -317,11 +321,18 @@@@
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(lib_LTLIBRARIES)
 
-kaddprinterwizard_la_DEPENDENCIES = libkdeprint_management.la
-am_kaddprinterwizard_la_OBJECTS = kaddprinterwizard.lo
+kaddprinterwizard_la_DEPENDENCIES = libkaddprinterwizard_main.la \
+	libkdeprint_management.la
+am_kaddprinterwizard_la_OBJECTS = kaddprinterwizard_main.lo
 #>- kaddprinterwizard_la_OBJECTS = $(am_kaddprinterwizard_la_OBJECTS)
 #>+ 1
-kaddprinterwizard_la_OBJECTS = kaddprinterwizard.lo
+kaddprinterwizard_la_OBJECTS = kaddprinterwizard_main.lo
+libkaddprinterwizard_main_la_DEPENDENCIES = libkdeprint_management.la
+am_libkaddprinterwizard_main_la_OBJECTS = kaddprinterwizard.lo
+#>- libkaddprinterwizard_main_la_OBJECTS = \
+#>- $(am_libkaddprinterwizard_main_la_OBJECTS)
+#>+ 1
+libkaddprinterwizard_main_la_OBJECTS = kaddprinterwizard.lo
 libkdeprint_management_la_DEPENDENCIES = ../libkdeprint.la
 am_libkdeprint_management_la_OBJECTS = kmdbcreator.lo kmdriverdb.lo \
 	kmdriverdbwidget.lo kmiconview.lo kminfopage.lo kmmainview.lo \
@@@@ -365,11 +376,11 @@@@
 bin_PROGRAMS = kaddprinterwizard$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
-am_kaddprinterwizard_OBJECTS = dummy.$(OBJEXT)
+am_kaddprinterwizard_OBJECTS = kaddprinterwizard_main.$(OBJEXT)
 #>- kaddprinterwizard_OBJECTS = $(am_kaddprinterwizard_OBJECTS)
 #>+ 1
-kaddprinterwizard_OBJECTS = dummy.$(OBJEXT)
-kaddprinterwizard_DEPENDENCIES = kaddprinterwizard.la
+kaddprinterwizard_OBJECTS = kaddprinterwizard_main.$(OBJEXT)
+kaddprinterwizard_DEPENDENCIES = libkaddprinterwizard_main.la
 
 DEFS = @@DEFS@@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
@@@@ -377,9 +388,10 @@@@
 LDFLAGS = @@LDFLAGS@@
 LIBS = @@LIBS@@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/dummy.Po \
-	@@AMDEP_TRUE@@	$(DEPDIR)/jobitem.Plo \
+@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/jobitem.Plo \
 	@@AMDEP_TRUE@@	$(DEPDIR)/kaddprinterwizard.Plo \
+	@@AMDEP_TRUE@@	$(DEPDIR)/kaddprinterwizard_main.Plo \
+	@@AMDEP_TRUE@@	$(DEPDIR)/kaddprinterwizard_main.Po \
 	@@AMDEP_TRUE@@	$(DEPDIR)/kiconselectaction.Plo \
 	@@AMDEP_TRUE@@	$(DEPDIR)/kmconfigcommand.Plo \
 	@@AMDEP_TRUE@@	$(DEPDIR)/kmconfigdialog.Plo \
@@@@ -437,6 +449,7 @@@@
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@@
 CXXFLAGS = @@CXXFLAGS@@
 DIST_SOURCES = $(kaddprinterwizard_la_SOURCES) \
+	$(libkaddprinterwizard_main_la_SOURCES) \
 	$(libkdeprint_management_la_SOURCES) \
 	$(kaddprinterwizard_SOURCES)
 DATA = $(dataicon_DATA)
@@@@ -445,7 +458,7 @@@@
 
 DIST_COMMON = $(kdeprint_HEADERS) $(noinst_HEADERS) Makefile.am \
 	Makefile.in
-SOURCES = $(kaddprinterwizard_la_SOURCES) $(libkdeprint_management_la_SOURCES) $(kaddprinterwizard_SOURCES)
+SOURCES = $(kaddprinterwizard_la_SOURCES) $(libkaddprinterwizard_main_la_SOURCES) $(libkdeprint_management_la_SOURCES) $(kaddprinterwizard_SOURCES)
 
 #>- all: all-am
 #>+ 1
@@@@ -494,6 +507,8 @@@@
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 kaddprinterwizard.la: $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_DEPENDENCIES) 
 	$(CXXLINK) -rpath $(libdir) $(kaddprinterwizard_la_LDFLAGS) $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_LIBADD) $(LIBS)
+libkaddprinterwizard_main.la: $(libkaddprinterwizard_main_la_OBJECTS) $(libkaddprinterwizard_main_la_DEPENDENCIES) 
+	$(CXXLINK) -rpath $(libdir) $(libkaddprinterwizard_main_la_LDFLAGS) $(libkaddprinterwizard_main_la_OBJECTS) $(libkaddprinterwizard_main_la_LIBADD) $(LIBS)
 #>- libkdeprint_management.la: $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) 
 #>+ 2
 @@KDE_USE_CLOSURE_TRUE@@libkdeprint_management.la: libkdeprint_management.la.closure $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) 
@@@@ -534,9 +549,10 @@@@
 	-rm -f *.tab.c
 
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/cjanuswidget.Plo@@am__quote@@
-@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/jobitem.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kaddprinterwizard.Plo@@am__quote@@
+@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kaddprinterwizard_main.Plo@@am__quote@@
+@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kaddprinterwizard_main.Po@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kiconselectaction.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmconfigcommand.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kmconfigdialog.Plo@@am__quote@@
@@@@ -797,9 +813,6 @@@@
 	uninstall-dataiconDATA uninstall-info-am \
 	uninstall-kdeprintHEADERS uninstall-libLTLIBRARIES
 
-
-dummy.cpp:
-	echo > dummy.cpp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
@@@@ -981,11 +994,11 @@@@
 	-rm -f  libkdeprint_management_la_meta_unload.cpp
 
 #>+ 11
-kaddprinterwizard_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaddprinterwizard.cpp  
+kaddprinterwizard_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaddprinterwizard_main.cpp  
 	@@echo 'creating kaddprinterwizard_la.all_cpp.cpp ...'; \
 	rm -f kaddprinterwizard_la.all_cpp.files kaddprinterwizard_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> kaddprinterwizard_la.all_cpp.final; \
-	for file in kaddprinterwizard.cpp ; do \
+	for file in kaddprinterwizard_main.cpp ; do \
 	  echo "#include \"$$file\"" >> kaddprinterwizard_la.all_cpp.files; \
 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaddprinterwizard_la.all_cpp.final; \
 	done; \
@@@@ -993,6 +1006,18 @@@@
 	rm -f kaddprinterwizard_la.all_cpp.final kaddprinterwizard_la.all_cpp.files
 
 #>+ 11
+libkaddprinterwizard_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaddprinterwizard.cpp  
+	@@echo 'creating libkaddprinterwizard_main_la.all_cpp.cpp ...'; \
+	rm -f libkaddprinterwizard_main_la.all_cpp.files libkaddprinterwizard_main_la.all_cpp.final; \
+	echo "#define KDE_USE_FINAL 1" >> libkaddprinterwizard_main_la.all_cpp.final; \
+	for file in kaddprinterwizard.cpp ; do \
+	  echo "#include \"$$file\"" >> libkaddprinterwizard_main_la.all_cpp.files; \
+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkaddprinterwizard_main_la.all_cpp.final; \
+	done; \
+	cat libkaddprinterwizard_main_la.all_cpp.final libkaddprinterwizard_main_la.all_cpp.files  > libkaddprinterwizard_main_la.all_cpp.cpp; \
+	rm -f libkaddprinterwizard_main_la.all_cpp.final libkaddprinterwizard_main_la.all_cpp.files
+
+#>+ 11
 libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp libkdeprint_management_la_meta_unload.cpp   kmmainview.moc kmdriverdbwidget.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc kmlistview.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmdbcreator.moc kmpropwidget.moc kmconfigdialog.moc kmwlocal.moc kmjobviewer.moc kmspecialprinterdlg.moc kiconselectaction.moc kmwsocketutil.moc kmconfigfilter.moc kxmlcommanddlg.moc kmpropertypage.moc kxmlcommandselector.moc kmwdrivertest.moc kmwsocket.moc kmwizard.moc kmdriverdb.moc kmtimer.moc kmwizardpage.moc kmdriverdialog.moc 
 	@@echo 'creating libkdeprint_management_la.all_cpp.cpp ...'; \
 	rm -f libkdeprint_management_la.all_cpp.files libkdeprint_management_la.all_cpp.final; \
@@@@ -1005,11 +1030,11 @@@@
 	rm -f libkdeprint_management_la.all_cpp.final libkdeprint_management_la.all_cpp.files
 
 #>+ 11
-kaddprinterwizard.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
+kaddprinterwizard.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaddprinterwizard_main.cpp  
 	@@echo 'creating kaddprinterwizard.all_cpp.cpp ...'; \
 	rm -f kaddprinterwizard.all_cpp.files kaddprinterwizard.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> kaddprinterwizard.all_cpp.final; \
-	for file in dummy.cpp ; do \
+	for file in kaddprinterwizard_main.cpp ; do \
 	  echo "#include \"$$file\"" >> kaddprinterwizard.all_cpp.files; \
 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaddprinterwizard.all_cpp.final; \
 	done; \
@@@@ -1018,7 +1043,7 @@@@
 
 #>+ 3
 clean-final:
-	-rm -f kaddprinterwizard_la.all_cpp.cpp libkdeprint_management_la.all_cpp.cpp kaddprinterwizard.all_cpp.cpp
+	-rm -f kaddprinterwizard_la.all_cpp.cpp libkaddprinterwizard_main_la.all_cpp.cpp libkdeprint_management_la.all_cpp.cpp kaddprinterwizard.all_cpp.cpp
 
 #>+ 2
 final:
@