rpms/kdenetwork/F-9 kdenetwork-4.0.4-kopete-save-crash.patch, NONE, 1.1 kdenetwork.spec, 1.142, 1.143
Than Ngo (than)
fedora-extras-commits at redhat.com
Fri May 23 12:21:21 UTC 2008
- Previous message (by thread): rpms/ypbind/F-9 ypbind.init,1.19,1.20 ypbind.spec,1.47,1.48
- Next message (by thread): rpms/banshee/devel .cvsignore, 1.16, 1.17 banshee.spec, 1.47, 1.48 sources, 1.16, 1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: than
Update of /cvs/extras/rpms/kdenetwork/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32506
Modified Files:
kdenetwork.spec
Added Files:
kdenetwork-4.0.4-kopete-save-crash.patch
Log Message:
Do not crash if no view plugin can be loaded, kde#161078
kdenetwork-4.0.4-kopete-save-crash.patch:
--- NEW FILE kdenetwork-4.0.4-kopete-save-crash.patch ---
--- kdenetwork/kopete/kopete/config/behavior/behaviorconfig.cpp (Revision 811501)
+++ kdenetwork/kopete/kopete/config/behavior/behaviorconfig.cpp (Revision 811502)
@@ -100,7 +100,10 @@
Kopete::BehaviorSettings::self()->setAutoAwayTimeout( mPrfsAway->mAutoAwayTimeout->value() * 60 );
// "Chat" TAB ===============================================================
- Kopete::BehaviorSettings::self()->setViewPlugin(viewPlugins[mPrfsChat->viewPlugin->currentIndex()].pluginName() );
+ if ( viewPlugins.size() > 0 )
+ {
+ Kopete::BehaviorSettings::self()->setViewPlugin(viewPlugins[mPrfsChat->viewPlugin->currentIndex()].pluginName() );
+ }
Kopete::BehaviorSettings::self()->writeConfig();
--- kdenetwork/kopete/kopete/chatwindow/chatwindow.desktop (Revision 811501)
+++ kdenetwork/kopete/kopete/chatwindow/chatwindow.desktop (Revision 811502)
@@ -9,29 +9,6 @@
X-KDE-PluginInfo-Version=0.8.0
X-KDE-PluginInfo-Website=http://kopete.kde.org
X-KDE-PluginInfo-Category=Views
-X-KDE-PluginInfo-Category[ca]=Vistes
-X-KDE-PluginInfo-Category[cs]=Pohledy
-X-KDE-PluginInfo-Category[de]=Ansichten
-X-KDE-PluginInfo-Category[el]=Î ÏοβολÎÏ
-X-KDE-PluginInfo-Category[es]=Vistas
-X-KDE-PluginInfo-Category[et]=Vaated
-X-KDE-PluginInfo-Category[fi]=Näytä
-X-KDE-PluginInfo-Category[fr]=Vues
-X-KDE-PluginInfo-Category[gl]=Vistas
-X-KDE-PluginInfo-Category[it]=Viste
-X-KDE-PluginInfo-Category[ja]=ãã¥ã¼
-X-KDE-PluginInfo-Category[km]=áá¾á
-X-KDE-PluginInfo-Category[nds]=Ansichten
-X-KDE-PluginInfo-Category[nl]=Weergaven
-X-KDE-PluginInfo-Category[oc]=Visualizacions
-X-KDE-PluginInfo-Category[pl]=Widoki
-X-KDE-PluginInfo-Category[pt]=Janelas
-X-KDE-PluginInfo-Category[pt_BR]=Janelas
-X-KDE-PluginInfo-Category[sv]=Vyer
-X-KDE-PluginInfo-Category[tr]=Görünümler
-X-KDE-PluginInfo-Category[x-test]=xxViewsxx
-X-KDE-PluginInfo-Category[zh_CN]=æ¥ç
-X-KDE-PluginInfo-Category[zh_TW]=檢è¦
X-KDE-PluginInfo-Depends=
X-KDE-PluginInfo-License=GPL
X-KDE-PluginInfo-EnabledByDefault=true
--- kdenetwork/kopete/kopete/chatwindow/emailwindow.desktop (Revision 811501)
+++ kdenetwork/kopete/kopete/chatwindow/emailwindow.desktop (Revision 811502)
@@ -9,29 +9,6 @@
X-KDE-PluginInfo-Version=0.8.0
X-KDE-PluginInfo-Website=http://kopete.kde.org
X-KDE-PluginInfo-Category=Views
-X-KDE-PluginInfo-Category[ca]=Vistes
-X-KDE-PluginInfo-Category[cs]=Pohledy
-X-KDE-PluginInfo-Category[de]=Ansichten
-X-KDE-PluginInfo-Category[el]=Î ÏοβολÎÏ
-X-KDE-PluginInfo-Category[es]=Vistas
-X-KDE-PluginInfo-Category[et]=Vaated
-X-KDE-PluginInfo-Category[fi]=Näytä
-X-KDE-PluginInfo-Category[fr]=Vues
-X-KDE-PluginInfo-Category[gl]=Vistas
-X-KDE-PluginInfo-Category[it]=Viste
-X-KDE-PluginInfo-Category[ja]=ãã¥ã¼
-X-KDE-PluginInfo-Category[km]=áá¾á
-X-KDE-PluginInfo-Category[nds]=Ansichten
-X-KDE-PluginInfo-Category[nl]=Weergaven
-X-KDE-PluginInfo-Category[oc]=Visualizacions
-X-KDE-PluginInfo-Category[pl]=Widoki
-X-KDE-PluginInfo-Category[pt]=Janelas
-X-KDE-PluginInfo-Category[pt_BR]=Janelas
-X-KDE-PluginInfo-Category[sv]=Vyer
-X-KDE-PluginInfo-Category[tr]=Görünümler
-X-KDE-PluginInfo-Category[x-test]=xxViewsxx
-X-KDE-PluginInfo-Category[zh_CN]=æ¥ç
-X-KDE-PluginInfo-Category[zh_TW]=檢è¦
X-KDE-PluginInfo-Depends=
X-KDE-PluginInfo-License=GPL
X-KDE-PluginInfo-EnabledByDefault=true
Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-9/kdenetwork.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- kdenetwork.spec 8 May 2008 13:34:48 -0000 1.142
+++ kdenetwork.spec 23 May 2008 12:20:32 -0000 1.143
@@ -6,14 +6,17 @@
Name: kdenetwork
Epoch: 7
Version: 4.0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.kde.org
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: kdenetwork-4.0.4-kopete-chatwindow-crash.patch
+
+# upstream patches
+Patch100: kdenetwork-4.0.4-kopete-chatwindow-crash.patch
+Patch101: kdenetwork-4.0.4-kopete-save-crash.patch
BuildRequires: avahi-compat-libdns_sd-devel
BuildRequires: boost-devel
@@ -84,7 +87,8 @@
%prep
%setup -q
-%patch0 -p1 -b .kopete-chatwindow-crash
+%patch100 -p1 -b .kopete-chatwindow-crash
+%patch101 -p1 -b .kopete-save-crash
%build
mkdir -p %{_target_platform}
@@ -160,6 +164,9 @@
%changelog
+* Fri May 23 2008 Than Ngo <than at redhat.com> - 4.0.4-3
+- Do not crash if no view plugin can be loaded, kde#161078
+
* Thu May 8 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.0.4-2
- #kdebug:161769: kopete causes a sigserv when closing chat window
- Previous message (by thread): rpms/ypbind/F-9 ypbind.init,1.19,1.20 ypbind.spec,1.47,1.48
- Next message (by thread): rpms/banshee/devel .cvsignore, 1.16, 1.17 banshee.spec, 1.47, 1.48 sources, 1.16, 1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list