From cd20e8741946cd02977943e725475f5e4544760b Mon Sep 17 00:00:00 2001 From: Dimitur Kirov Date: Tue, 26 Sep 2006 16:02:52 +0000 Subject: [PATCH] complete merge (deleting files and recent updates) --- data/glade/privacy_list_edit_window.glade | 779 ------------------ data/glade/privacy_lists_first_window.glade | 255 ------ .../transports/gadugadu/16x16/away.png | Bin 919 -> 0 bytes .../transports/gadugadu/16x16/chat.png | Bin 944 -> 0 bytes .../transports/gadugadu/16x16/dnd.png | Bin 919 -> 0 bytes .../transports/gadugadu/16x16/offline.png | Bin 944 -> 0 bytes .../transports/gadugadu/16x16/online.png | Bin 944 -> 0 bytes .../iconsets/transports/gadugadu/16x16/xa.png | Bin 919 -> 0 bytes .../transports/gadugadu/32x32/away.png | Bin 2241 -> 0 bytes .../transports/gadugadu/32x32/chat.png | Bin 2274 -> 0 bytes .../transports/gadugadu/32x32/dnd.png | Bin 2241 -> 0 bytes .../transports/gadugadu/32x32/offline.png | Bin 2328 -> 0 bytes .../transports/gadugadu/32x32/online.png | Bin 2274 -> 0 bytes .../iconsets/transports/gadugadu/32x32/xa.png | Bin 2241 -> 0 bytes .../transports/gadugadu/48x48/offline.png | Bin 3759 -> 0 bytes .../transports/gadugadu/48x48/online.png | Bin 3759 -> 0 bytes data/pixmaps/events/new_email_recv.png | Bin 0 -> 2385 bytes src/history_manager.py | 4 +- src/music_track_listener.py | 55 +- src/roster_window.py | 12 +- src/systraywin32.py | 5 +- 21 files changed, 61 insertions(+), 1049 deletions(-) delete mode 100644 data/glade/privacy_list_edit_window.glade delete mode 100644 data/glade/privacy_lists_first_window.glade delete mode 100644 data/iconsets/transports/gadugadu/16x16/away.png delete mode 100644 data/iconsets/transports/gadugadu/16x16/chat.png delete mode 100644 data/iconsets/transports/gadugadu/16x16/dnd.png delete mode 100644 data/iconsets/transports/gadugadu/16x16/offline.png delete mode 100644 data/iconsets/transports/gadugadu/16x16/online.png delete mode 100644 data/iconsets/transports/gadugadu/16x16/xa.png delete mode 100644 data/iconsets/transports/gadugadu/32x32/away.png delete mode 100644 data/iconsets/transports/gadugadu/32x32/chat.png delete mode 100644 data/iconsets/transports/gadugadu/32x32/dnd.png delete mode 100644 data/iconsets/transports/gadugadu/32x32/offline.png delete mode 100644 data/iconsets/transports/gadugadu/32x32/online.png delete mode 100644 data/iconsets/transports/gadugadu/32x32/xa.png delete mode 100644 data/iconsets/transports/gadugadu/48x48/offline.png delete mode 100644 data/iconsets/transports/gadugadu/48x48/online.png create mode 100644 data/pixmaps/events/new_email_recv.png diff --git a/data/glade/privacy_list_edit_window.glade b/data/glade/privacy_list_edit_window.glade deleted file mode 100644 index 1f14d6b71..000000000 --- a/data/glade/privacy_list_edit_window.glade +++ /dev/null @@ -1,779 +0,0 @@ - - - - - - - 6 - True - Privacy List - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - - 600 - True - False - 0 - - - - True - True - 0 - - - - True - <i>Privacy List</i> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - Active for this session - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - True - Active on each startup - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - 0 - False - True - - - - - - True - - - 5 - False - False - - - - - - True - <b>List of rules</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 5 - False - False - - - - - - True - - False - True - - - - 5 - False - True - - - - - - True - True - 0 - - - - 5 - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - 5 - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - 6 - True - True - gtk-edit - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - 0 - False - True - - - - - - 5 - False - 0 - - - - True - - - 5 - True - True - - - - - - True - <b>Add / Edit a rule</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 5 - False - False - - - - - - True - False - 0 - - - - True - True - 0 - - - - True - True - Allow - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Deny - True - GTK_RELIEF_NORMAL - True - False - False - True - edit_allow_radiobutton - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - True - 0 - - - - 5 - True - False - 0 - - - - True - True - JabberID - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 5 - False - False - - - - - - True - True - True - True - 0 - - True - ● - False - - - 5 - True - True - - - - - 0 - True - True - - - - - - 5 - True - False - 0 - - - - True - True - all in the group - True - GTK_RELIEF_NORMAL - True - False - False - True - edit_type_jabberid_radiobutton - - - 5 - False - False - - - - - - True - - False - True - - - 5 - True - True - - - - - 0 - True - True - - - - - - 5 - True - False - 0 - - - - True - True - all by subscription - True - GTK_RELIEF_NORMAL - True - False - False - True - edit_type_jabberid_radiobutton - - - 5 - False - False - - - - - - True - none -both -from -to - False - True - - - 5 - True - True - - - - - 0 - True - True - - - - - - 10 - True - False - 0 - - - - True - True - All - True - GTK_RELIEF_NORMAL - True - False - False - True - edit_type_jabberid_radiobutton - - - 0 - False - False - - - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - True - 0 - - - - True - True - to send me messages - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - to send me queries - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - to view my status - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - to send me status - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - True - 0 - - - - True - False - 0 - - - - True - Order: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 5 - False - False - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 0 - False - True - - - - - 0 - True - True - - - - - - 5 - True - True - gtk-save - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - - - 0 - False - True - - - - - - True - True - 0 - - - - 5 - True - True - gtk-refresh - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - 5 - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - 0 - False - True - - - - - - - diff --git a/data/glade/privacy_lists_first_window.glade b/data/glade/privacy_lists_first_window.glade deleted file mode 100644 index 7a7470123..000000000 --- a/data/glade/privacy_lists_first_window.glade +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - 12 - True - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - - True - False - 0 - - - - True - Server-based Privacy Lists - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 5 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 4 - True - - False - True - - - 0 - True - True - - - - - - True - True - 0 - - - - 5 - True - True - gtk-delete - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - 5 - True - True - gtk-open - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - - - 5 - True - True - - - - - - True - Create your own Privacy Lists - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 5 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - ● - False - - - 4 - False - False - - - - - - 5 - True - True - gtk-new - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - - - 5 - True - True - - - - - - True - True - 0 - - - - 5 - True - True - gtk-refresh - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - 5 - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - 0 - True - True - - - - - - - diff --git a/data/iconsets/transports/gadugadu/16x16/away.png b/data/iconsets/transports/gadugadu/16x16/away.png deleted file mode 100644 index e84aea305eac489dfce9c6f3e1c89f14c07796b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 919 zcmV;I18Dq-P)^@R5*== zQ)_5bcNG8qZ*J0SZql@Q*s#_#hSXY>VIB2RQc#FRu|w3liJOd-`hYoxn}dCkIc5<* zY*U0f<_EP>tJQt*RjZ;{9d0@mMW{_{u#cG9_BL(vxYwKJ-m?!gMWo;l4jeeI-}!M4 zBO*+P)m245F0b_0fic6?o6q*#y#MOhw24GCWdPWg*mrC8@)+Ou<6 zh=@??x2^X$XVd~<*&06EXkGQ}rmkCGZ?@S)uHl#VFMS?IUN$yw&P><(YG3oYBbz_b zR2e@V>UhQ&D<>k25fK<;xvh=0gTdts%mAQGW-ytyLa-Ksv^3=LUT}O821;QvIfC{( z5#_7>4>zf5<^um_jrgj-tltAme7ksNW`e64R-xwPm!O^p! z$LX|o5dgR>&Gx?rzH4rM)GIgx$gvjT%B`p1cryUt^7VfJ5IEk2!)N-3?sranOm9SE zl?$DpEiU)`u%OiKURhOXcX(HDan*#`WdS_7`zLa^6y`47f;*?Sqrj5H!w3JW2b#Jf z30Y5!CTO4G+xn$#-|VRNmz5Tpd4rvCMiGJuaL>#~<-#Hu^)VFWai}O2kWq$^Z;bz^EhlRZIboyAFXgYozQh1(MS}ZZrX^Nnl+G9Wq5G+B}8b{A62>( zl~T#qbR9$lQ4~M)dcDt296v#CL)Ud09v+_ZBLfktulqt@Tv74D=ks0Sd43Lv2qh&Y zw-bp3y$_0_kTfC@5mESgnEZbKJq`ehJ;lWqi)Gp~e;a8v4O5N@0ARPor@IH+>g(u8V`FCPwylH7M6!uxr^^S tzR-bv4l7ra&Ol8lbTA_6C#U=7{{X~EsD&q2ClCMt002ovPDHLkV1hL_sT2SJ diff --git a/data/iconsets/transports/gadugadu/16x16/chat.png b/data/iconsets/transports/gadugadu/16x16/chat.png deleted file mode 100644 index 9d9b4fe4a9ec4dc3ecbb54c6f94d2b6e40967c87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 944 zcmV;h15f;kP)Jlr37&A+M3e+0O;_m&0~rF4o>uU@WB@w z2ALVvq2isDWrb}3DBmOJ2kmHG*)?$frS{@tr#O71=b2z-sV85nxyR?-*&6IV`BD2W zE2HDh4}Q8%L}6yOh?zk|?i0t_CbqWJDga;^CXB2L4p%wY%0izTg^-hwSc8$AM$d(4 z>VOpci3j+ z?P0y-@di0?`gb!Vh_ECCD?5*5VjPAxgihmsxZy1Vi9WM3VfEK%oYr~UPM|XPg_|L|e zn&PvRS0WKr{Mgkt916G!#%@`doOdHsQwKG13pYpl;guus7e?`YL{i`TD!FGOZk|M5 zQ2_9Kd)?(j2R4V(u_2h6igYTA>9`3y&7x4mAqfkTY=>nT*nLDBiu{wSXJ%b2Zg)4X zuL|Y#84yfdycW}kM#rtPf?>FAG2ECijLxrlR!?Oiz}U1#4#+Yd{Erv5Z15iX@b!kd zeNWsyxx(+*z5RjGfvd+n964IVo7PApiVgLvD#YK^wFs$|J-gSw_;lhpo*Ds zU(ntgIa^@R5*== zQ)_5bcNG8qZ*J0SZql@Q*s#_#hSXY>VIB2RQc#FRu|w3liJOd-`hYoxn}dCkIc5<* zY*U0f<_EP>tJQt*RjZ;{9d0@mMW{_{u#cG9_BL(vxYwKJ-m?!gMWo;l4jeeI-}!M4 zBO*+P)m245F0b_0fic6?o6q*#y#MOhw24GCWdPWg*mrC8@)+Ou<6 zh=@??x2^X$XVd~<*&06EXkGQ}rmkCGZ?@S)uHl#VFMS?IUN$yw&P><(YG3oYBbz_b zR2e@V>UhQ&D<>k25fK<;xvh=0gTdts%mAQGW-ytyLa-Ksv^3=LUT}O821;QvIfC{( z5#_7>4>zf5<^um_jrgj-tltAme7ksNW`e64R-xwPm!O^p! z$LX|o5dgR>&Gx?rzH4rM)GIgx$gvjT%B`p1cryUt^7VfJ5IEk2!)N-3?sranOm9SE zl?$DpEiU)`u%OiKURhOXcX(HDan*#`WdS_7`zLa^6y`47f;*?Sqrj5H!w3JW2b#Jf z30Y5!CTO4G+xn$#-|VRNmz5Tpd4rvCMiGJuaL>#~<-#Hu^)VFWai}O2kWq$^Z;bz^EhlRZIboyAFXgYozQh1(MS}ZZrX^Nnl+G9Wq5G+B}8b{A62>( zl~T#qbR9$lQ4~M)dcDt296v#CL)Ud09v+_ZBLfktulqt@Tv74D=ks0Sd43Lv2qh&Y zw-bp3y$_0_kTfC@5mESgnEZbKJq`ehJ;lWqi)Gp~e;a8v4O5N@0ARPor@IH+>g(u8V`FCPwylH7M6!uxr^^S tzR-bv4l7ra&Ol8lbTA_6C#U=7{{X~EsD&q2ClCMt002ovPDHLkV1hL_sT2SJ diff --git a/data/iconsets/transports/gadugadu/16x16/offline.png b/data/iconsets/transports/gadugadu/16x16/offline.png deleted file mode 100644 index b8623f4b53640a9838e0cbaf67ef1137bdeaa527..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 944 zcmV;h15f;kP)aZ-A0$b?b%2G<$LK-d_Y&9gU7}KiMwB5{-D0^K`!RhV zaz+v#4tzIBL`{q_lNe(lBI(52ee*lpT15cJ8CihmAr_Y)mo=a~h#{BN!BYx`8prVX z&Gg~VhxTilHpH*2AwSvN_*q+^@sMD(lHFeqp~wy*f}twl#X@A_F{shMkVwSQfBMRV zuIr}&fXk0L9KP}T4`K=b#g0Zb)t~)^GAaa(OWRTL|)81h*qm^P|z9rv`8RF`F`s zAmx=vL>o_i@a`RNi9@)jJU}9sfp1F_D!PNRTS&MrMWrf)5{aR3ySjnzrN7h zwQHz$bCrS3}Q6pzDKYSkAwJm)6+F*B4gjk{+R;#ZESYRPJb5>o zIe%rUuijJM_hx&GA2~w*wHwii`wP#9?#`cVt#LX>r)NhD!#MLFGfAS@48X-0!`8~u z(C8}%*~rTWSi^?W@s(SN7K`PnfA-M-*}1w%Iw}Jlr37&A+M3e+0O;_m&0~rF4o>uU@WB@w z2ALVvq2isDWrb}3DBmOJ2kmHG*)?$frS{@tr#O71=b2z-sV85nxyR?-*&6IV`BD2W zE2HDh4}Q8%L}6yOh?zk|?i0t_CbqWJDga;^CXB2L4p%wY%0izTg^-hwSc8$AM$d(4 z>VOpci3j+ z?P0y-@di0?`gb!Vh_ECCD?5*5VjPAxgihmsxZy1Vi9WM3VfEK%oYr~UPM|XPg_|L|e zn&PvRS0WKr{Mgkt916G!#%@`doOdHsQwKG13pYpl;guus7e?`YL{i`TD!FGOZk|M5 zQ2_9Kd)?(j2R4V(u_2h6igYTA>9`3y&7x4mAqfkTY=>nT*nLDBiu{wSXJ%b2Zg)4X zuL|Y#84yfdycW}kM#rtPf?>FAG2ECijLxrlR!?Oiz}U1#4#+Yd{Erv5Z15iX@b!kd zeNWsyxx(+*z5RjGfvd+n964IVo7PApiVgLvD#YK^wFs$|J-gSw_;lhpo*Ds zU(ntgIa^@R5*== zQ)_5bcNG8qZ*J0SZql@Q*s#_#hSXY>VIB2RQc#FRu|w3liJOd-`hYoxn}dCkIc5<* zY*U0f<_EP>tJQt*RjZ;{9d0@mMW{_{u#cG9_BL(vxYwKJ-m?!gMWo;l4jeeI-}!M4 zBO*+P)m245F0b_0fic6?o6q*#y#MOhw24GCWdPWg*mrC8@)+Ou<6 zh=@??x2^X$XVd~<*&06EXkGQ}rmkCGZ?@S)uHl#VFMS?IUN$yw&P><(YG3oYBbz_b zR2e@V>UhQ&D<>k25fK<;xvh=0gTdts%mAQGW-ytyLa-Ksv^3=LUT}O821;QvIfC{( z5#_7>4>zf5<^um_jrgj-tltAme7ksNW`e64R-xwPm!O^p! z$LX|o5dgR>&Gx?rzH4rM)GIgx$gvjT%B`p1cryUt^7VfJ5IEk2!)N-3?sranOm9SE zl?$DpEiU)`u%OiKURhOXcX(HDan*#`WdS_7`zLa^6y`47f;*?Sqrj5H!w3JW2b#Jf z30Y5!CTO4G+xn$#-|VRNmz5Tpd4rvCMiGJuaL>#~<-#Hu^)VFWai}O2kWq$^Z;bz^EhlRZIboyAFXgYozQh1(MS}ZZrX^Nnl+G9Wq5G+B}8b{A62>( zl~T#qbR9$lQ4~M)dcDt296v#CL)Ud09v+_ZBLfktulqt@Tv74D=ks0Sd43Lv2qh&Y zw-bp3y$_0_kTfC@5mESgnEZbKJq`ehJ;lWqi)Gp~e;a8v4O5N@0ARPor@IH+>g(u8V`FCPwylH7M6!uxr^^S tzR-bv4l7ra&Ol8lbTA_6C#U=7{{X~EsD&q2ClCMt002ovPDHLkV1hL_sT2SJ diff --git a/data/iconsets/transports/gadugadu/32x32/away.png b/data/iconsets/transports/gadugadu/32x32/away.png deleted file mode 100644 index 5c46145eb659a082c54588ba15c252bc70610eb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2241 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 P00000NkvXXu0mjf>4i!N diff --git a/data/iconsets/transports/gadugadu/32x32/chat.png b/data/iconsets/transports/gadugadu/32x32/chat.png deleted file mode 100644 index 05a95d49c1d8c53fce5fe468e45903dc1925b6ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2274 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 P00000NkvXXu0mjf>4i!N diff --git a/data/iconsets/transports/gadugadu/32x32/offline.png b/data/iconsets/transports/gadugadu/32x32/offline.png deleted file mode 100644 index ef8d3a24690c061e114ada830bd496d7b3b8851e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2328 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 P00000NkvXXu0mjf>4i!N diff --git a/data/iconsets/transports/gadugadu/48x48/offline.png b/data/iconsets/transports/gadugadu/48x48/offline.png deleted file mode 100644 index 93729d4ffa8c4b49d66c505bc4c52b31326d45aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3759 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 Z{{vo=Y%t?&r_2BV002ovPDHLkV1g0xUpxQ+ diff --git a/data/iconsets/transports/gadugadu/48x48/online.png b/data/iconsets/transports/gadugadu/48x48/online.png deleted file mode 100644 index 3f093793354089d042ffe0666c3d77f533d7b469..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3759 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 Z{{ub=p8`BMPW1o)002ovPDHLkV1jdqP+9;0 diff --git a/data/pixmaps/events/new_email_recv.png b/data/pixmaps/events/new_email_recv.png new file mode 100644 index 0000000000000000000000000000000000000000..bd6b4e9b72332442c813548e6092640a6ed47fce GIT binary patch literal 2385 zcmV-X39j~uP)WFU8GbZ8({Xk{QrNlj1+3MgYKATls8GayP~Yjt8ECu(VJ zZDC_4AX9W@X>Mh5Co}I@000P-NklFgDW3@%-Y5(Mh%;8i@(0{H^O}`ka?mA!~o7WAj*;J zvaD*I)&HyjaC`Mm=QGWdMxd2X)u_T`Tx(+tRJQf1+ zBM2K44AC-%s_sOf^IqL=F2wuX+t^;{g^1`u`xdv6U-!5RSyML4z*ldc`2$18Mu|*> zbB-dJ@?t^=`yVikuU<%-mzy34teew<) zZi9w4wtd?C7uTBL3H#>5Ic}Hh`#`cC-uMBQ|NCd3ea7(cFvgf5iH3XgQdQa7+G2He zmBqzHMn^~CFYvw5A5w^m+k&5*oTRU>kM8bn@`XIsJU9qcmCKhebMoZL_knK#3xTli zMu6dC!#L-_fQX=8PzI6g(6t@N5J5-e@ zit*m##W!&!9c{?&GJ4~S8ytT2Fmaq?v$2`ER0LF!V6o0CA4jC=0er(V@vjM9{qd{3 z_N!6OzctCb?_Qu(Dv>5>R;d+K1+W+uJO&km8i!TOW@DW+J;0eWXV_|NbsF33S%rp% zh8Q0oCyFB?8)ZOIM6=iwQA7mqnk-g`h$?{Uu2l}nhNo#oJ>LmYng@WaXIz`y__Bg2f1jZr8Rh@uD+n#jz08j@QO z6$C*fbA6Jglq(f3U;cn{PY;DOCCcSc3|k9C6!P4-@ddMUvmAfnIQe`RTU%TEYv%g6I21KOgT)cSxdws*qcqfUAW4{=o#WHVPZ=FKPPtUZ?4daC zNI(Hq=;`ZekvMqpAW;;dDBegbi6y9o7mtK6G2Y|7M-`k?#5wR;+^Z^HEvj%ZO_`aQ z;o9|UjJ|N3Ql&Rb^gT2?JA0tn4hWQcdKf%1$k^Bz<#L%^oC6PDq$R1&3tqB);)I4O zVim7~58hExj4G;NR7sMQt1~l9O;7Rs@bgqky`Z7P5ZRT1-K}R6+J{xEy$lWwarW$4 zDwPVkTn-h%i$_IK@rZXVQtCb8Jl?r1_5t+{kH=ai>FQ!~@>8a-PIKbhC#Y7d2!fh6 zJhPt=0?j(2CI>9v=&Ya6wf>1aaVTcoozs z-e)A{$YC^AHG+-^|?u=e2zh;+Q7geshUF7);e&|j_c z_SY1a&F9xYr?#>}xm0fDTohRvzHyHMADVy-6;?9k2%KuQ8rQF1 z=NGTPPQ6~E+FxaPX_>{vMeeNM35}X(b90l8%?$w7*Vjq9x_IWB&rm9rFvjrm$(OnG z-h1GMgXN5L_PjRw-70asa|ksvI0G+a;OFM%ICbh2wR#f3;9 zZ1If-AUFXl!otD=M~@CMcWo9?rKh*IW&Ng#oBhdXhFXKJ)oM#E@b%R?HjwmcGVmI} zYoKg1(iXwHM%GW6h+Jf`ag4PV6B&*T53{tg%;M5gc)gcUgLT(JwsQzc%a$xHwJpE8 zx|)F%X}h{fg7)B0M6w_ZA2%9}*3?3q1y8b1jy!jS+1Xj}o&%+BjAr$0U(K9^gM%zAEK;l2!@u`Y2bKf)Q?H#O zAIBY*4xuF-U0-MKbkFh9>fR*edt*UxR~3xivpey3P5V{B|>T5bagg8^f}gyCpNG-H~hm+b%MzCGOcyTyX-NY;*heZ9R*O-*x;pZC-s z{bY|{7d@`)4d4er-@Q>|9xzr(!W^bQ{BFL6F9i3xB+P;q!X)obr#H+FUg!df+s$Gg z^U{t{=0+HI?rA!0{?C@b@9p+ceXsU(JzY=N6SV#dq9s?X`3qiv00000NkvXXu0mjf DX^DYe literal 0 HcmV?d00001 diff --git a/src/history_manager.py b/src/history_manager.py index 21d74491f..a4bd75528 100755 --- a/src/history_manager.py +++ b/src/history_manager.py @@ -193,7 +193,9 @@ class HistoryManager: gtk.main_quit() def _fill_jids_listview(self): - self.cur.execute('SELECT jid, jid_id FROM jids ORDER BY jid') + # get those jids that have at least one entry in logs + self.cur.execute('SELECT jid, jid_id FROM jids WHERE jid_id IN (SELECT ' + 'distinct logs.jid_id FROM logs) ORDER BY jid') rows = self.cur.fetchall() # list of tupples: [(u'aaa@bbb',), (u'cc@dd',)] for row in rows: self.jids_already_in.append(row[0]) # jid diff --git a/src/music_track_listener.py b/src/music_track_listener.py index b5bccbdc4..ca4550749 100644 --- a/src/music_track_listener.py +++ b/src/music_track_listener.py @@ -14,6 +14,8 @@ ## GNU General Public License for more details. ## import gobject +if __name__ == '__main__': + from common import i18n import dbus_support if dbus_support.supported: import dbus @@ -24,8 +26,9 @@ class MusicTrackInfo(object): class MusicTrackListener(gobject.GObject): - __gsignals__ = { 'music-track-changed': (gobject.SIGNAL_RUN_LAST, None, - (object,)) } + __gsignals__ = { + 'music-track-changed': (gobject.SIGNAL_RUN_LAST, None, (object,)), + } _instance = None @classmethod @@ -36,14 +39,43 @@ class MusicTrackListener(gobject.GObject): def __init__(self): super(MusicTrackListener, self).__init__() + self._last_playing_music = None + bus = dbus.SessionBus() + + ## Muine bus.add_signal_receiver(self._muine_music_track_change_cb, 'SongChanged', 'org.gnome.Muine.Player') + bus.add_signal_receiver(self._player_name_owner_changed, + 'NameOwnerChanged', 'org.freedesktop.DBus', arg0='org.gnome.Muine') + bus.add_signal_receiver(self._player_playing_changed_cb, 'StateChanged', + 'org.gnome.Muine.Player') + + ## Rhythmbox bus.add_signal_receiver(self._rhythmbox_music_track_change_cb, 'playingUriChanged', 'org.gnome.Rhythmbox.Player') + bus.add_signal_receiver(self._player_name_owner_changed, + 'NameOwnerChanged', 'org.freedesktop.DBus', arg0='org.gnome.Rhythmbox') + bus.add_signal_receiver(self._player_playing_changed_cb, + 'playingChanged', 'org.gnome.Rhythmbox.Player') + + def do_music_track_changed(self, info): + if info is not None: + self._last_playing_music = info + + def _player_name_owner_changed(self, name, old, new): + if not new: + self.emit('music-track-changed', None) + + def _player_playing_changed_cb(self, playing): + if playing: + self.emit('music-track-changed', self._last_playing_music) + else: + self.emit('music-track-changed', None) def _muine_properties_extract(self, song_string): - d = dict((x.strip() for x in s1.split(':', 1)) for s1 in song_string.split('\n')) + d = dict((x.strip() for x in s1.split(':', 1)) for s1 in \ + song_string.split('\n')) info = MusicTrackInfo() info.title = d['title'] info.album = d['album'] @@ -67,7 +99,8 @@ class MusicTrackListener(gobject.GObject): def _rhythmbox_music_track_change_cb(self, uri): bus = dbus.SessionBus() - rbshellobj = bus.get_object('org.gnome.Rhythmbox', '/org/gnome/Rhythmbox/Shell') + rbshellobj = bus.get_object('org.gnome.Rhythmbox', + '/org/gnome/Rhythmbox/Shell') rbshell = dbus.Interface(rbshellobj, 'org.gnome.Rhythmbox.Shell') props = rbshell.getSongProperties(uri) info = self._rhythmbox_properties_extract(props) @@ -87,19 +120,22 @@ class MusicTrackListener(gobject.GObject): if player.GetPlaying(): song_string = player.GetCurrentSong() song = self._muine_properties_extract(song_string) + self._last_playing_music = song return song ## Check Rhythmbox playing song if dbus.dbus_bindings.bus_name_has_owner(bus.get_connection(), 'org.gnome.Rhythmbox'): - rbshellobj = bus.get_object('org.gnome.Rhythmbox', '/org/gnome/Rhythmbox/Shell') + rbshellobj = bus.get_object('org.gnome.Rhythmbox', + '/org/gnome/Rhythmbox/Shell') player = dbus.Interface( - bus.get_object('org.gnome.Rhythmbox', '/org/gnome/Rhythmbox/Player'), - 'org.gnome.Rhythmbox.Player') + bus.get_object('org.gnome.Rhythmbox', + '/org/gnome/Rhythmbox/Player'), 'org.gnome.Rhythmbox.Player') rbshell = dbus.Interface(rbshellobj, 'org.gnome.Rhythmbox.Shell') uri = player.getPlayingUri() props = rbshell.getSongProperties(uri) info = self._rhythmbox_properties_extract(props) + self._last_playing_music = info return info return None @@ -107,7 +143,10 @@ class MusicTrackListener(gobject.GObject): # here we test :) if __name__ == '__main__': def music_track_change_cb(listener, music_track_info): - print music_track_info.title + if music_track_info is None: + print "Stop!" + else: + print music_track_info.title listener = MusicTrackListener.get() listener.connect('music-track-changed', music_track_change_cb) track = listener.get_playing_track() diff --git a/src/roster_window.py b/src/roster_window.py index 4100e54b3..2af1eef9f 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -691,8 +691,11 @@ class RosterWindow: xml_console_menuitem.connect('activate', self.on_xml_console_menuitem_activate, account) - privacy_lists_menuitem.connect('activate', - self.on_privacy_lists_menuitem_activate, account) + if gajim.connections[account] and gajim.connections[account].privacy_rules_supported: + privacy_lists_menuitem.connect('activate', + self.on_privacy_lists_menuitem_activate, account) + else: + privacy_lists_menuitem.set_sensitive(False) send_server_message_menuitem.connect('activate', self.on_send_server_message_menuitem_activate, account) @@ -2469,6 +2472,11 @@ _('If "%s" accepts this request you will know his or her status.') % jid) {'title': music_track_info.title, 'artist': music_track_info.artist } for acct in accounts: + if not gajim.config.get_per('accounts', acct, + 'sync_with_global_status'): + continue + if not gajim.connections[acct].connected: + continue current_show = gajim.SHOW_LIST[gajim.connections[acct].connected] self.send_status(acct, current_show, status_message) diff --git a/src/systraywin32.py b/src/systraywin32.py index c758247e0..2705897f7 100644 --- a/src/systraywin32.py +++ b/src/systraywin32.py @@ -275,10 +275,7 @@ class SystrayWin32(systray.Systray): def load_icos(self): '''load .ico files and return them to a dic of SHOW --> img_obj''' - iconset = str(gajim.config.get('iconset')) - if not iconset: - iconset = 'dcraven' - + iconset = gajim.config.get('iconset') imgs = {} path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16', 'icos') # icon folder for missing icons