Hello community,
here is the log from the commit of package kdeaddons3
checked in at Thu Mar 13 21:45:50 CET 2008.
--------
--- KDE/kdeaddons3/kdeaddons3.changes 2008-02-13 23:29:32.000000000 +0100
+++ kdeaddons3/kdeaddons3.changes 2008-03-13 11:13:28.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Mar 13 11:12:51 CET 2008 - dmueller@suse.de
+
+- update 3_5_BRANCH diff:
+ * fix crash in kate tabbar extension (bko#157834)
+
+-------------------------------------------------------------------
New:
----
3_5_BRANCH.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeaddons3.spec ++++++
--- /var/tmp/diff_new_pack.r32634/_old 2008-03-13 21:45:43.000000000 +0100
+++ /var/tmp/diff_new_pack.r32634/_new 2008-03-13 21:45:43.000000000 +0100
@@ -18,11 +18,11 @@
Summary: Additional Modules for Kate, Kicker, Konqueror, and Noatun
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Version: 3.5.9
-Release: 1
+Release: 2
Url: http://www.kde.org
Requires: kdelibs3 >= %(rpm -q --queryformat '%{VERSION}' kdelibs3)
Source: kdeaddons-%{version}.tar.bz2
-#Patch0: 3_5_BRANCH.diff
+Patch0: 3_5_BRANCH.diff
Patch1: disable-lnk.diff
Patch2: fix-kimgalleryplugin-output.diff
Patch3: google-suggest.diff
@@ -157,7 +157,7 @@
%prep
%setup -q -n kdeaddons-%{version}
-#%patch0
+%patch0
%patch1
%patch2
%patch3
@@ -352,6 +352,9 @@
%doc /opt/kde3/share/doc/HTML/en/ksig
%changelog
+* Thu Mar 13 2008 dmueller@suse.de
+- update 3_5_BRANCH diff:
+ * fix crash in kate tabbar extension (bko#157834)
* Thu Feb 14 2008 dmueller@suse.de
- update to 3.5.9:
* bugfixes, translation update
++++++ 3_5_BRANCH.diff ++++++
package: kdeaddons-3.5.9.tar.bz2
kdemod: kdeaddons
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD: 784700
+svn di between //tags/KDE/3.5.9/kdeaddons and //branches/KDE/3.5/kdeaddons
--- kate/tabbarextension/plugin_katetabbarextension.h
+++ kate/tabbarextension/plugin_katetabbarextension.h
@@ -41,7 +41,7 @@
#include
#include
-#include
+#include
class QBoxLayout;
class QCheckBox;
@@ -55,7 +55,7 @@
public:
MyPtrList() { QPtrList<KateTabBarButton>::QPtrList(); }
- virtual int compareItems ( QPtrCollection::Item item1_, QPtrCollection::Item item2_ );
+ virtual int compareItems ( QPtrCollection::Item item1_, QPtrCollection::Item item2_ );
};
class KatePluginFactory : public KLibFactory
@@ -80,7 +80,7 @@
class KateTabBarButton: public QPushButton
{
Q_OBJECT
-
+
public:
/**
* constructor
@@ -91,7 +91,7 @@
*/
KateTabBarButton(Kate::ViewManager* pViewManager, Kate::Document *pDoc,
QWidget* parent = 0, const char * name = 0);
-
+
/**
* standard destructor (emtpy)
*/
@@ -113,7 +113,7 @@
* (usually red or black)
*/
void triggerModified();
-
+
/**
* dirty flag indicates whether the file was modified on disk
* @param d if true, a small warning icon appears
@@ -153,7 +153,7 @@
class KateTabBarExtension : public QWidget
{
Q_OBJECT
-
+
public:
/**
* constructor
@@ -231,7 +231,7 @@
* @param doc the document
*/
void slotNameChanged (Kate::Document *doc);
-
+
/**
* called when the active view changes
*/
@@ -316,10 +316,7 @@
private:
QPtrList<class PluginView> m_views;
-
- /** the tabbar shown in the tool bar */
- KateTabBarExtension* m_tabbar;
KConfig* pConfig;
};
-
+
#endif // _PLUGIN_TABBAREXTENSION_H_
--- kate/tabbarextension/plugin_katetabbarextension.cpp
+++ kate/tabbarextension/plugin_katetabbarextension.cpp
@@ -50,6 +50,7 @@
public:
Kate::MainWindow *win;
+ KateTabBarExtension* tabbar;
};
extern "C"
@@ -83,7 +84,6 @@
KatePluginTabBarExtension::KatePluginTabBarExtension(
QObject* parent, const char* name )
: Kate::Plugin ( (Kate::Application*)parent, name ),
- m_tabbar (0),
pConfig(new KConfig("katetabbarextensionpluginrc"))
{
pConfig->setGroup("global");
@@ -91,18 +91,12 @@
KatePluginTabBarExtension::~KatePluginTabBarExtension()
{
- if (m_tabbar)
+ while (m_views.count() > 0)
{
- pConfig->writeEntry("horizontal orientation",
- m_tabbar->orientation()==Qt::Horizontal?true:false);
- pConfig->writeEntry("sort", m_tabbar->sortByName());
- pConfig->sync();
+ removeView(m_views.at(0)->win);
}
delete pConfig;
-
-// very important: delete tabbar! The tabbar itself deletes all tabbarButtons
- delete m_tabbar;
}
void KatePluginTabBarExtension::addView(Kate::MainWindow *win)
@@ -112,10 +106,10 @@
bool bHoriz = pConfig->readBoolEntry("horizontal orientation", true);
bool sort = pConfig->readBoolEntry("sort", true);
- m_tabbar = new KateTabBarExtension( application()->documentManager(),
+ view->tabbar = new KateTabBarExtension( application()->documentManager(),
win, bHoriz, sort, 0, "tabs_hbox");
- new KWidgetAction(m_tabbar, "tab_bar_widget",
+ new KWidgetAction(view->tabbar, "tab_bar_widget",
KShortcut::null(), 0, 0, view->actionCollection(), "tabbar_widget");
view->setInstance (new KInstance("kate"));
@@ -129,7 +123,7 @@
(win->guiFactory()->container("tabbarExtensionToolBar", view));
if (toolbar) {
connect(toolbar, SIGNAL( orientationChanged(Orientation) ),
- m_tabbar, SLOT( slotMoved(Orientation) ));
+ view->tabbar, SLOT( slotMoved(Orientation) ));
}
}
@@ -139,8 +133,19 @@
if (m_views.at(z)->win == win)
{
PluginView *view = m_views.at(z);
+
+ // the last tabbar, save options
+ if (m_views.count() == 1)
+ {
+ pConfig->writeEntry("horizontal orientation",
+ view->tabbar->orientation()==Qt::Horizontal?true:false);
+ pConfig->writeEntry("sort", view->tabbar->sortByName());
+ pConfig->sync();
+ }
+
m_views.remove (view);
win->guiFactory()->removeClient (view);
+ delete view->tabbar;
delete view;
}
}
@@ -158,12 +163,12 @@
void KatePluginTabBarExtension::initConfigPage( KateTabBarExtensionConfigPage* p )
{
- p->pSortAlpha->setChecked(m_tabbar->sortByName());
+ p->pSortAlpha->setChecked(m_views.at(0)->tabbar->sortByName());
}
void KatePluginTabBarExtension::applyConfig( KateTabBarExtensionConfigPage* p )
{
- m_tabbar->setSortByName(p->pSortAlpha->isChecked());
+ m_views.at(0)->tabbar->setSortByName(p->pSortAlpha->isChecked());
// sync m_config in destructor
}
// END KatePluginTabBarExtension
Property changes on: .
___________________________________________________________________
Deleted: svn:mergeinfo
Added: svn:externals
+ admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org