Changeset 282

Show
Ignore:
Timestamp:
06/04/06 15:28:18 (2 years ago)
Author:
nicfit
Message:

Merged revisions 236,239-240,242,244-245,247-251,254-255,257-261,272-276,278-281 via svnmerge from
svn://puddy.nicfit.lan/mesk/branches/0.1

........

r280 | nicfit | 2006-06-04 14:52:24 -0600 (Sun, 04 Jun 2006) | 2 lines


Show album in status message along with artist/title

........

r281 | nicfit | 2006-06-04 15:02:29 -0600 (Sun, 04 Jun 2006) | 2 lines


New ebuild and stuff

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk

    • Property svnmerge-integrated changed from /mesk/branches/0.1:1-236,238-240,242,244-245,247-278 to /mesk/branches/0.1:1-236,238-240,242,244-245,247-281

  • trunk/Makefile.in

    r279 r282  
    123123        -find . -name \*.gladep -exec rm {} \; 
    124124        -rm Makefile 
    125         ${MAKE} -C po distclean 
     125        -${MAKE} -C po distclean 
    126126 
    127 maintainer-clean: distclean 
     127maintainer-clean: 
     128        -${MAKE} -C po maintainer-clean 
     129        ${MAKE} distclean 
    128130        -rm README 
    129131        -rm -f configure 
    …… 
    131133        -rm tags 
    132134        -rm ./etc/mesk.desktop 
    133         ${MAKE} -C po maintainer-clean 
    134135 
    135136WIKI_README=http://trac.nicfit.net/wiki/Installation?format=txt 

  • trunk/po/es.po

    r275 r282  
    88"Project-Id-Version: 0.1.1\n" 
    99"Report-Msgid-Bugs-To: \n" 
    10 "POT-Creation-Date: 2006-06-03 14:30-0600\n" 
     10"POT-Creation-Date: 2006-06-03 22:25-0600\n" 
    1111"PO-Revision-Date: 2006-04-15 17:38-0600\n" 
    1212"Last-Translator: Travis Shirk <travis@pobox.com>\n" 

  • trunk/po/mesk.pot

    r273 r282  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2006-06-03 14:30-0600\n" 
     11"POT-Creation-Date: 2006-06-03 22:25-0600\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 

  • trunk/src/plugins/gajimstatus.py

    r224 r282  
    4141UPDATE_STATUS_STATES = ['chat', 'online', 'dnd'] 
    4242NOW_PLAYING_HEADER = '\nnp: ' 
    43 NOW_PLAYING_MIDDLE = ' - ' 
     43NOW_PLAYING_DELIM = ' - ' 
    4444NOW_PLAYING_FOOTER = '\n' 
    4545NOW_PLAYING_FORMAT = \ 
    46   '%(header)s%(artist)s%(middle)s%(title)s%(state)s%(footer)s' 
     46'%(header)s%(artist)s%(middle)s%(title)s%(middle)s%(album)s%(state)s%(footer)s' 
    4747 
    4848class GajimStatusPlugin(Plugin, AudioControlListener):  
    …… 
    7171        now_playing_regex = re.compile('%(header)s.*%(middle)s.*%(footer)s' % \ 
    7272                                       {'header': NOW_PLAYING_HEADER, 
    73                                         'middle': NOW_PLAYING_MIDDLE, 
     73                                        'middle': NOW_PLAYING_DELIM, 
    7474                                        'footer': NOW_PLAYING_FOOTER, 
    7575                                       }) 
    …… 
    108108           title = audio_src.meta_data.title.encode('utf-8') 
    109109           artist = audio_src.meta_data.artist.encode('utf-8') 
     110           album = audio_src.meta_data.album.encode('utf-8') 
    110111 
    111112           now_playing = NOW_PLAYING_FORMAT % \ 
    112113                         {'header': NOW_PLAYING_HEADER, 
    113114                          'title': title, 
    114                           'middle': NOW_PLAYING_MIDDLE, 
     115                          'middle': NOW_PLAYING_DELIM, 
    115116                          'artist': artist, 
     117                          'album': album, 
    116118                          'state': state_str, 
    117119                          'footer': NOW_PLAYING_FOOTER,