diff options
| author | Bastien Nocera <hadess@hadess.net> | 2007-11-25 01:17:47 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2007-11-25 01:17:47 +0000 |
| commit | 883b19662144e8c2a89b9d6d68c7e5c5fefc3b7b (patch) | |
| tree | 3c685967850a0d64789ff6bce05906d85309d08b /src/totem-object.c | |
| parent | bdebaccb0d3412ee4f7592384a1ad727ad9ada6f (diff) | |
Remove row_activated signal, it's already implemented in the list view
2007-11-25 Bastien Nocera <hadess@hadess.net>
* src/plugins/mythtv/totem-mythtv.c: (create_treeview):
Remove row_activated signal, it's already implemented in
the list view
* bindings/python/totem.defs:
* data/playlist.ui:
* src/totem-menu.c: (clear_playlist_action_callback):
* src/totem-object.c: (totem_add_to_playlist_and_play):
* src/totem-playlist.c: (playlist_select_subtitle_action_callback),
(playlist_copy_location_action_callback),
(playlist_show_popup_menu), (totem_playlist_set_reorderable),
(update_current_from_playlist), (totem_playlist_add_files),
(playlist_remove_files), (init_treeview),
(totem_playlist_add_one_mrl), (totem_playlist_add_mrl),
(totem_playlist_clear), (totem_playlist_get_current_mrl),
(totem_playlist_get_current_title), (totem_playlist_set_previous),
(totem_playlist_class_init):
* src/totem-playlist.h:
* src/totem-session.c: (totem_session_restore):
* src/totem-uri.c: (totem_setup_file_filters),
(totem_add_subtitle), (totem_add_files):
* src/totem-uri.h:
* src/totem.c: (totem_action_set_mrl_and_play),
(totem_action_open_dialog), (totem_action_load_media),
(totem_action_play_media_device), (totem_action_play_media),
(totem_action_play_pause), (window_state_event_cb),
(totem_open_location_response_cb),
(totem_action_set_mrl_with_warning), (totem_action_set_mrl),
(totem_action_direction), (totem_action_drop_files),
(on_got_redirect), (totem_action_set_playlist_index),
(totem_action_remote), (playlist_changed_cb), (current_removed_cb),
(subtitle_changed_cb), (on_eos_event),
(totem_action_handle_key_press), (playlist_widget_setup), (main):
* src/totem.h:
Add big patch by Kamil Pawlowski <kamilpe@gmail.com>, adds text
subtitle selection in the UI via right-clicking on the playlist
item (Closes: #165981)
svn path=/trunk/; revision=4901
Diffstat (limited to 'src/totem-object.c')
| -rw-r--r-- | src/totem-object.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/totem-object.c b/src/totem-object.c index 52a32313..19e7eeb5 100644 --- a/src/totem-object.c +++ b/src/totem-object.c @@ -254,12 +254,14 @@ totem_add_to_playlist_and_play (Totem *totem, if (playlist_changed) { - char *mrl; + char *mrl, *subtitle; + subtitle = NULL; totem_playlist_set_current (totem->playlist, end + 1); - mrl = totem_playlist_get_current_mrl (totem->playlist); - totem_action_set_mrl_and_play (totem, mrl); + mrl = totem_playlist_get_current_mrl (totem->playlist, &subtitle); + totem_action_set_mrl_and_play (totem, mrl, subtitle); g_free (mrl); + g_free (subtitle); } } |