tag 410047 +patch
thanks
Hi,
I've attached a NMU patch for the current testing release.
It's a backport of http://trac.gajim.org/ticket/2038
Best regards,
Gonéri
reverted:
--- gajim-0.10.1/debian/patches/00_debian-copying.patch
+++ gajim-0.10.1.orig/debian/patches/00_debian-copying.patch
@@ -1,25 +0,0 @@
-Index: Makefile
-===
Makefile (revision 6412)
-+++ Makefile (working copy)
-@@ -88,7 +88,6 @@
- fi; \
- done
- ${MAKE} -C po install PREFIX=$(PREFIX)
-- cp COPYING $(DESTDIR)$(PREFIX)/share/gajim/;
- cp THANKS $(DESTDIR)$(PREFIX)/share/gajim/;
- mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps;
- cp data/pixmaps/gajim.png $(DESTDIR)$(PREFIX)/share/pixmaps/;
-Index: src/dialogs.py
-===
src/dialogs.py (revision 6412)
-+++ src/dialogs.py (working copy)
-@@ -521,7 +521,7 @@
- dlg.set_version(gajim.version)
- s = u'Copyright \xa9 2003-2005 Gajim Team'
- dlg.set_copyright(s)
-- text = open('../COPYING').read()
-+ text = open('/usr/share/common-licenses/GPL-2').read()
- dlg.set_license(text)
-
- dlg.set_comments(_('A GTK jabber client'))
diff -u gajim-0.10.1/debian/changelog gajim-0.10.1/debian/changelog
--- gajim-0.10.1/debian/changelog
+++ gajim-0.10.1/debian/changelog
@@ -1,3 +1,12 @@
+gajim (0.10.1-6.1) unstable; urgency=high
+
+ * Non-maintainer upload
+ * Backport from SVN to avoid endless messages with Wildfire
+ (Closes #410047)
+- add 00_fix_endless_messages_with_wildfire.patch
+
+ -- Gonéri Le Bouder [EMAIL PROTECTED] Thu, 15 Feb 2007 18:16:05 +0100
+
gajim (0.10.1-6) unstable; urgency=low
* fix LDFLAGS problem. Closes: #384439
only in patch2:
unchanged:
--- gajim-0.10.1.orig/-
+++ gajim-0.10.1/-
@@ -0,0 +1,25 @@
+Index: Makefile
+===
+--- Makefile (revision 6412)
Makefile (working copy)
+@@ -88,7 +88,6 @@
+ fi; \
+ done
+ ${MAKE} -C po install PREFIX=$(PREFIX)
+- cp COPYING $(DESTDIR)$(PREFIX)/share/gajim/;
+ cp THANKS $(DESTDIR)$(PREFIX)/share/gajim/;
+ mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps;
+ cp data/pixmaps/gajim.png $(DESTDIR)$(PREFIX)/share/pixmaps/;
+Index: src/dialogs.py
+===
+--- src/dialogs.py (revision 6412)
src/dialogs.py (working copy)
+@@ -521,7 +521,7 @@
+ dlg.set_version(gajim.version)
+ s = u'Copyright \xa9 2003-2005 Gajim Team'
+ dlg.set_copyright(s)
+- text = open('../COPYING').read()
++ text = open('/usr/share/common-licenses/GPL-2').read()
+ dlg.set_license(text)
+
+ dlg.set_comments(_('A GTK jabber client'))
only in patch2:
unchanged:
--- gajim-0.10.1.orig/debian/patches/00_fix_endless_messages_with_wildfire.patch
+++ gajim-0.10.1/debian/patches/00_fix_endless_messages_with_wildfire.patch
@@ -0,0 +1,34 @@
+--- src/common/connection_handlers.py.orig 2007-02-15 18:11:48.0 +0100
src/common/connection_handlers.py 2007-02-15 18:15:08.0 +0100
+@@ -1051,6 +1051,7 @@
+ # keep the jids we auto added (transports contacts) to not send the
+ # SUBSCRIBED event to gui
+ self.automatically_added = []
++ self.subscribed_events = {}
+ try:
+ idle.init()
+ except:
+@@ -1480,8 +1481,21 @@
+ if jid_stripped in self.automatically_added:
+ self.automatically_added.remove(jid_stripped)
+ else:
+-self.dispatch('SUBSCRIBED', (jid_stripped, resource))
+- # BE CAREFUL: no con.updateRosterItem() in a callback
++# detect a subscription loop Debian#410047
++# http://trac.gajim.org/changeset/6606
++if not self.subscribed_events.has_key(jid_stripped):
++ self.subscribed_events[jid_stripped] = []
++self.subscribed_events[jid_stripped].append(time.time())
++block = False
++if len(self.subscribed_events[jid_stripped]) 5:
++ if time.time() - self.subscribed_events[jid_stripped][0] 5:
++ block = True
++ self.subscribed_events[jid_stripped] = self.subscribed_events[jid_stripped][1:]
++if block:
++ gajim.config.set_per('account', self.name, 'dont_ack_subscription', True)
++else:
++ self.dispatch('SUBSCRIBED', (jid_stripped, resource))
++ # BE CAREFUL: no con.updateRosterItem() in a callback
+ gajim.log.debug(_('we are now subscribed to %s') % who)
+ elif ptype == 'unsubscribe':
+ gajim.log.debug(_('unsubscribe request from %s') % who)
pgpX6ZoikZPlG.pgp
Description: PGP signature
