From d12146ce7f9fa253e783fba916ede935f31f1ecc Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Sun, 20 Nov 2005 13:02:48 +0000
Subject: [PATCH] remove 3 not used modules, ask custom hostname in disco if it
 exists; add image for sip service

---
 data/pixmaps/agents/sip.png | Bin 0 -> 1540 bytes
 src/disco.py                |   7 ++-----
 2 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100644 data/pixmaps/agents/sip.png

diff --git a/data/pixmaps/agents/sip.png b/data/pixmaps/agents/sip.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ff07b907036eacb380211d194b5f35160891074
GIT binary patch
literal 1540
zcmV+f2K)JmP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800007bV*G`2h|G{
z3@{^7w`c$W000JJOGiWi{{a60|De66lK=n!32;bRa{vGh*8l(w*8xH(n|J^K1(8Wa
zK~z}7)mLdu6lWM7*c(_V%PFvK!3&GQvawXl(h3w?p^Z{%VnS>iBMnXEm!?{1Y*MhX
zHH9D2CPc#zBO!*QYSKmy0R=%+KmiX9T~Sbu0=4b7Ac$|@=j*Hi#bbf~aFQo8`_0Vz
zJnuQ*O418>s2T66RI2@Yy}sJb&8?Hqwfwt)*FR+F{!j8atybIb;^H!%mX<cLd-rZS
zaNq##*|UeXZr%ETg^a1y>Oc6o<hdqx(`YpN+4xviR@Q@_o*ue=`}SkN`o4Yp$ko;L
z9t-`M-}9aeas?Y}UA}zzczu2Sw4}Fg-4eKY^QJ&!V<TBCmisKao8Q;Yj$NVH84wUK
za_!o+Da75~-Ga2MtBY>jxItE{Rp9#d>jIsfofH-pHo{T+aW?#6N~Ln_=+UE(d2A;J
z8N`9GqoZRAN=r+Li*t<atez1&7hC0)En6l)3}faMuTnseAMN~d2VK2-RS<)yy}g~<
z+S<h0l`B^Sa1CtVzWo8Gux%#%9?s6r_iJiusJy(KRB9!eq9t0kQ6evsnv#;&31X03
zzI>T3UAjcAt*ujlwKHeV5ZjqxdkY*D5by2n{WrXSbG3!$TbyXsHi@D$B#PQ0ky53g
zbLY+pl9rYhYHn_(ix)2nT)1#SoUw*`p`oERw)e540zL^35C01Sbgo)5r!sk_L@`+s
zz5TsJdV`iw8z2E;Q&W?u{)UDI0bB#P7Z(>d!uB#86_6Gg8EJz6SG^0p_PIo{-%1q!
z!+!!)8YQ7EK@7t4=g-sGvuCFO5yHKMgoJx+Z=0h6)|pHu8`>@5{ddW@%9-BDl_>Ei
ziC&IY&|9&VhvXnbuIuXRsJ6CN0M}T<y@-eiq~J401<dCeFo7H+pMl1CWC+xehp(0v
zFI^xACX<5{1zTNREr9FOr%#JBche}_i=IgvTKDeVD+UbOEk8e>4jw!x@(%A2VvvIf
zq$f|Fq{_-lfvT!1I(6z4<>cfL52HUZ(`M3&AGy1`k0QSifR;mhAtER+c#lZHOORJo
zREU-Za9vVTLVkXJBOJ+$8IMApPFK2S&6-gNz<_}OR5rqoB1GunJ-h}nNP)7lGD=EH
zy3a$XnawC?GmiZ^gtpYwR55U-6M#_L1sp$qTmaAW7)SoUnAOLK4aEEV`wx10dJ?y#
z@D3@k7a&rA2q5PtPMn~_hYwR!R1`kRBLA_mvBR8(JT~R*Fu9M9&sR)3h?$R%&!$bA
zgjdPQ$y8WaC_F|H!sCL10$RU*Jw84Z6B8p+fZ74l)6;D%qK-|z^xUcE7k=R|-W?bi
zprN6mhd6fZ7;V_Ffq3^r{2b=IICHH~e0)4*XJ<boo{YS_ym5|X7e5>NEOHZ*w{gpj
zP9~lX_#C4S5Fz}&bLY;q<aQi6a)g3|g9o^?K6qljdHVGtr_UmP63{766M=%|8X5NW
z_5F@1ou<wAOv!=X-rlDQ!0<{*NwFCWhD!T(4f+1nY&MTPn(w)e0=!?ja^(<v|IK9Y
zmwI`5WgCsg^1#4AYe+~)-`cfn2Qo4;{wXRd5<NdSI5_JlApe|RZ0XlcH<lIh9}0Jd
zAH%}<l!fI71qIdfrnG0_!i9q@Y&bJBa}>Rf@4?fAVQkyUb8~aYILcPG`8vaZZ9YRY
zSpY_*i`=I^j6g;(V=-eH!_0Vtk;3?z^H<EGS{VI{7A+c1OiaAHYuB!O#l^*9QbIsq
zU!TbL=FOXJ9P%1OnlX>z#n3-0K$3H!k)wcz{24|@h%Dq4MmQsav4RmPdxU6hWbEWE
z+#yb5BNO&7S+e9e-irP1;o*_X_ktL{vV)rEnTk$wS~POFJmtvv%h7?s`7%uM*(k3E
q$j`!wFxiH3O3TgB;q(Yz%;R4sXR$$k{E##N0000<MNUMnLSTX;9p8}v

literal 0
HcmV?d00001

diff --git a/src/disco.py b/src/disco.py
index 633aede11..e9f2557dd 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -41,13 +41,9 @@
 # There are more methods, of course, but this is a basic set.
 
 import os
-import sys
-import gc
 import inspect
 import weakref
-import time
 import gobject
-import pango
 import gtk
 import gtk.glade
 
@@ -88,6 +84,7 @@ def _gen_agent_type_info():
 		('headline', 'weather'):	(False, 'weather.png'),
 		('gateway', 'weather'):		(False, 'weather.png'),
 		('_jid', 'weather'):			(False, 'weather.png'),
+		('gateway', 'sip'):			(False, 'sip.png'),
 		('directory', 'user'):		(None, 'jud.png'),
 		
 		# Transports
@@ -454,7 +451,7 @@ _('Without a connection, you can not browse available services')).get_response()
 			self.address_comboboxentry.set_model(liststore)
 			self.address_comboboxentry.set_text_column(0)
 			self.latest_addresses = gajim.config.get('latest_disco_addresses').split()
-			jid = gajim.config.get_per('accounts', self.account, 'hostname')
+			jid = gajim.get_hostname_from_account(self.account)
 			if jid in self.latest_addresses:
 				self.latest_addresses.remove(jid)
 			self.latest_addresses.insert(0, jid)