rpms/gajim/FC-5 gajim-0.9.1.notify_crash.patch, NONE, 1.1 gajim.spec, 1.8, 1.9

Dawid Gajownik (gajownik) fedora-extras-commits at redhat.com
Thu Mar 30 20:51:42 UTC 2006


Author: gajownik

Update of /cvs/extras/rpms/gajim/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27161/FC-5

Modified Files:
	gajim.spec 
Added Files:
	gajim-0.9.1.notify_crash.patch 
Log Message:
- Remove Gnome dependencies
- Fix crash with notify-daemon (#187274, Stefan Plewako)
  http://trac.gajim.org/ticket/1347


gajim-0.9.1.notify_crash.patch:

--- NEW FILE gajim-0.9.1.notify_crash.patch ---
diff -Nur gajim-0.9.1.orig/src/notify.py gajim-0.9.1/src/notify.py
--- gajim-0.9.1.orig/src/notify.py	2005-12-27 01:07:44.000000000 +0100
+++ gajim-0.9.1/src/notify.py	2006-03-30 01:34:02.000000000 +0200
@@ -189,10 +189,29 @@
 		self.notif = dbus_support.get_notifications_interface()
 		if self.notif is None:
 			raise dbus.dbus_bindings.DBusException()
-		self.id = self.notif.Notify(dbus.String(_('Gajim')),
-			dbus.String(path), dbus.UInt32(0), ntype, dbus.Byte(0),
-			dbus.String(event_type), dbus.String(txt),
-			[dbus.String(path)], {'default':0}, [''], True, dbus.UInt32(5))
+		timeout = gajim.config.get('notification_timeout') # in seconds
+		# Determine the version of notifications
+		# FIXME: This code is blocking, as is the next set. That should be fixed
+		# now that we have a class to encapsulate this behavior
+		try:
+			(name, vendor, version) = self.notif.GetServerInfo()
+		except:
+			# No way to determine the version number, set it to the latest
+			# since it doesn't properly support the version number
+			version = '0.3.1'
+		if version.startswith('0.2'):
+			try:
+				self.id = self.notif.Notify(dbus.String(_('Gajim')),
+					dbus.String(path), dbus.UInt32(0), ntype, dbus.Byte(0),
+					dbus.String(event_type), dbus.String(txt),
+					[dbus.String(path)], {'default': 0}, [''], True, dbus.UInt32(
+					timeout))
+			except AttributeError:
+				version = '0.3.1' # we're actually dealing with the newer version
+		if version.startswith('0.3'):
+			self.id = self.notif.Notify(dbus.String(_('Gajim')),
+				dbus.String(path), dbus.UInt32(0), dbus.String(event_type),
+				dbus.String(txt), dbus.String(""), {}, dbus.UInt32(timeout*1000))
 		notification_response_manager.attach_to_interface()
 		notification_response_manager.pending[self.id] = self
 


Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/FC-5/gajim.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gajim.spec	14 Feb 2006 10:06:51 -0000	1.8
+++ gajim.spec	30 Mar 2006 20:51:41 -0000	1.9
@@ -1,9 +1,6 @@
-# Set to '1' if you want to use internal trayicon and gtkspell modules.
-%define         use_internal_modules   0
-
 Name:           gajim
 Version:        0.9.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Jabber client written in PyGTK
 
 Group:          Applications/Internet
@@ -11,6 +8,7 @@
 URL:            http://gajim.org/
 Source0:        http://gajim.org/downloads/gajim-%{version}.tar.bz2
 Patch0:         gajim-0.9.1.modularX.patch
+Patch1:         gajim-0.9.1.notify_crash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -21,16 +19,10 @@
 BuildRequires:  pkgconfig
 BuildRequires:  pygtk2-devel
 BuildRequires:  python-devel
-
-%if %{use_internal_modules}
 BuildRequires:  gtkspell-devel
-%else
-Requires:       gnome-python2-gtkspell
-Requires:       gnome-python2-libegg
-%endif
 
 Requires:       dbus-python
-Requires:       gnome-python2-gconf
+#Requires:       gnome-python2-gconf
 Requires:       pygtk2-libglade
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:       python-sqlite2
@@ -44,18 +36,13 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
-sed -i -e 's/install\: all/install\:/' Makefile
 # gajim wants to handle executables; why?
 sed -i -e '/MimeType/d' gajim.desktop.in
 
 %build
 make \
-%if ! %{use_internal_modules}
-	translation \
-	idle \
-	gajim.desktop \
-%endif
 	CC="%{__cc}" \
 	LIBDIR="/%{_lib}" \
 	OPTFLAGS="%{optflags}" \
@@ -98,6 +85,11 @@
 %{_mandir}/man1/gajim-remote.1*
 
 %changelog
+* Thu Mar 30 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.9.1-3
+- Remove Gnome dependencies
+- Fix crash with notify-daemon (#187274, Stefan Plewako)
+  http://trac.gajim.org/ticket/1347
+
 * Tue Feb 14 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.9.1-2
 - Rebuild for Fedora Extras 5
 




More information about the fedora-extras-commits mailing list