Hello community, here is the log from the commit of package pragha for openSUSE:Factory checked in at 2012-06-25 11:59:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pragha (Old) and /work/SRC/openSUSE:Factory/.pragha.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pragha", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/pragha/pragha.changes 2012-06-18 14:52:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pragha.new/pragha.changes 2012-06-25 12:00:05.000000000 +0200 @@ -1,0 +2,24 @@ +Wed Jun 20 15:03:29 UTC 2012 - [email protected] + +- Add pragha-1.1.0.1-cover_musicbrainz.patch: also search covers in + MusicBrainz (https://github.com/matiasdelellis/pragha/issues/28). + +------------------------------------------------------------------- +Wed Jun 20 10:50:01 UTC 2012 - [email protected] + +- Add pragha-1.1.0.1-russian.patch: correct Russian translation. + +------------------------------------------------------------------- +Wed Jun 20 07:38:40 UTC 2012 - [email protected] + +- Update to 1.1.0.1. + * Bugs fixed: + + Fix crash when try to crop playlist with accelerator. + + GUI: take ownership of images in the right way. + + Fix build on i586. + + MPRIS: fix crash in Player.Seek. + + MPRIS: don't use constants from libdbus. + * Update German translation. +- Drop pragha-1.1.0-i586.patch (fixed upstream). + +------------------------------------------------------------------- Old: ---- pragha-1.1.0-i586.patch pragha-1.1.0.tar.bz2 New: ---- pragha-1.1.0.1-cover_musicbrainz.patch pragha-1.1.0.1-russian.patch pragha-1.1.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pragha.spec ++++++ --- /var/tmp/diff_new_pack.a1A1a7/_old 2012-06-25 12:00:11.000000000 +0200 +++ /var/tmp/diff_new_pack.a1A1a7/_new 2012-06-25 12:00:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: pragha -Version: 1.1.0 +Version: 1.1.0.1 Release: 0 Summary: Lightweight Music Player License: GPL-3.0+ @@ -26,8 +26,10 @@ Source0: https://github.com/downloads/matiasdelellis/%{name}/%{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE pragha-1.0.2-pixdir.patch [email protected] -- install icons into program dir, not into system one Patch0: pragha-1.0.2-pixdir.patch -# PATCH-FIX-UPSTREAM pragha-1.1.0-i586.patch https://github.com/matiasdelellis/pragha/issues/31 -- fix build in i586 -Patch1: pragha-1.1.0-i586.patch +# PATCH-FIX-UPSTREAM pragha-1.1.0.1-russian.patch [email protected] -- correct Russian translation +Patch1: pragha-1.1.0.1-russian.patch +# PATCH-FIX-UPSTREAM pragha-1.1.0.1-cover_musicbrainz.patch https://github.com/matiasdelellis/pragha/issues/28 -- also search covers in MusicBrainz +Patch2: pragha-1.1.0.1-cover_musicbrainz.patch BuildRequires: ImageMagick BuildRequires: autoconf BuildRequires: fdupes @@ -84,7 +86,8 @@ %prep %setup -q %patch0 -%patch1 -p1 +%patch1 +%patch2 %build %configure ++++++ pragha-1.1.0.1-cover_musicbrainz.patch ++++++ Index: src/glyr-related.c =================================================================== --- src/glyr-related.c.orig +++ src/glyr-related.c @@ -350,7 +350,7 @@ void related_get_album_art_handler (stru glyr_query_init(&glyr_info->query); glyr_opt_type(&glyr_info->query, GLYR_GET_COVERART); - glyr_opt_from(&glyr_info->query, "lastfm"); + glyr_opt_from(&glyr_info->query, "lastfm;musicbrainz"); glyr_opt_artist(&glyr_info->query, artist); glyr_opt_album(&glyr_info->query, album); ++++++ pragha-1.1.0.1-russian.patch ++++++ Index: po/ru.po =================================================================== --- po/ru.po.orig +++ po/ru.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Pragha\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=glib&keywords=I18N+L10N&component=general\n"; "POT-Creation-Date: 2012-06-14 23:01-0300\n" -"PO-Revision-Date: 2012-06-15 09:18+0000\n" +"PO-Revision-Date: 2012-06-20 09:48+0000\n" "Last-Translator: Kyrill Detinov <[email protected]>\n" "Language-Team: LANGUAGE <[email protected]>\n" "MIME-Version: 1.0\n" @@ -20,11 +20,11 @@ msgstr "" #: ../src/gui.c:212 msgid "_Playback" -msgstr "_Воспроизведение" +msgstr "В_оспроизведение" #: ../src/gui.c:213 msgid "Play_list" -msgstr "Список_воспроизведения" +msgstr "_Плейлист" #: ../src/gui.c:214 msgid "_View" ++++++ pragha-1.1.0.tar.bz2 -> pragha-1.1.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pragha-1.1.0/NEWS new/pragha-1.1.0.1/NEWS --- old/pragha-1.1.0/NEWS 2012-06-16 15:05:42.000000000 +0200 +++ new/pragha-1.1.0.1/NEWS 2012-06-19 16:49:06.000000000 +0200 @@ -2,6 +2,19 @@ Overview of changes in Pragha 1.1.0 since 1.0.2 ============================================================== +V1.1.0.1 + +Bugs fixed: + Fix crash when try to crop playlist with accelerator!. + * And probably many other crashs. + gui: take ownership of images in the right way. + fix build on i586. See github issue #31 + mpris: fix crash in Player.Seek + mpris: don't use constants from libdbus. + +Updates Translations: + Update german translation thanks to cwickert. + V1.1.0 News: Suggest import XDG_MUSIC_DIR to library on first start thanks to Pavel Vasin. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pragha-1.1.0/configure new/pragha-1.1.0.1/configure --- old/pragha-1.1.0/configure 2012-06-16 14:53:51.000000000 +0200 +++ new/pragha-1.1.0.1/configure 2012-06-19 23:58:10.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for pragha 1.1.0. +# Generated by GNU Autoconf 2.68 for pragha 1.1.0.1. # # Report bugs to <[email protected]>. # @@ -573,8 +573,8 @@ # Identity of this package. PACKAGE_NAME='pragha' PACKAGE_TARNAME='pragha' -PACKAGE_VERSION='1.1.0' -PACKAGE_STRING='pragha 1.1.0' +PACKAGE_VERSION='1.1.0.1' +PACKAGE_STRING='pragha 1.1.0.1' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1432,7 +1432,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pragha 1.1.0 to adapt to many kinds of systems. +\`configure' configures pragha 1.1.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1502,7 +1502,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pragha 1.1.0:";; + short | recursive ) echo "Configuration of pragha 1.1.0.1:";; esac cat <<\_ACEOF @@ -1649,7 +1649,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pragha configure 1.1.0 +pragha configure 1.1.0.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2021,7 +2021,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pragha $as_me 1.1.0, which was +It was created by pragha $as_me 1.1.0.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2839,7 +2839,7 @@ # Define the identity of the package. PACKAGE='pragha' - VERSION='1.1.0' + VERSION='1.1.0.1' cat >>confdefs.h <<_ACEOF @@ -17366,7 +17366,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pragha $as_me 1.1.0, which was +This file was extended by pragha $as_me 1.1.0.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17432,7 +17432,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pragha config.status 1.1.0 +pragha config.status 1.1.0.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pragha-1.1.0/configure.ac new/pragha-1.1.0.1/configure.ac --- old/pragha-1.1.0/configure.ac 2012-06-16 14:53:31.000000000 +0200 +++ new/pragha-1.1.0.1/configure.ac 2012-06-19 23:57:00.000000000 +0200 @@ -6,7 +6,7 @@ dnl Version information m4_define([pragha_version_major], [1]) m4_define([pragha_version_minor], [1]) -m4_define([pragha_version_micro], [0]) +m4_define([pragha_version_micro], [0.1]) m4_define([pragha_version], [pragha_version_major().pragha_version_minor().pragha_version_micro()]) dnl Initialize autoconf Files old/pragha-1.1.0/po/de.gmo and new/pragha-1.1.0.1/po/de.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pragha-1.1.0/po/de.po new/pragha-1.1.0.1/po/de.po --- old/pragha-1.1.0/po/de.po 2012-06-16 14:55:34.000000000 +0200 +++ new/pragha-1.1.0.1/po/de.po 2012-06-19 23:47:28.000000000 +0200 @@ -11,8 +11,8 @@ "Project-Id-Version: Pragha\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=glib&keywords=I18N+L10N&component=general\n"; "POT-Creation-Date: 2012-06-14 23:01-0300\n" -"PO-Revision-Date: 2012-06-15 02:02+0000\n" -"Last-Translator: matias <[email protected]>\n" +"PO-Revision-Date: 2012-06-17 23:17+0000\n" +"Last-Translator: Christoph Wickert <[email protected]>\n" "Language-Team: LANGUAGE <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,11 +22,11 @@ #: ../src/gui.c:212 msgid "_Playback" -msgstr "" +msgstr "_Wiedergabe" #: ../src/gui.c:213 msgid "Play_list" -msgstr "" +msgstr "Wiedergabe_liste" #: ../src/gui.c:214 msgid "_View" @@ -206,7 +206,7 @@ #: ../src/gui.c:332 msgid "_Add the library" -msgstr "" +msgstr "_Zur Bibliothek hinzufügen" #: ../src/gui.c:345 msgid "Add to playback queue" @@ -477,37 +477,37 @@ #: ../src/current-playlist.c:2242 #, c-format msgid "Copy \"%i\" to selected track numbers" -msgstr "" +msgstr "»%i« zu ausgewählten Spuren kopieren" #: ../src/current-playlist.c:2248 #, c-format msgid "Copy \"%s\" to selected titles" -msgstr "" +msgstr "»%s« zu ausgewählten Titeln kopieren" #: ../src/current-playlist.c:2254 #, c-format msgid "Copy \"%s\" to selected artists" -msgstr "" +msgstr "»%s« zu ausgewählten Künstlern kopieren" #: ../src/current-playlist.c:2260 #, c-format msgid "Copy \"%s\" to selected albums" -msgstr "" +msgstr "»%s« zu ausgewählten Alben kopieren" #: ../src/current-playlist.c:2266 #, c-format msgid "Copy \"%s\" to selected genres" -msgstr "" +msgstr "»%s« zu ausgewählten Genres kopieren" #: ../src/current-playlist.c:2272 #, c-format msgid "Copy \"%i\" to selected years" -msgstr "" +msgstr "»%i« zu ausgewählten Jahren kopieren" #: ../src/current-playlist.c:2278 #, c-format msgid "Copy \"%s\" to selected comments" -msgstr "" +msgstr "»%s« zu ausgewählten Kommentaren kopieren" #: ../src/librarytree.c:197 ../src/statusicon.c:134 msgid "Unknown Artist" @@ -570,13 +570,13 @@ #, c-format msgid "" "Do you want to set the track number of ALL of the selected tracks to: %d ?" -msgstr "" +msgstr "Soll die Nummer für <i>alle</i> ausgewählten Titel zu %d geändert werden?" #: ../src/tags.c:212 #, c-format msgid "" "Do you want to set the title tag of ALL of the selected tracks to: %s ?" -msgstr "" +msgstr "Soll der Name für <i>alle</i> ausgewählten Titel zu %s geändert werden?" #: ../src/tags.c:488 msgid "Selection to" @@ -705,7 +705,7 @@ #: ../src/pref.c:1721 msgid "Search approximate words" -msgstr "" +msgstr "Ähnliche Wörter suchen" #: ../src/pref.c:1725 msgid "Remember last window state" @@ -759,7 +759,7 @@ #. Services CDDB #: ../src/pref.c:1817 msgid "Connect to CDDB server" -msgstr "Mit dem CDDB-Server verbinden" +msgstr "Mit CDDB-Server verbinden" #. Services MPRIS2 #: ../src/pref.c:1821 @@ -940,4 +940,4 @@ #: ../src/info-bar-import-music.c:62 #, c-format msgid "Would you like to import %s to library?" -msgstr "" +msgstr "Soll »%s« zur Bibliothek hinzugefügt werden?" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pragha-1.1.0/po/pragha.pot new/pragha-1.1.0.1/po/pragha.pot --- old/pragha-1.1.0/po/pragha.pot 2012-06-16 15:10:30.000000000 +0200 +++ new/pragha-1.1.0.1/po/pragha.pot 2012-06-19 23:59:48.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; "product=glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-06-16 10:10-0300\n" +"POT-Creation-Date: 2012-06-19 18:59-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pragha-1.1.0/src/gui.c new/pragha-1.1.0.1/src/gui.c --- old/pragha-1.1.0/src/gui.c 2012-06-15 03:56:55.000000000 +0200 +++ new/pragha-1.1.0.1/src/gui.c 2012-06-19 16:39:42.000000000 +0200 @@ -217,15 +217,15 @@ {"Add files", GTK_STOCK_OPEN, N_("_Add files"), NULL, N_("Open a media file"), G_CALLBACK(open_file_action)}, {"Add Audio CD", GTK_STOCK_CDROM, N_("Add Audio _CD"), - NULL, "Append a Audio CD", G_CALLBACK(add_audio_cd_action)}, + "", "Append a Audio CD", G_CALLBACK(add_audio_cd_action)}, {"Add location", GTK_STOCK_NETWORK, N_("Add _location"), - NULL, "Add a no local stream", G_CALLBACK(add_location_action)}, + "", "Add a no local stream", G_CALLBACK(add_location_action)}, {"Prev", GTK_STOCK_MEDIA_PREVIOUS, N_("Prev track"), "<Alt>Left", "Prev track", G_CALLBACK(prev_action)}, {"Play_pause", GTK_STOCK_MEDIA_PLAY, N_("Play / Pause"), "<Control>space", "Play / Pause", G_CALLBACK(play_pause_action)}, {"Stop", GTK_STOCK_MEDIA_STOP, N_("Stop"), - NULL, "Stop", G_CALLBACK(stop_action)}, + "", "Stop", G_CALLBACK(stop_action)}, {"Next", GTK_STOCK_MEDIA_NEXT, N_("Next track"), "<Alt>Right", "Next track", G_CALLBACK(next_action)}, {"Edit tags", GTK_STOCK_EDIT, N_("Edit track information"), @@ -233,7 +233,7 @@ {"Quit", GTK_STOCK_QUIT, N_("_Quit"), "<Control>Q", "Quit pragha", G_CALLBACK(quit_action)}, {"Remove from playlist", GTK_STOCK_REMOVE, N_("Remove selection from playlist"), - NULL, "Remove selection from playlist", G_CALLBACK(remove_from_playlist)}, + "", "Remove selection from playlist", G_CALLBACK(remove_from_playlist)}, {"Crop playlist", GTK_STOCK_REMOVE, N_("Crop playlist"), "<Control>C", "Crop playlist", G_CALLBACK(crop_current_playlist)}, {"Clear playlist", GTK_STOCK_CLEAR, N_("Clear playlist"), @@ -247,58 +247,58 @@ {"Jump to playing song", GTK_STOCK_JUMP_TO, N_("Jump to playing song"), "<Control>J", "Jump to playing song", G_CALLBACK(jump_to_playing_song_action)}, {"Equalizer", NULL, N_("E_qualizer"), - NULL, "Equalizer", G_CALLBACK(show_equalizer_action)}, + "", "Equalizer", G_CALLBACK(show_equalizer_action)}, #ifdef HAVE_LIBGLYR {"Search lyric", GTK_STOCK_JUSTIFY_FILL, N_("Search _lyric"), "<Control>Y", "Search lyric", G_CALLBACK(related_get_lyric_action)}, {"Search artist info", GTK_STOCK_INFO, N_("Search _artist info"), - NULL, "Search artist info", G_CALLBACK(related_get_artist_info_action)}, + "", "Search artist info", G_CALLBACK(related_get_artist_info_action)}, #else {"Search lyric", GTK_STOCK_JUSTIFY_FILL, N_("Search _lyric"), "<Control>Y", "Search lyric", NULL}, {"Search artist info", GTK_STOCK_INFO, N_("Search _artist info"), - NULL, "Search artist info", NULL}, + "", "Search artist info", NULL}, #endif {"Lastfm", NULL, N_("_Lastfm")}, #ifdef HAVE_LIBCLASTFM {"Love track", NULL, N_("Love track"), - NULL, "Love track", G_CALLBACK(lastfm_track_love_action)}, + "", "Love track", G_CALLBACK(lastfm_track_love_action)}, {"Unlove track", NULL, N_("Unlove track"), - NULL, "Unlove track", G_CALLBACK(lastfm_track_unlove_action)}, + "", "Unlove track", G_CALLBACK(lastfm_track_unlove_action)}, {"Import a XSPF playlist", NULL, N_("Import a XSPF playlist"), - NULL, "Import a XSPF playlist", G_CALLBACK(lastfm_import_xspf_action)}, + "", "Import a XSPF playlist", G_CALLBACK(lastfm_import_xspf_action)}, {"Add favorites", NULL, N_("Add favorites"), - NULL, "Add favorites", G_CALLBACK(lastfm_add_favorites_action)}, + "", "Add favorites", G_CALLBACK(lastfm_add_favorites_action)}, {"Add similar", NULL, N_("Add similar"), - NULL, "Add similar", G_CALLBACK(lastfm_get_similar_action)}, + "", "Add similar", G_CALLBACK(lastfm_get_similar_action)}, #else {"Love track", NULL, N_("Love track"), - NULL, "Love track", NULL}, + "", "Love track", NULL}, {"Unlove track", NULL, N_("Unlove track"), - NULL, "Unlove track", NULL}, + "", "Unlove track", NULL}, {"Import a XSPF playlist", NULL, N_("Import a XSPF playlist"), - NULL, "Import a XSPF playlist", NULL}, + "", "Import a XSPF playlist", NULL}, {"Add favorites", NULL, N_("Add favorites"), - NULL, "Add favorites", NULL}, + "", "Add favorites", NULL}, {"Add similar", NULL, N_("Add similar"), - NULL, "Add similar", NULL}, + "", "Add similar", NULL}, #endif {"Rescan library", GTK_STOCK_EXECUTE, N_("_Rescan library"), - NULL, "Rescan library", G_CALLBACK(rescan_library_action)}, + "", "Rescan library", G_CALLBACK(rescan_library_action)}, {"Update library", GTK_STOCK_EXECUTE, N_("_Update library"), - NULL, "Update library", G_CALLBACK(update_library_action)}, + "", "Update library", G_CALLBACK(update_library_action)}, {"Statistics", GTK_STOCK_INFO, N_("_Statistics"), - NULL, "Statistics", G_CALLBACK(statistics_action)}, + "", "Statistics", G_CALLBACK(statistics_action)}, {"Home", GTK_STOCK_HOME, N_("Homepage"), - NULL, "Homepage", G_CALLBACK(home_action)}, + "", "Homepage", G_CALLBACK(home_action)}, {"Community", GTK_STOCK_INFO, N_("Community"), - NULL, "Forum of pragha", G_CALLBACK(community_action)}, + "", "Forum of pragha", G_CALLBACK(community_action)}, {"Wiki", GTK_STOCK_YES, N_("Wiki"), - NULL, "Wiki of pragha", G_CALLBACK(wiki_action)}, + "", "Wiki of pragha", G_CALLBACK(wiki_action)}, {"Translate Pragha", "preferences-desktop-locale", N_("Translate Pragha"), - NULL, "Translate Pragha", G_CALLBACK(translate_action)}, + "", "Translate Pragha", G_CALLBACK(translate_action)}, {"About", GTK_STOCK_ABOUT, N_("About"), - NULL, "About pragha", G_CALLBACK(about_action)}, + "", "About pragha", G_CALLBACK(about_action)}, }; GtkToggleActionEntry toggles_entries[] = { @@ -318,163 +318,163 @@ NULL, "Show playback controls below", G_CALLBACK(show_controls_below_action), FALSE}, {"Status bar", NULL, N_("Status bar"), - NULL, "Status bar", G_CALLBACK(status_bar_action), + "", "Status bar", G_CALLBACK(status_bar_action), TRUE} }; GtkActionEntry cp_null_context_aentries[] = { {"Add files", GTK_STOCK_OPEN, N_("_Add files"), - NULL, N_("Open a media file"), G_CALLBACK(open_file_action)}, + "", N_("Open a media file"), G_CALLBACK(open_file_action)}, {"Add Audio CD", GTK_STOCK_CDROM, N_("Add Audio _CD"), - NULL, "Append a Audio CD", G_CALLBACK(add_audio_cd_action)}, + "", "Append a Audio CD", G_CALLBACK(add_audio_cd_action)}, {"Add location", GTK_STOCK_NETWORK, N_("Add _location"), - NULL, "Add a no local stream", G_CALLBACK(add_location_action)}, + "", "Add a no local stream", G_CALLBACK(add_location_action)}, {"Add the library", GTK_STOCK_ADD, N_("_Add the library"), - NULL, "Add all the library", G_CALLBACK(add_libary_action)}, + "", "Add all the library", G_CALLBACK(add_libary_action)}, {"Quit", GTK_STOCK_QUIT, N_("_Quit"), "<Control>Q", "Quit pragha", G_CALLBACK(quit_action)} }; GtkToggleActionEntry cp_null_toggles_entries[] = { {"Lateral panel", NULL, N_("Lateral _panel"), - NULL, "Lateral panel", G_CALLBACK(library_pane_action), + "", "Lateral panel", G_CALLBACK(library_pane_action), TRUE} }; GtkActionEntry cp_context_aentries[] = { {"Queue track", GTK_STOCK_ADD, N_("Add to playback queue"), - NULL, "Add to playback queue", G_CALLBACK(queue_current_playlist)}, + "", "Add to playback queue", G_CALLBACK(queue_current_playlist)}, {"Dequeue track", GTK_STOCK_REMOVE, N_("Remove to playback queue"), - NULL, "Remove to playback queue", G_CALLBACK(dequeue_current_playlist)}, + "", "Remove to playback queue", G_CALLBACK(dequeue_current_playlist)}, {"Remove from playlist", GTK_STOCK_REMOVE, N_("Remove from playlist"), - NULL, "Remove selection from playlist", G_CALLBACK(remove_from_playlist)}, + "", "Remove selection from playlist", G_CALLBACK(remove_from_playlist)}, {"Crop playlist", GTK_STOCK_REMOVE, N_("Crop playlist"), - NULL, "Remove no telected tracks of playlist", G_CALLBACK(crop_current_playlist)}, + "", "Remove no telected tracks of playlist", G_CALLBACK(crop_current_playlist)}, {"Clear playlist", GTK_STOCK_CLEAR, N_("Clear playlist"), - NULL, "Clear the current playlist", G_CALLBACK(clear_current_playlist)}, + "", "Clear the current playlist", G_CALLBACK(clear_current_playlist)}, {"Add to another playlist", GTK_STOCK_SAVE_AS, N_("Add to another playlist")}, {"Save playlist", GTK_STOCK_SAVE, N_("Save playlist")}, {"ToolsMenu", NULL, N_("_Tools")}, #ifdef HAVE_LIBGLYR {"Search lyric", GTK_STOCK_JUSTIFY_FILL, N_("Search _lyric"), - NULL, "Search lyric", G_CALLBACK(related_get_lyric_current_playlist_action)}, + "", "Search lyric", G_CALLBACK(related_get_lyric_current_playlist_action)}, {"Search artist info", GTK_STOCK_INFO, N_("Search _artist info"), - NULL, "Search artist info", G_CALLBACK(related_get_artist_info_current_playlist_action)}, + "", "Search artist info", G_CALLBACK(related_get_artist_info_current_playlist_action)}, #else {"Search lyric", GTK_STOCK_JUSTIFY_FILL, N_("Search _lyric"), - NULL, "Search lyric", NULL}, + "", "Search lyric", NULL}, {"Search artist info", GTK_STOCK_INFO, N_("Search _artist info"), - NULL, "Search artist info", NULL}, + "", "Search artist info", NULL}, #endif {"Lastfm", NULL, N_("_Lastfm")}, #ifdef HAVE_LIBCLASTFM {"Love track", NULL, N_("Love track"), - NULL, "Love track", G_CALLBACK(lastfm_track_current_playlist_love_action)}, + "", "Love track", G_CALLBACK(lastfm_track_current_playlist_love_action)}, {"Unlove track", NULL, N_("Unlove track"), - NULL, "Unlove track", G_CALLBACK(lastfm_track_current_playlist_unlove_action)}, + "", "Unlove track", G_CALLBACK(lastfm_track_current_playlist_unlove_action)}, {"Add similar", NULL, N_("Add similar"), - NULL, "Add similar", G_CALLBACK(lastfm_get_similar_current_playlist_action)}, + "", "Add similar", G_CALLBACK(lastfm_get_similar_current_playlist_action)}, #else {"Love track", NULL, N_("Love track"), - NULL, "Love track", NULL}, + "", "Love track", NULL}, {"Unlove track", NULL, N_("Unlove track"), - NULL, "Unlove track", NULL}, + "", "Unlove track", NULL}, {"Add similar", NULL, N_("Add similar"), - NULL, "Add similar", NULL}, + "", "Add similar", NULL}, #endif {"Copy tag to selection", GTK_STOCK_COPY, NULL, - NULL, "Copy tag to selection", G_CALLBACK(copy_tags_to_selection_action)}, + "", "Copy tag to selection", G_CALLBACK(copy_tags_to_selection_action)}, {"Edit tags", GTK_STOCK_EDIT, N_("Edit track information"), - NULL, "Edit information for this track", G_CALLBACK(edit_tags_current_playlist)} + "", "Edit information for this track", G_CALLBACK(edit_tags_current_playlist)} }; GtkActionEntry playlist_tree_context_aentries[] = { {"Add to current playlist", GTK_STOCK_ADD, N_("_Add to current playlist"), - NULL, "Add to current playlist", G_CALLBACK(library_tree_add_to_playlist_action)}, + "", "Add to current playlist", G_CALLBACK(library_tree_add_to_playlist_action)}, {"Replace current playlist", NULL, N_("_Replace current playlist"), - NULL, "Replace current playlist", G_CALLBACK(library_tree_replace_playlist)}, + "", "Replace current playlist", G_CALLBACK(library_tree_replace_playlist)}, {"Replace and play", GTK_STOCK_MEDIA_PLAY, N_("Replace and _play"), - NULL, "Replace and play", G_CALLBACK(library_tree_replace_and_play)}, + "", "Replace and play", G_CALLBACK(library_tree_replace_and_play)}, {"Rename", NULL, N_("Rename"), - NULL, "Rename", G_CALLBACK(playlist_tree_rename)}, + "", "Rename", G_CALLBACK(playlist_tree_rename)}, {"Delete", GTK_STOCK_REMOVE, N_("Delete"), - NULL, "Delete", G_CALLBACK(playlist_tree_delete)}, + "", "Delete", G_CALLBACK(playlist_tree_delete)}, {"Export", GTK_STOCK_SAVE, N_("Export"), - NULL, "Export", G_CALLBACK(playlist_tree_export)} + "", "Export", G_CALLBACK(playlist_tree_export)} }; GtkActionEntry library_tree_context_aentries[] = { {"Add to current playlist", GTK_STOCK_ADD, N_("_Add to current playlist"), - NULL, "Add to current playlist", G_CALLBACK(library_tree_add_to_playlist_action)}, + "", "Add to current playlist", G_CALLBACK(library_tree_add_to_playlist_action)}, {"Replace current playlist", NULL, N_("_Replace current playlist"), - NULL, "Replace current playlist", G_CALLBACK(library_tree_replace_playlist)}, + "", "Replace current playlist", G_CALLBACK(library_tree_replace_playlist)}, {"Replace and play", GTK_STOCK_MEDIA_PLAY, N_("Replace and _play"), - NULL, "Replace and play", G_CALLBACK(library_tree_replace_and_play)}, + "", "Replace and play", G_CALLBACK(library_tree_replace_and_play)}, {"Edit tags", GTK_STOCK_EDIT, N_("Edit tags"), - NULL, "Edit tags", G_CALLBACK(library_tree_edit_tags)}, + "", "Edit tags", G_CALLBACK(library_tree_edit_tags)}, {"Move to trash", "user-trash", N_("Move to _trash"), - NULL, "Move to trash", G_CALLBACK(library_tree_delete_hdd)}, + "", "Move to trash", G_CALLBACK(library_tree_delete_hdd)}, {"Delete from library", GTK_STOCK_REMOVE, N_("Delete from library"), - NULL, "Delete from library", G_CALLBACK(library_tree_delete_db)} + "", "Delete from library", G_CALLBACK(library_tree_delete_db)} }; GtkActionEntry header_library_tree_context_aentries[] = { {"Add to current playlist", GTK_STOCK_ADD, N_("_Add to current playlist"), - NULL, "Add to current playlist", G_CALLBACK(library_tree_add_to_playlist_action)}, + "", "Add to current playlist", G_CALLBACK(library_tree_add_to_playlist_action)}, {"Replace current playlist", NULL, N_("_Replace current playlist"), - NULL, "Replace current playlist", G_CALLBACK(library_tree_replace_playlist)}, + "", "Replace current playlist", G_CALLBACK(library_tree_replace_playlist)}, {"Replace and play", GTK_STOCK_MEDIA_PLAY, N_("Replace and _play"), - NULL, "Replace and play", G_CALLBACK(library_tree_replace_and_play)}, + "", "Replace and play", G_CALLBACK(library_tree_replace_and_play)}, {"Rescan library", GTK_STOCK_EXECUTE, N_("_Rescan library"), - NULL, "Rescan library", G_CALLBACK(rescan_library_action)}, + "", "Rescan library", G_CALLBACK(rescan_library_action)}, {"Update library", GTK_STOCK_EXECUTE, N_("_Update library"), - NULL, "Update library", G_CALLBACK(update_library_action)} + "", "Update library", G_CALLBACK(update_library_action)} }; GtkActionEntry library_page_context_aentries[] = { {"Expand library", GTK_STOCK_ADD, N_("_Expand library"), - NULL, "Expand the library", G_CALLBACK(expand_all_action)}, + "", "Expand the library", G_CALLBACK(expand_all_action)}, {"Collapse library", GTK_STOCK_REMOVE, N_("_Collapse library"), - NULL, "Collapse the library", G_CALLBACK(collapse_all_action)}, + "", "Collapse the library", G_CALLBACK(collapse_all_action)}, {"folders", GTK_STOCK_REFRESH, N_("Folders structure"), - NULL, "Folders structure", G_CALLBACK(folders_library_tree)}, + "", "Folders structure", G_CALLBACK(folders_library_tree)}, {"artist", GTK_STOCK_REFRESH, N_("Artist"), - NULL, "Artist", G_CALLBACK(artist_library_tree)}, + "", "Artist", G_CALLBACK(artist_library_tree)}, {"album", GTK_STOCK_REFRESH, N_("Album"), - NULL, "Album", G_CALLBACK(album_library_tree)}, + "", "Album", G_CALLBACK(album_library_tree)}, {"genre", GTK_STOCK_REFRESH, N_("Genre"), - NULL, "Genre", G_CALLBACK(genre_library_tree)}, + "", "Genre", G_CALLBACK(genre_library_tree)}, {"artist_album", GTK_STOCK_REFRESH, N_("Artist / Album"), - NULL, "Artist / Album", G_CALLBACK(artist_album_library_tree)}, + "", "Artist / Album", G_CALLBACK(artist_album_library_tree)}, {"genre_album", GTK_STOCK_REFRESH, N_("Genre / Album"), - NULL, "Genre / Album", G_CALLBACK(genre_album_library_tree)}, + "", "Genre / Album", G_CALLBACK(genre_album_library_tree)}, {"genre_artist", GTK_STOCK_REFRESH, N_("Genre / Artist"), - NULL, "Genre / Artist", G_CALLBACK(genre_artist_library_tree)}, + "", "Genre / Artist", G_CALLBACK(genre_artist_library_tree)}, {"genre_artist_album", GTK_STOCK_REFRESH, N_("Genre / Artist / Album"), - NULL, "Genre / Artist / Album", G_CALLBACK(genre_artist_album_library_tree)} + "", "Genre / Artist / Album", G_CALLBACK(genre_artist_album_library_tree)} }; GtkActionEntry systray_menu_aentries[] = { {"About", GTK_STOCK_ABOUT, N_("About"), - NULL, NULL, G_CALLBACK(about_action)}, + "", NULL, G_CALLBACK(about_action)}, {"Add files", GTK_STOCK_OPEN, N_("_Add files"), - NULL, NULL, G_CALLBACK(open_file_action)}, + "", NULL, G_CALLBACK(open_file_action)}, {"Add Audio CD", GTK_STOCK_CDROM, N_("Add Audio _CD"), - NULL, "Append a Audio CD", G_CALLBACK(add_audio_cd_action)}, + "", "Append a Audio CD", G_CALLBACK(add_audio_cd_action)}, {"Add location", GTK_STOCK_NETWORK, N_("Add _location"), - NULL, "Add a no local stream", G_CALLBACK(add_location_action)}, + "", "Add a no local stream", G_CALLBACK(add_location_action)}, {"Prev", GTK_STOCK_MEDIA_PREVIOUS, N_("Prev Track"), - NULL, "Prev Track", G_CALLBACK(systray_prev_action)}, + "", "Prev Track", G_CALLBACK(systray_prev_action)}, {"Play_Pause", GTK_STOCK_MEDIA_PLAY, N_("Play / Pause"), - NULL, "Play / Pause", G_CALLBACK(systray_play_pause_action)}, + "", "Play / Pause", G_CALLBACK(systray_play_pause_action)}, {"Stop", GTK_STOCK_MEDIA_STOP, N_("Stop"), - NULL, "Stop", G_CALLBACK(systray_stop_action)}, + "", "Stop", G_CALLBACK(systray_stop_action)}, {"Next", GTK_STOCK_MEDIA_NEXT, N_("Next Track"), - NULL, "Next Track", G_CALLBACK(systray_next_action)}, + "", "Next Track", G_CALLBACK(systray_next_action)}, {"Edit tags", GTK_STOCK_EDIT, N_("Edit track information"), - NULL, "Edit information of current track", G_CALLBACK(edit_tags_playing_action)}, + "", "Edit information of current track", G_CALLBACK(edit_tags_playing_action)}, {"Quit", GTK_STOCK_QUIT, N_("_Quit"), - NULL, "Quit", G_CALLBACK(systray_quit)} + "", "Quit", G_CALLBACK(systray_quit)} }; GtkTargetEntry tentries[] = { @@ -1509,8 +1509,8 @@ gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_LARGE_TOOLBAR); - g_object_ref(cwin->pixbuf->image_play); - g_object_ref(cwin->pixbuf->image_pause); + g_object_ref_sink (cwin->pixbuf->image_play); + g_object_ref_sink (cwin->pixbuf->image_pause); /* Setup Left control buttons */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pragha-1.1.0/src/mpris.c new/pragha-1.1.0.1/src/mpris.c --- old/pragha-1.1.0/src/mpris.c 2012-06-05 16:30:46.000000000 +0200 +++ new/pragha-1.1.0.1/src/mpris.c 2012-06-17 21:19:17.000000000 +0200 @@ -234,6 +234,12 @@ } static GVariant* mpris_Player_Seek(struct con_win *cwin, GVariant* parameters) { + if (!cwin->cstate->curr_mobj) { + g_dbus_method_invocation_return_error_literal (cwin->cmpris2->method_invocation, + G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Nothing to seek"); + return NULL; + } + gdouble fraction = gtk_progress_bar_get_fraction(GTK_PROGRESS_BAR(cwin->track_progress_bar)); gint seek = cwin->cstate->curr_mobj->tags->length * fraction; gint64 param; @@ -308,16 +314,16 @@ } g_free(uri); } else { - g_dbus_method_invocation_return_dbus_error(cwin->cmpris2->method_invocation, - DBUS_ERROR_FILE_NOT_FOUND, "This file does not play here."); + g_dbus_method_invocation_return_error_literal (cwin->cmpris2->method_invocation, + G_DBUS_ERROR, G_DBUS_ERROR_FILE_NOT_FOUND, "This file does not play here."); } g_free(path); } else { failed = TRUE; } if(failed) - g_dbus_method_invocation_return_dbus_error(cwin->cmpris2->method_invocation, - DBUS_ERROR_INVALID_FILE_CONTENT, "This file does not play here."); + g_dbus_method_invocation_return_error_literal (cwin->cmpris2->method_invocation, + G_DBUS_ERROR, G_DBUS_ERROR_INVALID_FILE_CONTENT, "This file does not play here."); return NULL; } @@ -344,8 +350,8 @@ } static void mpris_Player_put_Rate(struct con_win *cwin, GVariant *value) { - g_dbus_method_invocation_return_dbus_error(cwin->cmpris2->method_invocation, - DBUS_ERROR_NOT_SUPPORTED, "This is not alsaplayer."); + g_dbus_method_invocation_return_error_literal (cwin->cmpris2->method_invocation, + G_DBUS_ERROR, G_DBUS_ERROR_NOT_SUPPORTED, "This is not alsaplayer."); } static GVariant* mpris_Player_get_Shuffle(struct con_win *cwin) { @@ -524,8 +530,8 @@ g_free(found_playlist); } else { - g_dbus_method_invocation_return_dbus_error(cwin->cmpris2->method_invocation, - DBUS_ERROR_INVALID_ARGS, "Unknown or malformed playlist object path."); + g_dbus_method_invocation_return_error_literal (cwin->cmpris2->method_invocation, + G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "Unknown or malformed playlist object path."); } return NULL; @@ -691,8 +697,8 @@ } static GVariant* mpris_TrackList_RemoveTrack(struct con_win *cwin, GVariant* parameters) { - g_dbus_method_invocation_return_dbus_error(cwin->cmpris2->method_invocation, - DBUS_ERROR_NOT_SUPPORTED, "TrackList is read-only."); + g_dbus_method_invocation_return_error_literal (cwin->cmpris2->method_invocation, + G_DBUS_ERROR, G_DBUS_ERROR_NOT_SUPPORTED, "TrackList is read-only."); return NULL; } @@ -709,8 +715,8 @@ current_playlist_row_activated_cb( GTK_TREE_VIEW(cwin->current_playlist), tree_path, NULL, cwin); } else - g_dbus_method_invocation_return_dbus_error(cwin->cmpris2->method_invocation, - DBUS_ERROR_INVALID_ARGS, "Unknown or malformed playlist object path."); + g_dbus_method_invocation_return_error_literal (cwin->cmpris2->method_invocation, + G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "Unknown or malformed playlist object path."); return NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pragha-1.1.0/src/pragha.h new/pragha-1.1.0.1/src/pragha.h --- old/pragha-1.1.0/src/pragha.h 2012-06-15 03:56:55.000000000 +0200 +++ new/pragha-1.1.0.1/src/pragha.h 2012-06-17 21:19:17.000000000 +0200 @@ -94,13 +94,13 @@ /* Some default preferences. */ -#define MIN_WINDOW_WIDTH 0.75 * gdk_screen_width() -#define MIN_WINDOW_HEIGHT 0.75 * gdk_screen_height() +#define MIN_WINDOW_WIDTH (gdk_screen_width() * 3 / 4) +#define MIN_WINDOW_HEIGHT (gdk_screen_height() * 3 / 4) #define DEFAULT_SIDEBAR_SIZE 200 #define ALBUM_ART_SIZE 36 #define PROGRESS_BAR_WIDTH 300 #define COL_WIDTH_THRESH 30 -#define DEFAULT_PLAYLIST_COL_WIDTH (MIN_WINDOW_WIDTH - DEFAULT_SIDEBAR_SIZE) / 4 +#define DEFAULT_PLAYLIST_COL_WIDTH ((MIN_WINDOW_WIDTH - DEFAULT_SIDEBAR_SIZE) / 4) #define OSD_TIMEOUT 5000 #define ALBUM_ART_PATTERN_LEN 1024 #define ALBUM_ART_NO_PATTERNS 6 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
