← Back to branch summary

~ubuntu-branches/ubuntu/quantal/cairo-dock-plug-ins/quantal-201208191523

« back to all changes in this revision

Viewing changes to musicPlayer/src/applet-draw.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2010-09-07 02:38:17 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20100907023817-ish9a53i2wn0m7zg
Tags: 2.2.0~0rc1-0ubuntu1
https://launchpad.net/bugs/632054
https://launchpad.net/bugs/616176
https://launchpad.net/bugs/604034
https://launchpad.net/bugs/582452
* New Upstream Version (LP: #632054)
* Fixed a few bugs on LP:
 - LP: #616176 Dust Bin Hang and Incorrect Configuration
 - LP: #604034 Change terminal tab's name lost the color
 - LP: #582452 GMenu does not contain any applications
* Fixed a few bugs on glx-dock forum:
 - Fixed support of GMusicBrowser.
 - AlsaMixer has no emblem.
 - Status-Notifier doesn't be drawed into the dock.
* Updated translations
* debian/control:
 - Added cairo-dock-core as build-depends in order to prevent
   some builds errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
musicPlayer/src/applet-draw.c
244
244
                                cd_musicplayer_popup_info ();
245
245
                        }
246
246
                }
247
 
                else
 
247
                /**else
248
248
                {
249
249
                        cd_musicplayer_set_surface (PLAYER_STOPPED);
250
250
                        CD_APPLET_SET_NAME_FOR_MY_ICON (myData.cTitle ? myData.cTitle : myData.pCurrentHandeler ? myData.pCurrentHandeler->name : myConfig.cDefaultTitle);
251
 
                }
 
251
                }*/
252
252
                
253
253
                //Affichage de la couverture de l'album.
254
254
                if (myData.iSidCheckCover != 0)  // on stoppe la precedente boucle de verification de la couverture.
328
328
                        str);
329
329
        }
330
330
        else if (myData.iPlayingStatus == PLAYER_PLAYING || myData.iPlayingStatus == PLAYER_PAUSED)
331
 
                cairo_dock_show_temporary_dialog_with_icon_printf ("%s : %s\n%s : %s\n%s : %s\n%s : %d:%02d\n%s %d, %s %d/%d",
 
331
                cairo_dock_show_temporary_dialog_with_icon_printf ("%s: %s\n%s: %s\n%s: %s\n%s: %d:%02d\n%s %d, %s %d/%d",
332
332
                        myIcon,
333
333
                        myContainer,
334
334
                        myConfig.iDialogDuration,
335
335
                        MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE,
336
336
                        D_("Artist"),
337
337
                        myData.cArtist != NULL ? myData.cArtist : D_("Unknown"),
 
338
                        D_("Title"),
 
339
                        myData.cTitle != NULL ? myData.cTitle : D_("Unknown"),
338
340
                        D_("Album"),
339
341
                        myData.cAlbum != NULL ? myData.cAlbum : D_("Unknown"),
340
 
                        D_("Title"),
341
 
                        myData.cTitle != NULL ? myData.cTitle : D_("Unknown"),
342
342
                        D_("Length"),
343
343
                        myData.iSongLength/60, myData.iSongLength%60,  // les chansons de plus d'1h, c'est rare !
344
344
                        D_("Track n°"), myData.iTrackNumber,