[rhythmbox/media-player-sync: 60/60] Merge branch 'master' into media-player-sync
- From: Jonathan Matthew <jmatthew src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [rhythmbox/media-player-sync: 60/60] Merge branch 'master' into media-player-sync
- Date: Sun, 24 Jan 2010 09:01:52 +0000 (UTC)
commit ee3c6e1c8f21cdc2650eeabdb9d767948add417a
Merge: b8c52e9 f27ba83
Author: Jonathan Matthew <jonathan d14n org>
Date: Sun Jan 24 18:48:35 2010 +1000
Merge branch 'master' into media-player-sync
Conflicts:
plugins/ipod/rb-ipod-source.c
plugins/ipod/rb-ipod-source.h
plugins/ipod/rb-ipod-static-playlist-source.c
backends/gstreamer/rb-player-gst.c | 131 +-
bindings/python/Makefile.am | 1 +
bindings/python/rb.defs | 208 +
bindings/python/rb.override | 143 +
configure.ac | 2 +
data/rhythmbox.schemas | 28 +-
data/ui/media-player-properties.ui | 2 +-
data/ui/rhythmbox-ui.xml | 12 +-
help/Makefile.am | 2 +-
help/uk/uk.po | 2916 ++++++++++
lib/Makefile.am | 1 +
lib/gseal-gtk-compat.h | 49 +
lib/rb-tree-dnd.c | 10 +-
metadata/rb-metadata-common.c | 178 +-
metadata/rb-metadata.h | 6 +
plugins/Makefile.am | 1 +
.../artdisplay/artdisplay/DiscogsCoverArtSearch.py | 19 +-
plugins/artdisplay/artdisplay/__init__.py | 13 +
plugins/audioscrobbler/rb-audioscrobbler-plugin.c | 3 +-
plugins/audioscrobbler/rb-lastfm-source.c | 8 +-
plugins/cd-recorder/rb-playlist-source-recorder.c | 3 +-
plugins/coherence/upnp_coherence/UpnpSource.py | 3 +
plugins/context/context/ContextView.py | 28 +-
plugins/context/tmpl/loading.html | 2 +-
plugins/context/tmpl/main.css | 2 +-
plugins/daap/rb-daap-connection.c | 51 +-
plugins/daap/rb-daap-connection.h | 6 +-
plugins/daap/rb-daap-dialog.c | 2 +-
plugins/daap/rb-daap-plugin.c | 3 +-
plugins/daap/rb-daap-source.c | 7 +-
plugins/daap/rb-daap-source.h | 7 +-
plugins/daap/rb-daap-src.c | 626 +--
.../rb-generic-player-playlist-source.c | 39 +-
plugins/generic-player/rb-generic-player-source.c | 95 +-
plugins/generic-player/rb-generic-player-source.h | 5 +-
plugins/ipod/ipod-info.ui | 20 +-
plugins/ipod/rb-ipod-db.c | 2 +-
plugins/ipod/rb-ipod-source.c | 10 +-
plugins/ipod/rb-ipod-source.h | 4 +
plugins/ipod/rb-ipod-static-playlist-source.c | 10 +-
plugins/iradio/iradio-ui.xml | 2 +-
plugins/iradio/rb-iradio-source.c | 2 +-
plugins/iradio/rb-station-properties-dialog.c | 7 +-
plugins/jamendo/jamendo/JamendoSource.py | 3 +
plugins/jamendo/jamendo/__init__.py | 7 +-
plugins/magnatune/magnatune/MagnatuneSource.py | 3 +
plugins/magnatune/magnatune/__init__.py | 7 +-
plugins/mtpdevice/mtp-info.ui | 14 +-
plugins/mtpdevice/rb-mtp-plugin.c | 15 +-
plugins/mtpdevice/rb-mtp-source.c | 28 +-
plugins/mtpdevice/rb-mtp-thread.c | 4 +-
plugins/sendto/Makefile.am | 11 +
plugins/sendto/__init__.py | 73 +
plugins/sendto/sendto.rb-plugin.in | 8 +
plugins/status-icon/rb-status-icon-plugin.c | 2 +-
plugins/visualizer/rb-vis-widget.c | 65 +-
plugins/visualizer/rb-visualizer-plugin.c | 10 +-
po/bg.po | 6011 +++++++++++++-------
po/de.po | 1624 +++---
po/es.po | 757 ++--
po/hu.po | 1941 ++++---
po/it.po | 1581 +++---
po/lt.po | 1564 +++---
po/pt_BR.po | 1527 +++---
po/sl.po | 1630 +++---
po/sr.po | 2252 ++++----
po/sr latin po | 2252 ++++----
po/sv.po | 1603 +++---
po/uk.po | 5785 +++++++++++++++----
podcast/rb-feed-podcast-properties-dialog.c | 6 +-
podcast/rb-podcast-manager.c | 2 +-
podcast/rb-podcast-properties-dialog.c | 7 +-
remote/dbus/rb-set-rating.py | 2 +-
rhythmdb/rhythmdb-property-model.c | 8 +-
rhythmdb/rhythmdb-query-model.c | 13 +-
shell/rb-missing-plugins.c | 2 +-
shell/rb-playlist-manager.c | 28 +-
shell/rb-plugin-manager.c | 7 +-
shell/rb-plugins-engine.c | 2 +-
shell/rb-removable-media-manager.c | 50 +-
shell/rb-shell-clipboard.c | 83 +-
shell/rb-shell-player.c | 8 +-
shell/rb-shell-preferences.c | 7 +-
shell/rb-shell.c | 13 +-
sources/rb-auto-playlist-source.c | 11 +-
sources/rb-library-source.c | 4 +-
sources/rb-media-player-source.c | 7 +
sources/rb-playlist-source.c | 34 +
sources/rb-podcast-source.c | 4 +-
sources/rb-removable-media-source.c | 13 +-
sources/rb-source-group.c | 13 +
sources/rb-source-group.h | 2 +
sources/rb-source.c | 26 +-
sources/rb-source.h | 2 +
sources/rb-sourcelist-model.c | 22 +-
sources/rb-sourcelist.c | 3 +-
sources/rb-static-playlist-source.c | 11 +-
widgets/Makefile.am | 5 +
widgets/gedit-message-area.c | 22 +-
widgets/gossip-cell-renderer-expander.c | 39 +-
widgets/rb-cell-renderer-pixbuf.c | 33 +-
widgets/rb-cell-renderer-rating.c | 19 +-
widgets/rb-entry-view.c | 2 +-
widgets/rb-header.c | 2 +-
widgets/rb-library-browser.c | 3 +-
widgets/rb-query-creator.c | 7 +-
widgets/rb-rating-helper.c | 14 +-
widgets/rb-rating.c | 44 +-
widgets/rb-segmented-bar.c | 825 +++
widgets/rb-segmented-bar.h | 80 +
widgets/rb-song-info.c | 8 +-
widgets/rb-uri-dialog.c | 7 +-
widgets/test-rb-segmented-bar.c | 76 +
113 files changed, 22894 insertions(+), 12128 deletions(-)
---
diff --cc plugins/ipod/rb-ipod-source.c
index 617df71,cdc1da7..69b4853
--- a/plugins/ipod/rb-ipod-source.c
+++ b/plugins/ipod/rb-ipod-source.c
@@@ -174,18 -168,16 +174,20 @@@ rb_ipod_source_class_init (RBiPodSource
source_class->impl_get_browser_key = impl_get_browser_key;
source_class->impl_show_popup = impl_show_popup;
source_class->impl_delete_thyself = impl_delete_thyself;
- source_class->impl_can_move_to_trash = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_move_to_trash = impl_move_to_trash;
+ source_class->impl_can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
source_class->impl_can_rename = (RBSourceFeatureFunc) rb_true_function;
source_class->impl_get_ui_actions = impl_get_ui_actions;
+ source_class->impl_can_delete = (RBSourceFeatureFunc) rb_true_function;
+ source_class->impl_delete = impl_delete;
+
source_class->impl_can_paste = (RBSourceFeatureFunc) rb_true_function;
+ mps_class->impl_get_entries = impl_get_entries;
mps_class->impl_get_capacity = impl_get_capacity;
mps_class->impl_get_free_space = impl_get_free_space;
+ mps_class->impl_delete_entries = impl_delete_entries;
+ mps_class->impl_add_playlist = impl_add_playlist;
+ mps_class->impl_remove_playlists = impl_remove_playlists;
mps_class->impl_show_properties = impl_show_properties;
rms_class->impl_should_paste = rb_removable_media_source_should_paste_no_duplicate;
diff --cc plugins/ipod/rb-ipod-source.h
index 7d8bff4,79b5e06..2d362d2
--- a/plugins/ipod/rb-ipod-source.h
+++ b/plugins/ipod/rb-ipod-source.h
@@@ -65,8 -64,10 +65,12 @@@ Itdb_Playlist * rb_ipod_source_new_pla
void rb_ipod_source_remove_playlist (RBiPodSource *ipod_source,
RBSource *source);
+Itdb_Playlist * rb_ipod_source_get_playlist (RBiPodSource *source,
+ gchar *name);
+ void rb_ipod_source_show_properties (RBiPodSource *source);
+
+ void rb_ipod_source_delete_entries (RBiPodSource *source,
+ GList *entries);
G_END_DECLS
diff --cc plugins/ipod/rb-ipod-static-playlist-source.c
index 7e265d8,5a1a132..1419d66
--- a/plugins/ipod/rb-ipod-static-playlist-source.c
+++ b/plugins/ipod/rb-ipod-static-playlist-source.c
@@@ -275,7 -275,9 +276,6 @@@ impl_delete (RBSource *source
songs = rb_source_get_entry_view (source);
sel = rb_entry_view_get_selected_entries (songs);
- rb_ipod_source_delete_entries (priv->ipod_source, sel);
-
- g_list_foreach (sel, (GFunc) rhythmdb_entry_unref, NULL);
- g_list_free (sel);
+ rb_media_player_source_delete_entries (RB_MEDIA_PLAYER_SOURCE (priv->ipod_source), sel, NULL, NULL, NULL);
+ rb_list_destroy_free (sel, (GDestroyNotify)rhythmdb_entry_unref);
}
--
diff --cc sources/rb-media-player-source.c
index a787f2b,df943a5..de8b756
--- a/sources/rb-media-player-source.c
+++ b/sources/rb-media-player-source.c
@@@ -474,17 -169,10 +474,18 @@@ rb_media_player_source_show_properties
const char *ui_file;
char *used_str;
char *capacity_str;
+ char *name;
char *text;
+ GList *l;
+ GList *playlists;
guint64 capacity;
guint64 free_space;
+ gboolean valid;
+ gboolean sync_category;
+ gboolean sync_all;
+ RBShell *shell;
+ RhythmDB *db;
+ RBPlaylistManager *playlist_manager;
if (priv->properties_dialog != NULL) {
gtk_window_present (GTK_WINDOW (priv->properties_dialog));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
