Hello community,

here is the log from the commit of package kdebase4 for openSUSE:11.4
checked in at Wed Oct 19 21:27:22 CEST 2011.



--------
--- old-versions/11.4/UPDATES/all/kdebase4/kdebase4.changes     2011-09-30 
04:19:54.000000000 +0200
+++ 11.4/kdebase4/kdebase4.changes      2011-10-17 08:40:02.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Oct 17 06:37:23 UTC 2011 - [email protected]
+
+- Add dolphin-fix-cannot-create-subfolder.diff (bnc#677973)
+  + Re-diff upstream patch which fixed for bko#265714
+
+-------------------------------------------------------------------

calling whatdependson for 11.4-i586


New:
----
  dolphin-fix-cannot-create-subfolder.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.MD5pFP/_old  2011-10-19 21:26:02.000000000 +0200
+++ /var/tmp/diff_new_pack.MD5pFP/_new  2011-10-19 21:26:02.000000000 +0200
@@ -19,7 +19,7 @@
 
 Name:           kdebase4
 Version:        4.6.0
-Release:        6.<RELEASE8>
+Release:        6.<RELEASE10>
 License:        GPLv2+
 Summary:        The Base KDE Apps
 Url:            http://www.kde.org/
@@ -64,6 +64,8 @@
 Patch11:        changeset_re52b6b0ac0292abdf654e4fb408fd501542c02fa.diff
 # PATCH-FIX-UPSTREAM 
dolphin-donot-show-pointing-hand-cursor-when-double-click-enabled.diff 
[bnc#701517]
 Patch12:        
dolphin-donot-show-pointing-hand-cursor-when-double-click-enabled.diff
+# PATCH-FIX-UPSTREAM dolphin-fix-cannot-create-subfolder.diff [bnc#677973]
+Patch13:        dolphin-fix-cannot-create-subfolder.diff
 Suggests:       dolphin
 Suggests:       kdebase4-libkonq
 Suggests:       kdebase4-nsplugin
@@ -90,6 +92,7 @@
 %patch7
 ###KDE44: rediff?
 #%patch8
+%patch13 -p1
 pushd apps
 %patch9 -p1
 %patch12 -p1
@@ -423,6 +426,7 @@
 
 %package -n kinfocenter
 
+
 License:        GPLv2+
 Summary:        KDE Information Center
 Group:          Productivity/File utilities

++++++ dolphin-fix-cannot-create-subfolder.diff ++++++
--- a/apps/dolphin/src/dolphincontextmenu.cpp
+++ b/apps/dolphin/src/dolphincontextmenu.cpp
@@ -239,12 +239,14 @@ void DolphinContextMenu::openItemContext
     if (m_selectedItems.count() == 1) {
         if (m_fileInfo.isDir()) {
             // setup 'Create New' menu
-            DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_popup, 
m_mainWindow);
+            DolphinNewFileMenu* newFileMenu = new 
DolphinNewFileMenu(m_mainWindow);
             const DolphinView* view = 
m_mainWindow->activeViewContainer()->view();
             newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
             newFileMenu->checkUpToDate();
             newFileMenu->setPopupFiles(m_fileInfo.url());
             
newFileMenu->setEnabled(selectedItemsProperties().supportsWriting());
+            connect(newFileMenu, SIGNAL(fileCreated(KUrl)), newFileMenu, 
SLOT(deleteLater()));
+            connect(newFileMenu, SIGNAL(directoryCreated(KUrl)), newFileMenu, 
SLOT(deleteLater()));
 
             KMenu* menu = newFileMenu->menu();
             menu->setTitle(i18nc("@title:menu Create new folder, file, link, 
etc.", "Create New"));
--- a/apps/dolphin/src/dolphinmainwindow.cpp
+++ b/apps/dolphin/src/dolphinmainwindow.cpp
@@ -1408,7 +1408,7 @@ void DolphinMainWindow::setActiveViewCon
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu
-    m_newFileMenu = new DolphinNewFileMenu(this, this);
+    m_newFileMenu = new DolphinNewFileMenu(this);
     KMenu* menu = m_newFileMenu->menu();
     menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", 
"Create New"));
     menu->setIcon(KIcon("document-new"));
--- a/apps/dolphin/src/dolphinnewfilemenu.cpp
+++ b/apps/dolphin/src/dolphinnewfilemenu.cpp
@@ -29,9 +29,9 @@
 #include <kactioncollection.h>
 #include <kio/job.h>
 
-DolphinNewFileMenu::DolphinNewFileMenu(QWidget* parent, DolphinMainWindow* 
mainWin) :
-    KNewFileMenu(mainWin->actionCollection(), "create_new", parent),
-    m_mainWin(mainWin)
+DolphinNewFileMenu::DolphinNewFileMenu(DolphinMainWindow* parent) :
+    KNewFileMenu(parent->actionCollection(), "create_new", parent),
+    m_mainWin(parent)
 {
     DolphinNewFileMenuObserver::instance().attach(this);
 }
--- a/apps/dolphin/src/dolphinnewfilemenu.h
+++ b/apps/dolphin/src/dolphinnewfilemenu.h
@@ -39,7 +39,7 @@ class DolphinNewFileMenu : public KNewFi
     Q_OBJECT
 
 public:
-    DolphinNewFileMenu(QWidget* parent, DolphinMainWindow* mainWin);
+    DolphinNewFileMenu(DolphinMainWindow* parent);
     virtual ~DolphinNewFileMenu();
 
 protected slots:






continue with "q"...



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to