diff options
| author | Bastien Nocera <hadess@hadess.net> | 2005-03-27 18:56:09 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2005-03-27 18:56:09 +0000 |
| commit | 9813b7f5905125c48bf8fe06219c3d0b988c472f (patch) | |
| tree | c4590ca13ce2915f1dbd2eaedb52b4dda1664da0 | |
| parent | f9714e1aed9fcdfa198acd13a69d58a4ccc661ba (diff) | |
| download | totem-9813b7f5905125c48bf8fe06219c3d0b988c472f.tar.gz | |
remove unused debug
2005-03-27 Bastien Nocera <hadess@hadess.net>
* src/bacon-video-widget-xine.c: (xine_error): remove unused debug
* src/totem-private.h:
* src/totem-session.c:
* src/totem.c: (on_recent_file_activate): move the
totem_signal_(un)block_by_data helpers to totem-private.h, prevent
double-open when activating files from the recent-files menu (from HEAD)
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/bacon-video-widget-xine.c | 1 | ||||
| -rw-r--r-- | src/totem-private.h | 3 | ||||
| -rw-r--r-- | src/totem-session.c | 3 | ||||
| -rw-r--r-- | src/totem.c | 4 |
5 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,12 @@ +2005-03-27 Bastien Nocera <hadess@hadess.net> + + * src/bacon-video-widget-xine.c: (xine_error): remove unused debug + * src/totem-private.h: + * src/totem-session.c: + * src/totem.c: (on_recent_file_activate): move the + totem_signal_(un)block_by_data helpers to totem-private.h, prevent + double-open when activating files from the recent-files menu (from HEAD) + 2005-03-24 Bastien Nocera <hadess@hadess.net> * src/totem-stock-icons.c: (totem_set_default_icons), diff --git a/src/bacon-video-widget-xine.c b/src/bacon-video-widget-xine.c index ce3c4c944..db9d16687 100644 --- a/src/bacon-video-widget-xine.c +++ b/src/bacon-video-widget-xine.c @@ -1411,7 +1411,6 @@ xine_error (BaconVideoWidget *bvw, GError **error) * xine_open() */ while ((data = g_async_queue_try_pop (bvw->priv->queue)) != NULL) { - g_message ("data->signal %d", data->signal); g_assert (data->signal == MESSAGE_ASYNC || data->signal == BUFFERING_ASYNC || data->signal == REDIRECT_ASYNC diff --git a/src/totem-private.h b/src/totem-private.h index 5c165146e..638c06185 100644 --- a/src/totem-private.h +++ b/src/totem-private.h @@ -41,6 +41,9 @@ #include "bacon-video-widget.h" #include "totem-skipto.h" +#define totem_signal_block_by_data(obj, data) (g_signal_handlers_block_matched (obj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, data)) +#define totem_signal_unblock_by_data(obj, data) (g_signal_handlers_unblock_matched (obj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, data)) + typedef enum { TOTEM_CONTROLS_VISIBLE, TOTEM_CONTROLS_HIDDEN, diff --git a/src/totem-session.c b/src/totem-session.c index 659a70d93..6f0ed3a4f 100644 --- a/src/totem-session.c +++ b/src/totem-session.c @@ -31,9 +31,6 @@ #include <libgnome/gnome-config.h> #include <libgnomeui/gnome-client.h> -#define totem_signal_block_by_data(obj, data) (g_signal_handlers_block_matched (obj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, data)) -#define totem_signal_unblock_by_data(obj, data) (g_signal_handlers_unblock_matched (obj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, data)) - static char * totem_session_create_key (void) { diff --git a/src/totem.c b/src/totem.c index 9d5cc4ac4..7be7ec288 100644 --- a/src/totem.c +++ b/src/totem.c @@ -1088,10 +1088,14 @@ on_recent_file_activate (EggRecentViewGtk *view, EggRecentItem *item, uri = egg_recent_item_get_uri (item); + totem_signal_block_by_data (totem->playlist, totem); + end = totem_playlist_get_last (totem->playlist); playlist_changed = totem_playlist_add_mrl (totem->playlist, uri, NULL); egg_recent_model_add_full (totem->recent_model, item); + totem_signal_unblock_by_data (totem->playlist, totem); + if (playlist_changed) { char *mrl; |