changeset a4060f48867c in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=a4060f48867c
description: merge backout branch
diffstat:
THANKS.artists | 2 ++
data/iconsets/wroop/16x16/away.png |
data/iconsets/wroop/16x16/chat.png |
data/iconsets/wroop/16x16/closed.png |
data/iconsets/wroop/16x16/connecting.gif |
data/iconsets/wroop/16x16/dnd.png |
data/iconsets/wroop/16x16/error.png |
data/iconsets/wroop/16x16/event.gif |
data/iconsets/wroop/16x16/invisible.png |
data/iconsets/wroop/16x16/muc_active.png |
data/iconsets/wroop/16x16/muc_inactive.png |
data/iconsets/wroop/16x16/not_in_roster.png |
data/iconsets/wroop/16x16/offline.png |
data/iconsets/wroop/16x16/online.png |
data/iconsets/wroop/16x16/opened.png |
data/iconsets/wroop/16x16/requested.png |
data/iconsets/wroop/16x16/xa.png |
data/iconsets/wroop/32x32/away.png |
data/iconsets/wroop/32x32/chat.png |
data/iconsets/wroop/32x32/dnd.png |
data/iconsets/wroop/32x32/error.png |
data/iconsets/wroop/32x32/invisible.png |
data/iconsets/wroop/32x32/muc_active.png |
data/iconsets/wroop/32x32/muc_inactive.png |
data/iconsets/wroop/32x32/not_in_roster.png |
data/iconsets/wroop/32x32/offline.png |
data/iconsets/wroop/32x32/online.png |
data/iconsets/wroop/32x32/requested.png |
data/iconsets/wroop/32x32/xa.png |
data/iconsets/wroop/48x48/away.png |
data/iconsets/wroop/48x48/chat.png |
data/iconsets/wroop/48x48/dnd.png |
data/iconsets/wroop/48x48/error.png |
data/iconsets/wroop/48x48/invisible.png |
data/iconsets/wroop/48x48/muc_active.png |
data/iconsets/wroop/48x48/muc_inactive.png |
data/iconsets/wroop/48x48/not_in_roster.png |
data/iconsets/wroop/48x48/offline.png |
data/iconsets/wroop/48x48/online.png |
data/iconsets/wroop/48x48/requested.png |
data/iconsets/wroop/48x48/xa.png |
gajim.nsi | 6 ++++++
src/groupchat_control.py | 2 +-
43 files changed, 9 insertions(+), 1 deletions(-)
diffs (128 lines):
diff -r 06d290afda2f -r a4060f48867c THANKS.artists
--- a/THANKS.artists Sun Nov 01 12:14:42 2009 +0100
+++ b/THANKS.artists Sun Nov 01 12:15:41 2009 +0100
@@ -2,7 +2,9 @@
Christophe Got
Dennis Craven
Guillaume Morin
+Gvorcek Spajreh
Josef Vybíral
Membris Khan
Rederick Asher
Jakub Szypulka
+
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/16x16/away.png
Binary file data/iconsets/wroop/16x16/away.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/16x16/chat.png
Binary file data/iconsets/wroop/16x16/chat.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/16x16/closed.png
Binary file data/iconsets/wroop/16x16/closed.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/16x16/connecting.gif
Binary file data/iconsets/wroop/16x16/connecting.gif has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/16x16/dnd.png
Binary file data/iconsets/wroop/16x16/dnd.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/16x16/error.png
Binary file data/iconsets/wroop/16x16/error.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/16x16/event.gif
Binary file data/iconsets/wroop/16x16/event.gif has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/16x16/invisible.png
Binary file data/iconsets/wroop/16x16/invisible.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/16x16/muc_active.png
Binary file data/iconsets/wroop/16x16/muc_active.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/16x16/muc_inactive.png
Binary file data/iconsets/wroop/16x16/muc_inactive.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/16x16/not_in_roster.png
Binary file data/iconsets/wroop/16x16/not_in_roster.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/16x16/offline.png
Binary file data/iconsets/wroop/16x16/offline.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/16x16/online.png
Binary file data/iconsets/wroop/16x16/online.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/16x16/opened.png
Binary file data/iconsets/wroop/16x16/opened.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/16x16/requested.png
Binary file data/iconsets/wroop/16x16/requested.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/16x16/xa.png
Binary file data/iconsets/wroop/16x16/xa.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/32x32/away.png
Binary file data/iconsets/wroop/32x32/away.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/32x32/chat.png
Binary file data/iconsets/wroop/32x32/chat.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/32x32/dnd.png
Binary file data/iconsets/wroop/32x32/dnd.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/32x32/error.png
Binary file data/iconsets/wroop/32x32/error.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/32x32/invisible.png
Binary file data/iconsets/wroop/32x32/invisible.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/32x32/muc_active.png
Binary file data/iconsets/wroop/32x32/muc_active.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/32x32/muc_inactive.png
Binary file data/iconsets/wroop/32x32/muc_inactive.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/32x32/not_in_roster.png
Binary file data/iconsets/wroop/32x32/not_in_roster.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/32x32/offline.png
Binary file data/iconsets/wroop/32x32/offline.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/32x32/online.png
Binary file data/iconsets/wroop/32x32/online.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/32x32/requested.png
Binary file data/iconsets/wroop/32x32/requested.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/32x32/xa.png
Binary file data/iconsets/wroop/32x32/xa.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/48x48/away.png
Binary file data/iconsets/wroop/48x48/away.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/48x48/chat.png
Binary file data/iconsets/wroop/48x48/chat.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/48x48/dnd.png
Binary file data/iconsets/wroop/48x48/dnd.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/48x48/error.png
Binary file data/iconsets/wroop/48x48/error.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/48x48/invisible.png
Binary file data/iconsets/wroop/48x48/invisible.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/48x48/muc_active.png
Binary file data/iconsets/wroop/48x48/muc_active.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/48x48/muc_inactive.png
Binary file data/iconsets/wroop/48x48/muc_inactive.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/48x48/not_in_roster.png
Binary file data/iconsets/wroop/48x48/not_in_roster.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/48x48/offline.png
Binary file data/iconsets/wroop/48x48/offline.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/48x48/online.png
Binary file data/iconsets/wroop/48x48/online.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/48x48/requested.png
Binary file data/iconsets/wroop/48x48/requested.png has changed
diff -r 06d290afda2f -r a4060f48867c data/iconsets/wroop/48x48/xa.png
Binary file data/iconsets/wroop/48x48/xa.png has changed
diff -r 06d290afda2f -r a4060f48867c gajim.nsi
--- a/gajim.nsi Sun Nov 01 12:14:42 2009 +0100
+++ b/gajim.nsi Sun Nov 01 12:15:41 2009 +0100
@@ -286,6 +286,11 @@
File /r "data\iconsets\sun"
SectionEnd
+Section "wroop" SecIconsetsSun
+ SetOutPath "$INSTDIR\data\iconsets"
+ File /r "data\iconsets\wroop"
+SectionEnd
+
Section "transports" SecIconsetsTransports
SetOutPath "$INSTDIR\data\iconsets"
File /r "data\iconsets\transports"
@@ -692,6 +697,7 @@
RMDir /r "$INSTDIR\data\iconsets\gota"
RMDir /r "$INSTDIR\data\iconsets\jabberbulb"
RMDir /r "$INSTDIR\data\iconsets\sun"
+ RMDir /r "$INSTDIR\data\iconsets\wroop"
RMDir /r "$INSTDIR\data\iconsets\transports"
RMDir "$INSTDIR\data\iconsets"
RMDir "$INSTDIR\data"
diff -r 06d290afda2f -r a4060f48867c src/groupchat_control.py
--- a/src/groupchat_control.py Sun Nov 01 12:14:42 2009 +0100
+++ b/src/groupchat_control.py Sun Nov 01 12:15:41 2009 +0100
@@ -647,7 +647,7 @@
bookmark_separator = xml.get_widget('bookmark_separator')
separatormenuitem2 = xml.get_widget('separatormenuitem2')
- if hide_buttonbar_entries:
+ if hide_buttonbar_items:
change_nick_menuitem.hide()
change_subject_menuitem.hide()
bookmark_room_menuitem.hide()
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
