Attachment 159597 Details for Bug 248899 – the missing patch

[patch] the missing patch

kdelibs-3.5.7-kde3compat.patch (text/plain), 3.13 KB, created by Than Ngo on 2007-07-19 17:17:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Than Ngo

Created: 2007-07-19 17:17:33 UTC

Size: 3.13 KB

patch

obsolete

>--- kdelibs-3.5.7/kdeui/kmainwindow.cpp.orig	2007-07-04 13:01:14.000000000 +0200
>+++ kdelibs-3.5.7/kdeui/kmainwindow.cpp	2007-07-04 13:02:18.000000000 +0200
>@@ -515,7 +515,7 @@ void KMainWindow::createGUI( const QStri
>     }
> 
>     // we always want to load in our global standards file
>-    setXMLFile( locate( "config", "ui/ui_standards.rc", instance() ) );
>+    setXMLFile( locate( "config", "ui/ui_standards3.rc", instance() ) );
> 
>     // now, merge in our local xml file.  if this is null, then that
>     // means that we will be only using the global file
>--- kdelibs-3.5.7/kdeui/Makefile.am.orig	2007-07-04 13:03:02.000000000 +0200
>+++ kdelibs-3.5.7/kdeui/Makefile.am	2007-07-04 13:03:32.000000000 +0200
>@@ -140,7 +140,7 @@ libkdeui_la_NMCHECKWEAK = $(srcdir)/libk
> 	$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck
> 
> rcdir = $(kde_confdir)/ui
>-rc_DATA = ui_standards.rc
>+rc_DATA = ui_standards3.rc
> 
> EXTRA_DIST = CHANGES.kdatepicker USERS.kdatepicker kpixmapio-perf.png dcolorreset.xpm kpartgui.dtd dcolorarrow.xbm colors Mainpage.dox
> 
>--- kdelibs-3.5.7/kdeui/kedittoolbar.cpp.orig	2007-07-04 13:04:05.000000000 +0200
>+++ kdelibs-3.5.7/kdeui/kedittoolbar.cpp	2007-07-04 13:04:28.000000000 +0200
>@@ -601,7 +601,7 @@ void KEditToolbarWidget::initNonKPart(KA
> 
>   // handle the merging
>   if (global)
>-    setXMLFile(locate("config", "ui/ui_standards.rc"));
>+    setXMLFile(locate("config", "ui/ui_standards3.rc"));
>   QString localXML = d->loadXMLFile(file);
>   setXML(localXML, true);
> 
>@@ -740,7 +740,7 @@ void KEditToolbarWidget::rebuildKXMLGUIC
> 
>         // for the shell, merge in ui_standards.rc
>         if ( client == firstClient ) // same assumption as in the ctor: first==shell
>-            client->setXMLFile(locate("config", "ui/ui_standards.rc"));
>+            client->setXMLFile(locate("config", "ui/ui_standards3.rc"));
> 
>         // and this forces it to use the *new* XML file
>         client->setXMLFile( file, client == firstClient /* merge if shell */ );
>--- kdelibs-3.5.7/kparts/dockmainwindow.cpp.orig	2007-07-04 13:04:54.000000000 +0200
>+++ kdelibs-3.5.7/kparts/dockmainwindow.cpp	2007-07-04 13:05:05.000000000 +0200
>@@ -138,7 +138,7 @@ void DockMainWindow::createShellGUI( boo
>             d->m_helpMenu = new KHelpMenu( this, instance()->aboutData(), true, actionCollection() );
> 
>         QString f = xmlFile();
>-        setXMLFile( locate( "config", "ui/ui_standards.rc", instance() ) );
>+        setXMLFile( locate( "config", "ui/ui_standards3.rc", instance() ) );
>         if ( !f.isEmpty() )
>             setXMLFile( f, true );
>         else
>--- kdelibs-3.5.7/kparts/mainwindow.cpp.orig	2007-07-04 13:05:13.000000000 +0200
>+++ kdelibs-3.5.7/kparts/mainwindow.cpp	2007-07-04 13:05:22.000000000 +0200
>@@ -158,7 +158,7 @@ void MainWindow::createShellGUI( bool cr
>             d->m_helpMenu = new KHelpMenu( this, instance()->aboutData(), true, actionCollection() );
> 
>         QString f = xmlFile();
>-        setXMLFile( locate( "config", "ui/ui_standards.rc", instance() ) );
>+        setXMLFile( locate( "config", "ui/ui_standards3.rc", instance() ) );
>         if ( !f.isEmpty() )
>             setXMLFile( f, true );
>         else

Actions: View | Diff

Attachments on bug 248899: 159597