summaryrefslogtreecommitdiffstats
path: root/opensuse/tdelibs/ignore-inline-menu.diff
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-08-13 12:21:22 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-08-13 12:21:22 -0500
commitf65bcb8326e06816d7dc49e58bda120182dbbcd6 (patch)
tree4e7fef001fc523929450778d10c86b41e6e32eda /opensuse/tdelibs/ignore-inline-menu.diff
parent131df957b41b4683571b1e36e6fed9d614d32356 (diff)
parentfa41f32b69994ecd75b7359fa2df08ea5a3480ab (diff)
downloadtde-packaging-f65bcb8326e06816d7dc49e58bda120182dbbcd6.tar.gz
tde-packaging-f65bcb8326e06816d7dc49e58bda120182dbbcd6.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'opensuse/tdelibs/ignore-inline-menu.diff')
-rw-r--r--opensuse/tdelibs/ignore-inline-menu.diff18
1 files changed, 18 insertions, 0 deletions
diff --git a/opensuse/tdelibs/ignore-inline-menu.diff b/opensuse/tdelibs/ignore-inline-menu.diff
new file mode 100644
index 000000000..106bc5284
--- /dev/null
+++ b/opensuse/tdelibs/ignore-inline-menu.diff
@@ -0,0 +1,18 @@
+--- kded/vfolder_menu.cpp 2009/11/07 07:01:12 1.1
++++ kded/vfolder_menu.cpp 2009/11/07 07:01:42
+@@ -1496,6 +1496,7 @@
+ else
+ kdDebug()<<" Error in parsing show_empty attribute :"<<str<<endl;
+ }
++#if 0
+ if ( e.hasAttribute( "inline" ) )
+ {
+ QString str = e.attribute( "inline" );
+@@ -1534,6 +1535,7 @@
+ else
+ kdDebug()<<" Error in parsing inline_alias attribute :"<<str<<endl;
+ }
++#endif
+ if( !option.isEmpty())
+ {
+ option = option.prepend(":O");