From 24e9188a42eefad29d3026cf2ce80741ca822a65 Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Mon, 29 Aug 2005 22:24:13 +0000
Subject: [PATCH] now also catch weather transport and show correct icons
---
data/iconsets/transports/weather/16x16/away.png | Bin 0 -> 243 bytes
data/iconsets/transports/weather/16x16/chat.png | Bin 0 -> 323 bytes
data/iconsets/transports/weather/16x16/dnd.png | Bin 0 -> 213 bytes
data/iconsets/transports/weather/16x16/error.png | Bin 0 -> 412 bytes
.../transports/weather/16x16/invisible.png | Bin 0 -> 262 bytes
.../transports/weather/16x16/message.gif | Bin 0 -> 2133 bytes
.../weather/16x16/not_in_the_roster.png | Bin 0 -> 301 bytes
.../transports/weather/16x16/offline.png | Bin 0 -> 417 bytes
.../iconsets/transports/weather/16x16/online.png | Bin 0 -> 285 bytes
data/iconsets/transports/weather/16x16/xa.png | Bin 0 -> 209 bytes
src/common/gajim.py | 14 ++++++++------
src/roster_window.py | 4 ++--
12 files changed, 10 insertions(+), 8 deletions(-)
create mode 100644 data/iconsets/transports/weather/16x16/away.png
create mode 100644 data/iconsets/transports/weather/16x16/chat.png
create mode 100644 data/iconsets/transports/weather/16x16/dnd.png
create mode 100644 data/iconsets/transports/weather/16x16/error.png
create mode 100644 data/iconsets/transports/weather/16x16/invisible.png
create mode 100644 data/iconsets/transports/weather/16x16/message.gif
create mode 100644 data/iconsets/transports/weather/16x16/not_in_the_roster.png
create mode 100644 data/iconsets/transports/weather/16x16/offline.png
create mode 100644 data/iconsets/transports/weather/16x16/online.png
create mode 100644 data/iconsets/transports/weather/16x16/xa.png
diff --git a/data/iconsets/transports/weather/16x16/away.png b/data/iconsets/transports/weather/16x16/away.png
new file mode 100644
index 0000000000000000000000000000000000000000..73e8e2b73818459e993f3d4091590bb697d130a2
GIT binary patch
literal 243
zcmV<P01W?$P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002GNkl<Zc$}q^
z!3~5U5JjKHGo@IBg_x;<LabpzAr?U?G~iwqf+H(#{1;*J|C><(UTSz^a?Ty~KBZK0
zU4V1$5E15i1|Y_Wsusv#%@$CHvueoH>J(!HKvgec;8dGhW9Fxb^xlv%!Cfcs{i(if
z+ZFIj-g`uZbzK1nA)J7dHCxqTpsZCD`2L0b^=&6rW#9MaWXrOUQW^@tcIqhuMmyTS
t8vB-qfDpptQ0*;8xpj>1R9~o9`T&JqQ!9$~9EAV?002ovPDHLkV1mRvW*Yzi
literal 0
HcmV?d00001
diff --git a/data/iconsets/transports/weather/16x16/chat.png b/data/iconsets/transports/weather/16x16/chat.png
new file mode 100644
index 0000000000000000000000000000000000000000..655537e02b6b38455a3420a16c6d1618dc53b74a
GIT binary patch
literal 323
zcmV-J0lfZ+P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003BNkl<Zc$}?L
zF;c@Y5L{<c3rhO@z@I?l$}~K{R7pYOjt5YM)>PpOq=8YIl$3cv(x+t9QY?ic`6Npf
z?97e5vTn6nAMi(1r4M}rO8)Yh-#beehHh+Jf4C}%PB3&J33`#f0ew^7fHaz^$V@gb
zH~G`r`tp8juzu7dN0Na*`E-u0W2bTVWCGnDl01ekwoQWk`F6z%H=0T*dPm+xxWaN1
z2UtQ|gYVBe@Og3P{5re5KPvIGql4E6VD*OTbar=+Ah@-*y1M@gJPM<&!NrXWQQ8Cm
z*<`Jq4wat)(*66k29;7#(da153DRMaX?uZUvlNkHG&+dL0m^2O69QZ&li~R<`~rDW
Vp9#z`sdWGV002ovPDHLkV1nPjjsgGx
literal 0
HcmV?d00001
diff --git a/data/iconsets/transports/weather/16x16/dnd.png b/data/iconsets/transports/weather/16x16/dnd.png
new file mode 100644
index 0000000000000000000000000000000000000000..12f0b0282dfbee583adfd58dfa5a636b9c70e45f
GIT binary patch
literal 213
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`b39!fLn`Jhopg}*umX>3{GvH?
zRc+X;OHTM*khNj+Zeg7x+@U1p@OKiw$NySpvp*|ykEtld%@6i!m1gVcXcq_wWk~9o
z5y^Qos#rSUaAfHT!&g@hF|6vE$yo5^LC&m;|5(nnym3CB<IqzmwQ6rF*IrJWmG@fL
zxg5D`|E_QMV{hK7f_14o*2Ntt5MKY9caMd?<o@5+bHnU^XeY4TpL{TP{&~}RkAUuE
N@O1TaS?83{1OUR3RNnvq
literal 0
HcmV?d00001
diff --git a/data/iconsets/transports/weather/16x16/error.png b/data/iconsets/transports/weather/16x16/error.png
new file mode 100644
index 0000000000000000000000000000000000000000..d99d62a84d68752d10ab8ba1b73c6b502c2569bc
GIT binary patch
literal 412
zcmeAS@N?(olHy`uVBq!ia0vp^0w65F1|<EHm6d=LTavfC%YQK7jQD;BD8gCb5m^kR
zJ;2!QWVRgx1EY<ni(`n#@u!nFW-}Rz9BY2?;E9q_Q`3V7@~;$H{Yu{~SUdZIlc?ZS
zXVyX?nJ)ncAG5Ivn!8W*|9r?a_t96a8CGAm*E}iuzVH3sClVWO8?t%CuHEtO`(nZC
zU#ko{+!(LF{hn-ipm5jS3YmoMOgHjcKc*>{Z2TeBFthEuO3(A+b?t{sr1+S(-OWlh
zI*@ZMZ~0}mW|{tNvRof6dD<s(yx)J>b7{%pk2@}&c*?^PrKhVsa|)~a<TT^if158>
zTlA%>3hi20&T@=-N8bA5`P=XFCVqcv&&qJ`{ED`s+DiKwHVf;&|GcBE6ZcT-ntw~o
z>fh$v3(8hV#b(DSH1YmzV)c9S`{IjN;Xfuac(Hu&k(kkND{&@69LEAThR{dt)&e4L
zwmWvQd~ozwD=e;7a5sKY`J0!_jC+I}S{d$fNIqeiTJUOKs6)zQV1P1sy85}Sb4q9e
E04svA=l}o!
literal 0
HcmV?d00001
diff --git a/data/iconsets/transports/weather/16x16/invisible.png b/data/iconsets/transports/weather/16x16/invisible.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8bb1b8700a5159c253c0cf5791f98d113c1493d
GIT binary patch
literal 262
zcmV+h0r~!kP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002ZNkl<Zc$~FT
z!3o455FCR=YylP!EW<KVSjb!Q4yi)6fPDuG@Sl6>nF|Jw;|6>zGdnvg3;YQ6M9%Yk
z*7Y<^H@&Wl5JG9N);^kN3_YS6-uu&gUj}_;P$$gLz<XC_1^|rX*lpUKAjXJ&-ytG>
z2FGz+;--|!YZ@>!m>J8m+zeX=`cu?Gi_^}z5;evM03ad&z`CwQNJNFNp`3GP{upCS
zAw&emm}cX)Z3+N}JT1p0q7pZy1QEIHU-JN<thKk}=s^gf>(u{`7ZMwCayP#(CIA2c
M07*qoM6N<$f-<LP`~Uy|
literal 0
HcmV?d00001
diff --git a/data/iconsets/transports/weather/16x16/message.gif b/data/iconsets/transports/weather/16x16/message.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fea7551cf8423fb811a2a4e566caa1ff1fb90617
GIT binary patch
literal 2133
zcmdVb+fx%)90%}ovS)XL0!E5*QEcO_XeFYxMT*xtw$qtT+Zp`_`qKZPPkq>WHnN+5
zB!QGm(6OT^7OG&VBoZhg3Zn=lTm%t>7H~UN>!@7SI;ZDsaB4ewu#erzOkO|p`~JSa
z^YJGi?acks1WcggL!f_z(7#qdtU#-Y(=HgbdQtPzpHXWNwM&B5C}@`jt%=u~1TDa8
z&Air%v>?*jkaiVm9h`REpk3#*PJ?#CpmiCvZi5zqS}!CWMsiIg*NmjoNN$LvOCVh$
z=@v<kKzc+H7D!km5rITR(kqZYf%NmFUmycK84$=#p4=43AWw!68RE$>BEvknjmQWh
zqlnz$$Q?w+I5LLFI7j}spP4NE?BL-;2ljt)aJwa&gER>9QxvxhNMH-ghQ$QLW8X?x
zmeQ>XPL|W;HL6Woxi>{xttR3(l0VqBFC|~fur6D^_1*V(=I!2}zRF+#a$;8Yj+`Ir
z>Hx&?8#iTb1(%y36pe4KTc5dwyVBl_mzdXX+{}gRJNmHEyl!|nFe(e;o8}3Creq$A
zag%5^pb9gybIPOebCkX->1t6hc;I59V2CADVhb^)NH3M;<rJecLDd;pjTw=<Q16v=
zAm^{RSRDn1LTB4$=IaJ1tWaGK8b52Ly0P(Jn9ctiaw@_QS}G+tq<bEtJip)(A7%8d
z&o;%f$^W!bl47Uxb2uo6*+5x2^yo0|`%_hHa$Jq`^m)eedMhqr9TfnmCAE-Etr<ls
zRAV^Os|aGvAhIOcsi_04-H>3isV<|Ls#MIoB%}QJiR2QWDYMTEFqR8PT`~n(B^s=%
z0$5N8oGw_xTwG~6)MMpN+A2KO#B=A0YYXBx)&X=eRc5Ao)K<JZHBDX;YzwV$pX@}I
z?Z*lPAC<hl#gf#Ic?pPd=35CSJcfZF=`#1Y{h>TPGbhft=UyC%xor82WjJa8P_~2o
zqpHo0xxymov?oejiBjs!uvb<(O4C=lP66cDlj8D}Ag`LYo0?9010eTOYFcqkAj`7t
zz1$TAUh}#Qo8GZ(Pj&&eTv6G84CsE{rt`wT;>kr=odkH<D9_eSPR*_44<{RAP0UGY
z_!Syl6ScwB#Zn^YR?1*H&X7->aFo#&*w0d5-ky}=YUERMDe#Qj7X&#?&1q6=aB~zW
z*CD!IQDTAgH*pjL)`1CT{9OWAkOpY1p7{sJoI3S+U(0@R$Jd84H^p4HB0W|Xsx3J`
zA3$l14HO=OaJ7xj?>m^nh+L&o3RzW8S5;O+inLw;s0ijT=6N6T!ySQ^)HF|9$gj^)
zzJV5z*3c_Ry{A#5N{M>F#rQrp#ox=x>Ob-+zx=BuDApYR)d+S^sF&T7k`e&vHIad*
z5<=>;a;K`8PvL6aXCULr4GqT|bNo$(EdaIZy5?FGIZi{iH+MvO+3F2Sw<2*g>;#ij
zioAq5B$n^=3>Ig=b2WA&zKJ&Cb?zMXt}4sQuB`=7jR)Qa2=!8M{w7F~w5VL@#{kS-
zp>%cq6t?%@M1z*3TbRF%Mxe=wCniS{)X+U-lpk2Z<j;<Ur$=JVX|bWN<6&V^552j2
zSoHcy+t%1fPmF#(K(Gx${d{npU03K$;|6@)L-gW~jD*IlJe~yTu4GrH(36nk@ssJ<
z`|}R@*`GLeLs<>}!*j66a#L6IE!dWm>+^w^uK~Dn6~e{mpeNENvqEsg{@zi&4-*sZ
kcQNb21Arc?g7gP^(XKpRn4O-_9NA}Z2*U>!GEE@wFUP`G(f|Me
literal 0
HcmV?d00001
diff --git a/data/iconsets/transports/weather/16x16/not_in_the_roster.png b/data/iconsets/transports/weather/16x16/not_in_the_roster.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdf776ea71dcaab42911920cdef336879a001155
GIT binary patch
literal 301
zcmeAS@N?(olHy`uVBq!ia0vp^0w65F1|<EHm6d=LTavfC%YQK7jQD;BD8gCb5m^kR
zJ;2!QWVRiUan{qtF~sBe)hn^wjE*AhAAfG@auRW!=+f08@-g#&w7+lg=DE*~zH7aI
zHttQ<{Bs*0$1K%VxjtR>jrbBKz84Axe38z-9BwJxxxetyQR6N3FPQ&)WqsLO)?qr+
z*62{p37JdG4}Z1DesbmbS*cV$rTxh2lV+_YjU~?gipn0z9_k+HEfchz0&+b*efDiV
zBHXDi+`cAYW7i#lY}b{=M@(9tgcrN~%c?oS#Hz@=MgGj+{v-4AU!I&br(^3Z&O^1Y
p9kkPYRroY*Bds5YKmHfXeC3g?<U}8HIiSZFJYD@<);T3K0RZo^dz=6O
literal 0
HcmV?d00001
diff --git a/data/iconsets/transports/weather/16x16/offline.png b/data/iconsets/transports/weather/16x16/offline.png
new file mode 100644
index 0000000000000000000000000000000000000000..334a85c1bd99c66ceb7cc5f929652747e965807d
GIT binary patch
literal 417
zcmeAS@N?(olHy`uVBq!ia0vp^0w65F1|<EHm6d=LTavfC%YQK7jQD;BD8gCb5m^kR
zJ;2!QWVRgx1EZs-i(`n#@x4>6PaiT6Y5VOiQz|TT#IaCNX7AZW99<es9QPaqcU3qR
zTnzo+=&{<@F!omcwEn}2D)NpZK5sthD84T~mnn4m(wDbot3!2;-KfjIec*B7UbcDX
z+nGO9?TvX<c&y}U<m|IWoYKW@3!jU2A9%j`E*smyoMRCpfw$fpms#a*-{6=0;P1TC
zjPm_XjLp)#JoC=8{`|GR`S6D_Z<Q3Gpw)>5+q-3W8m9CecWahapE*VQm_x4UY9^Zt
zrI#}oyubch<3g6CK!A4n-JGy_ru-th^1VGF=U6KY6sK~9W!;vrnX9BOe3<Fy9vvZ;
z?pBU}jSY{N1X*<Xutnd0z4D6Mhkqg!aa+3%o?YhEJh!5hr`2Kk=f{3iPH$pZdU)ZE
zrrypKPBkk3S-0Hnn9nVE=s#~w&xb`_O851rn%KB4oA=m0#31GV+}ONrz))rIboFyt
I=akR{0B7g1MgRZ+
literal 0
HcmV?d00001
diff --git a/data/iconsets/transports/weather/16x16/online.png b/data/iconsets/transports/weather/16x16/online.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6bbdedb2da4ede00bfc82bfc4977c32d1ae8d06
GIT binary patch
literal 285
zcmV+&0pk9NP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002wNkl<Zc$}q^
zF%p6>5JkTpV7UvIkfFjW(An6~c?NCixPy%jHcn0uE}*@op|$uH8Xy527~jm!WRu;$
zo1Fyslf~FU7K2^?a2}3b`Wt!LChkuk8x!r3ryvPhkt_ynQWk?OBl;rCZt|uWu9k$~
z^{T{v8?`>X8Q9AAhub<X5!So1agW-YN1nQElOSKuj}a6R$C41VT{KtN6z%{mK_E~{
z!59N$43tv1-eh=qekBp1)|x(AYl;XR0YBIVjo}FVsx(<(E>@uT66ewgR8=)OsT<oo
j2<J`{sOx(4BhKOt&4&^Kt68jx00000NkvXXu0mjf#~XC4
literal 0
HcmV?d00001
diff --git a/data/iconsets/transports/weather/16x16/xa.png b/data/iconsets/transports/weather/16x16/xa.png
new file mode 100644
index 0000000000000000000000000000000000000000..e38b5889ac0ff5b93e5b4186a7873b7f19f93278
GIT binary patch
literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Gdx`!Ln`JRopg|wS&@h3`=UMD
z^-dMIhBNznXC5exWj@E9(x|^cBj_8e_WK)$82(?|80>QC@!wtR=0!7k?CMxBg^9ty
z_)3)Z6Nzqj2Oe|R6UlFutO^M2;9&51c(FPy`5vqBSI)4x(;D)xGNx^l?b=$)eUmM$
z>p!E)-<qA~0oIdCzTcdm5&7eCrS=`Qj=DK&tf~1$&;PsR*Dft;lsn4C2y`QZr>mdK
II;Vst0AnXnv;Y7A
literal 0
HcmV?d00001
diff --git a/src/common/gajim.py b/src/common/gajim.py
index 4a7c72c9db..b967e257b4 100644
--- a/src/common/gajim.py
+++ b/src/common/gajim.py
@@ -79,16 +79,16 @@ def get_nick_from_jid(jid):
def get_nick_from_fjid(jid):
# fake jid is the jid for a contact in a room
- # gaim@conference.jabber.org/nick/nick-continued
+ # gaim@conference.jabber.no/nick/nick-continued
return jid.split('/', 1)[1]
def get_room_and_nick_from_fjid(jid):
# fake jid is the jid for a contact in a room
- # gaim@conference.jabber.org/nick/nick-continued
- # return ('gaim@conference.jabber.org', 'nick/nick-continued')
- l = jid.split('/', 1)
- if len(l) == 1: #No nick
- l.append('')
+ # gaim@conference.jabber.no/nick/nick-continued
+ # return ('gaim@conference.jabber.no', 'nick/nick-continued')
+ l = jid.split('/', 1)
+ if len(l) == 1: #No nick
+ l.append('')
return l
def get_contact_instances_from_jid(account, jid):
@@ -173,6 +173,8 @@ def get_transport_name_from_jid(jid, use_config_setting = True):
return 'sms'
elif host.startswith('tlen'):
return 'tlen'
+ elif host.startswith('weather'):
+ return 'weather'
elif host.startswith('yahoo'):
return 'yahoo'
diff --git a/src/roster_window.py b/src/roster_window.py
index 19b8f3b050..79ff63988f 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -2056,7 +2056,7 @@ _('If "%s" accepts this request you will know his status.') %jid)
self.tree.set_model(model)
self.make_jabber_state_images()
self.transports_state_images = { 'aim': {}, 'gadugadu': {}, 'irc': {},
- 'icq': {}, 'msn': {}, 'sms': {}, 'yahoo': {} }
+ 'icq': {}, 'msn': {}, 'sms': {}, 'weather': {}, 'yahoo': {} }
path = os.path.join(gajim.DATA_DIR, 'iconsets/transports')
folders = os.listdir(path)
@@ -2065,7 +2065,7 @@ _('If "%s" accepts this request you will know his status.') %jid)
continue
folder = os.path.join(path, transport)
self.transports_state_images[transport] = self.load_iconset(
- folder + '/16x16/')
+ folder + '/16x16/')
liststore = gtk.ListStore(str, gtk.Image, str)
self.status_combobox = self.xml.get_widget('status_combobox')
--
GitLab