← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_19_install_flash.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_19_install_flash.diff
1
 
Index: kdebase-4.5.80/konqueror/src/konqmainwindow.cpp
2
 
===================================================================
3
 
--- kdebase-4.5.80.orig/konqueror/src/konqmainwindow.cpp        2010-11-11 14:40:39.000000000 +0000
4
 
+++ kdebase-4.5.80/konqueror/src/konqmainwindow.cpp     2010-11-25 16:16:48.911492704 +0000
5
 
@@ -189,6 +189,17 @@
6
 
     , m_configureDialog(0)
7
 
     , m_pURLCompletion(0)
8
 
 {
9
 
+  //Added by Kubuntu for update-notifier-kde to prompt for restricted codec install
10
 
+  QDBusMessage m = QDBusMessage::createMethodCall(QLatin1String("org.kubuntu.restrictedInstall"),
11
 
+                                                  QLatin1String("/org/kubuntu/restrictedInstall"),
12
 
+             QLatin1String("org.kubuntu.restrictedInstall"),
13
 
+             QLatin1String("installRestricted"));
14
 
+  QList<QVariant> dbusargs;
15
 
+  dbusargs.append(KonqFactory::aboutData()->programName());
16
 
+  dbusargs.append(QLatin1String("flashplugin-installer"));
17
 
+  m.setArguments(dbusargs);
18
 
+  bool queued = QDBusConnection::sessionBus().send(m);
19
 
+
20
 
   incInstancesCount();
21
 
   setPreloadedFlag( false );
22