← Back to branch summary

~ubuntu-branches/ubuntu/quantal/kde-baseapps/quantal

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_folderview_livecd_directory.diff

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-05-25 17:26:17 UTC
  • mfrom: (1.1.12)
  • Revision ID: package-import@ubuntu.com-20120525172617-xr9bzhlugldbflvq
Tags: 4:4.8.80a-0ubuntu1
* Merge with debian git, remainging changes:
  - keep breaks/replaces
  - keep symbol files
  - keep kubuntu patches
  - dolphin suggests and not recommends ruby
  - add kfind, konsole and kompare to dolphin suggests
* konq-plugins breaks/replaces kde-baseapps-data << 4:4.8.80

* Drop squence numbers from kubuntu patches 

* New upstream beta release
  - refresh kubuntu_fix_systemsettings_about_me.diff
  - add new doc images to {konqueror,dolphin}.install

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_folderview_livecd_directory.diff
 
1
Index: kde-baseapps-4.7.97/plasma/applets/folderview/folderview.cpp
 
2
===================================================================
 
3
--- kde-baseapps-4.7.97.orig/plasma/applets/folderview/folderview.cpp   2012-01-02 19:51:26.000000000 +0000
 
4
+++ kde-baseapps-4.7.97/plasma/applets/folderview/folderview.cpp        2012-01-04 14:56:18.000000000 +0000
 
5
@@ -27,6 +27,7 @@
 
6
 #include <QGraphicsSceneDragDropEvent>
 
7
 #include <QImageReader>
 
8
 #include <QItemSelectionModel>
 
9
+#include <QFile>
 
10
 
 
11
 #include <KAction>
 
12
 #include <KAuthorized>
 
13
@@ -400,6 +401,10 @@
 
14
                 path = QString("desktop:/");
 
15
             }
 
16
         }
 
17
+
 
18
+        if (QFile::exists("/usr/share/applications/kde4/oem-config-prepare-kde.desktop") || QFile::exists("/usr/share/applications/kde4/ubiquity-kdeui.desktop")) {
 
19
+            path = QString("desktop:/");
 
20
+        }
 
21
         setUrl(cg.readEntry("url", KUrl(path)));
 
22
     }
 
23