rpms/jabbim/devel jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff, NONE, 1.1 jabbim.spec, 1.35, 1.36

[Michal Schmidt]

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2461

Modified Files:
	jabbim.spec 
Added Files:
	jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff 
Log Message:
* Thu Sep 17 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.10.svn20090907
- Fix a harmless traceback which abrt points out all the time.
  (jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff, upstream)


jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff:
 chatwindow.py |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

--- NEW FILE jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff ---
commit ba5008f5ea13306e905ca539affc42b1c14f827d
Author: michich <michich at 4aba8365-6129-0410-a408-ea17bd48e33e>
Date:   Thu Sep 17 09:40:25 2009 +0000

    avoid a traceback when closing chatwindow with multiple open tabs
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=522973
    The traceback is harmless, but shows up in abrt all the time.
    
    git-svn-id: svn://dev.jabbim.cz/jabbim/trunk@4227 4aba8365-6129-0410-a408-ea17bd48e33e

diff --git a/widgets/chatwindow.py b/widgets/chatwindow.py
index 95674de..5cef315 100644
--- a/widgets/chatwindow.py
+++ b/widgets/chatwindow.py
@@ -303,12 +303,12 @@ class chatWindow(QtGui.QMainWindow):
 					return w,i # tab, index
 		return None,0
 
-
 	def changeTab(self,index):
+		if index == -1:
+			return
 		try:
 			self.ui.chatTab.widget(index).chat.ui.line.setFocus(QtCore.Qt.MouseFocusReason)
 		except: pass
-		#try:
 		jid=unicode(self.ui.chatTab.widget(index).jid)
 		typ=unicode(self.ui.chatTab.widget(index).typ)
 		if len(unicode(jid).rsplit("/"))!=1:
@@ -318,7 +318,6 @@ class chatWindow(QtGui.QMainWindow):
 
 			#show=self.main.icons[unicode(res[resource].text(1))[0]]
 			#icon=self.main.getIcon(jid,show,size="16x16")
-		#else:
 		if typ=="chat":
 			#icon=self.main.getIcon(jid,self.main.icons[unicode(self.main.ui.roster.getUserItems(jid)[0].status)],size="16x16")
 			self.ui.chatTab.setTabIcon(index,self.ui.chatTab.widget(index).ic)
@@ -328,9 +327,6 @@ class chatWindow(QtGui.QMainWindow):
 		color=self.ui.chatTab.tabBar().palette().color(QtGui.QPalette.Foreground)
 		self.ui.chatTab.tabBar().setTabTextColor(index,color)
 
-
-
-
 		widget=self.ui.chatTab.widget(self.ui.chatTab.currentIndex())
 		if not widget:
 			return
@@ -378,8 +374,6 @@ class chatWindow(QtGui.QMainWindow):
 						w.chat.separator=True
 					else:
 						w.chat.separator=False
-		#except:
-			#pass
 
 	def isActiveWindow(self):
 		if sys.platform=="win32":


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- jabbim.spec	10 Sep 2009 17:21:52 -0000	1.35
+++ jabbim.spec	17 Sep 2009 09:47:06 -0000	1.36
@@ -2,7 +2,7 @@
 %global	svndate	20090907
 Name:		jabbim
 Version:	0.5
-Release:	0.9.svn%{svndate}%{?dist}
+Release:	0.10.svn%{svndate}%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -15,6 +15,7 @@ Source0:	jabbim-svn%{svndate}.tar.xz
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
 Patch1:		jabbim-0.5-fix-compact-roster-drawing.diff
 Patch2:		jabbim-0.5-fix-message-loss.diff
+Patch3:		jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,6 +46,7 @@ with the advanced functionality provided
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 # replace runtime detection of the SVN revision with hardcoded info
 sed -i -e "s#\\(self.version = '0.5 SVN' + \\)\\(utils.getSvnVersion()\\)#\\1' - rev. %{svnrev}%{?dist}'#" jabbim.py
 
@@ -100,6 +102,10 @@ fi
 
 
 %changelog
+* Thu Sep 17 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.10.svn20090907
+- Fix a harmless traceback which abrt points out all the time.
+  (jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff, upstream)
+
 * Thu Sep 10 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.9.svn20090907
 - Fix message loss because of a change in PyQt4 4.5.x.
   (jabbim-0.5-fix-message-loss.diff, committed upstream)