commit c922580f76bf21e155d0657cea49b3b14497663e
Merge: 1939051 4de9e60
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Sat Jan 28 00:50:04 2012 +0000
Merge branch 'gtk-3.0'
Conflicts:
po/it.po
version.sh
.gitignore | 8 +-
ChangeLog | 971 ++++++-
INSTALL | 122 +-
Makefile.am | 8 +-
NEWS | 85 +-
TODO | 541 +++-
TODOandBUGS.txt | 446 ---
configure.ac | 123 +-
data/glade/core-gtkpod.xml | 247 +-
data/gtkpod.desktop.in | 3 +-
doc/adding-cover-art-from-a-browser.html | 80 +-
doc/adding-files-and-folders.html | 78 +-
doc/advanced-features.html | 78 +-
doc/copying-content-to-the-ipod.html | 78 +-
doc/cover-art.html | 106 +-
doc/exporting-files-from-the-ipod.html | 84 +-
doc/getting-started.html | 84 +-
doc/gtkpod-info.html | 78 +-
doc/gtkpod.html | 78 +-
doc/gtkpod.xml | 5 +
doc/hooking-up-the-ipod.html | 96 +-
doc/ipod-and-content.html | 78 +-
doc/ipod-file-recovery.html | 78 +-
doc/layout-of-gtkpod.html | 84 +-
doc/managing-playlists.html | 78 +-
doc/playcounts-and-ratings.html | 80 +-
doc/playlists-podcasts-and-photos.html | 84 +-
doc/setting-ipod-properties.html | 90 +-
doc/the-sysinfo-file.html | 107 +-
doc/troubleshooting-faq.html | 94 +-
doc/view-and-edit-track-details.html | 78 +-
libgtkpod-1.0.pc.in => libgtkpod-1.1.0.pc.in | 4 +-
libgtkpod/context_menus.c | 24 -
libgtkpod/context_menus.h | 1 -
libgtkpod/file.c | 175 +-
libgtkpod/file.h | 6 +-
libgtkpod/file_convert.c | 14 +-
libgtkpod/file_itunesdb.c | 67 +-
libgtkpod/gp_itdb.c | 3 -
libgtkpod/gp_private.h | 4 -
libgtkpod/gtkpod_app_iface.c | 9 +-
libgtkpod/gtkpod_app_iface.h | 6 +-
libgtkpod/libgtkpod-1.0.pc.in | 14 -
libgtkpod/misc.c | 74 +-
libgtkpod/misc.h | 9 +-
libgtkpod/prefs.h | 2 +
libgtkpod/syncdir.c | 7 +-
libgtkpod/tools.c | 900 +++---
plugins/Makefile.am | 3 +-
plugins/clarity/Makefile.am | 58 +
plugins/clarity/album_model.c | 420 +++
plugins/clarity/album_model.h | 124 +
plugins/clarity/clarity.plugin.in | 4 +
plugins/clarity/clarity.ui | 7 +
plugins/clarity/clarity.xml | 314 ++
plugins/clarity/clarity_canvas.c | 795 +++++
plugins/clarity/clarity_canvas.h | 105 +
plugins/clarity/clarity_context_menu.c | 66 +
plugins/clarity/clarity_context_menu.h | 39 +
plugins/clarity/clarity_cover.c | 356 ++
plugins/clarity/clarity_cover.h | 117 +
plugins/clarity/clarity_dnd_support.c | 246 ++
plugins/clarity/clarity_dnd_support.h | 77 +
plugins/clarity/clarity_preferences.c | 135 +
plugins/clarity/clarity_preferences.h | 36 +
plugins/clarity/clarity_preview.c | 187 ++
plugins/clarity/clarity_preview.h | 72 +
plugins/clarity/clarity_utils.c | 104 +
plugins/clarity/clarity_utils.h | 68 +
plugins/clarity/clarity_widget.c | 703 ++++
plugins/clarity/clarity_widget.h | 95 +
plugins/clarity/fetchcover.c | 447 +++
plugins/clarity/fetchcover.h | 55 +
plugins/clarity/icons/Makefile.am | 14 +
plugins/clarity/icons/hicolor/16x16/Makefile.am | 1 +
.../clarity/icons/hicolor/16x16/places/Makefile.am | 4 +
.../hicolor/16x16/places/clarity-default-cover.png | Bin 0 -> 698 bytes
plugins/clarity/icons/hicolor/22x22/Makefile.am | 1 +
.../clarity/icons/hicolor/22x22/places/Makefile.am | 4 +
.../hicolor/22x22/places/clarity-default-cover.png | Bin 0 -> 1076 bytes
plugins/clarity/icons/hicolor/240x240/Makefile.am | 1 +
.../icons/hicolor/240x240/places/Makefile.am | 4 +
.../240x240/places/clarity-default-cover.png | Bin 0 -> 34037 bytes
plugins/clarity/icons/hicolor/24x24/Makefile.am | 1 +
.../clarity/icons/hicolor/24x24/places/Makefile.am | 4 +
.../hicolor/24x24/places/clarity-default-cover.png | Bin 0 -> 1203 bytes
plugins/clarity/icons/hicolor/32x32/Makefile.am | 1 +
.../clarity/icons/hicolor/32x32/places/Makefile.am | 4 +
.../hicolor/32x32/places/clarity-default-cover.png | Bin 0 -> 1835 bytes
plugins/clarity/icons/hicolor/48x48/Makefile.am | 1 +
.../clarity/icons/hicolor/48x48/places/Makefile.am | 4 +
.../hicolor/48x48/places/clarity-default-cover.png | Bin 0 -> 3271 bytes
plugins/clarity/icons/hicolor/Makefile.am | 1 +
plugins/clarity/plugin.c | 194 ++
plugins/clarity/plugin.h | 66 +
plugins/core_preferences/core_prefs.c | 6 +-
plugins/core_preferences/core_prefs.xml | 8 -
plugins/cover_display/cover_display.xml | 216 +-
plugins/cover_display/cover_display_preferences.c | 42 +-
plugins/cover_display/display_coverart.c | 129 +-
plugins/cover_display/display_coverart.h | 6 +-
plugins/cover_display/plugin.c | 10 +-
plugins/coverweb/coverweb.c | 2 +-
plugins/coverweb/coverweb_preferences.c | 2 -
plugins/details_editor/details.c | 7 +-
plugins/details_editor/details_editor.xml | 8 +-
plugins/filetype_flac/flacfile.c | 6 -
plugins/filetype_m4a/m4afile.c | 16 +-
plugins/filetype_mp3/mp3file.c | 2 -
plugins/filetype_mp4/mp4file.c | 14 +-
plugins/media_player/media_player.c | 12 +
plugins/media_player/media_player.xml | 64 +-
plugins/photo_editor/display_photo.c | 2 +-
plugins/playlist_display/display_playlists.c | 236 +-
plugins/playlist_display/display_playlists.h | 14 +-
plugins/playlist_display/playlist_display.ui | 1 +
plugins/playlist_display/playlist_display.xml | 134 +-
.../playlist_display/playlist_display_actions.c | 83 +-
.../playlist_display/playlist_display_actions.h | 15 +-
.../playlist_display_context_menu.c | 162 +-
.../playlist_display_preferences.c | 4 +-
plugins/playlist_display/playlist_display_spl.c | 10 +-
plugins/playlist_display/plugin.c | 20 +-
plugins/repository_editor/repository_editor.c | 6 +-
plugins/repository_editor/repository_editor.xml | 12 +-
plugins/repository_editor/repository_init.c | 50 +-
plugins/sorttab_display/Makefile.am | 10 +-
plugins/sorttab_display/display_sorttabs.c | 3427 ++------------------
plugins/sorttab_display/display_sorttabs.h | 173 +-
plugins/sorttab_display/normal_sorttab_page.c | 1218 +++++++
plugins/sorttab_display/normal_sorttab_page.h | 121 +
plugins/sorttab_display/plugin.c | 29 +-
plugins/sorttab_display/plugin.h | 2 +-
plugins/sorttab_display/sorttab_display.xml | 1121 ++++---
plugins/sorttab_display/sorttab_display_actions.c | 38 +-
.../sorttab_display/sorttab_display_context_menu.c | 144 +-
.../sorttab_display/sorttab_display_context_menu.h | 4 +-
.../sorttab_display/sorttab_display_preferences.c | 16 +-
plugins/sorttab_display/sorttab_widget.c | 790 +++++
plugins/sorttab_display/sorttab_widget.h | 124 +
plugins/sorttab_display/special_sorttab_page.c | 925 ++++++
plugins/sorttab_display/special_sorttab_page.h | 100 +
.../special_sorttab_page_calendar.c | 491 +++
.../special_sorttab_page_calendar.h | 37 +
plugins/track_display/display_tracks.c | 243 +-
plugins/track_display/display_tracks.h | 2 +-
plugins/track_display/plugin.c | 20 +-
plugins/track_display/rb_cell_renderer_rating.c | 34 +-
plugins/track_display/rb_rating_helper.c | 20 +-
plugins/track_display/rb_rating_helper.h | 2 +-
plugins/track_display/track_display.xml | 362 ++-
plugins/track_display/track_display_preferences.c | 16 +-
po/POTFILES.in | 8 +
po/POTFILES.skip | 1 +
po/ca.po | 1132 ++++---
po/cs_CZ.po | 1224 +++++---
po/de.po | 1131 ++++---
po/es.po | 2842 ++++++----------
po/fr.po | 2250 +++++++------
po/he.po | 1128 ++++---
po/it.po | 2049 +++++++-----
po/ja.po | 1116 ++++---
po/nl.po | 1159 ++++---
po/pt_BR.po | 1171 ++++---
po/ro.po | 1138 ++++---
po/ru.po | 1137 ++++---
po/sv.po | 1130 ++++---
po/zh_CN.po | 1125 ++++---
po/zh_TW.po | 1165 ++++---
scripts/convert-2m4a.sh | 4 +-
scripts/convert-2mp3.sh | 4 +-
scripts/convert-2mp4.sh | 8 +-
scripts/gtkpod-convert-common.sh | 8 +-
src/Makefile.am | 19 +-
src/anjuta-about.c | 5 +-
src/anjuta-about.h | 2 +-
src/anjuta-action-callbacks.c | 15 +-
src/anjuta-action-callbacks.h | 2 +-
src/anjuta-app.c | 335 ++-
src/anjuta-app.h | 2 +
src/gtkpod.c | 126 +-
src/main.c | 11 +
src/org.gtkpod.gschema.xml.in | 36 +
version.sh | 4 +-
184 files changed, 25887 insertions(+), 16875 deletions(-)
---
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
