diff options
| author | Robert Xu <[email protected]> | 2012-02-01 00:31:59 -0500 |
|---|---|---|
| committer | Robert Xu <[email protected]> | 2012-02-01 00:31:59 -0500 |
| commit | f599f39717d771b8b7a2aff006cda6c31e8b12da (patch) | |
| tree | f601e3c0303a193cda6f8c6f956619dda9673c70 /opensuse/core/tdelibs/ignore-inline-menu.diff | |
| parent | ead369ac94473139a2320a1c90cda64dd887b94a (diff) | |
| parent | 27c9e783c6283f8916ebee3a23c6d1ba909a5126 (diff) | |
| download | tde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.tar.gz tde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.zip | |
Merge branch 'suse'
Diffstat (limited to 'opensuse/core/tdelibs/ignore-inline-menu.diff')
| -rw-r--r-- | opensuse/core/tdelibs/ignore-inline-menu.diff | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/opensuse/core/tdelibs/ignore-inline-menu.diff b/opensuse/core/tdelibs/ignore-inline-menu.diff new file mode 100644 index 000000000..106bc5284 --- /dev/null +++ b/opensuse/core/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"); |