diff options
| author | Bastien Nocera <hadess@hadess.net> | 2007-09-26 11:50:06 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2007-09-26 11:50:06 +0000 |
| commit | 1262c59b527250f72d56b64bce42d031599e4d59 (patch) | |
| tree | 9aba64075d4a48f05f4cb4dad887d481ce73e30d | |
| parent | 15af7eef3a6c35c5762481783f37629dd03d11e3 (diff) | |
| download | totem-1262c59b527250f72d56b64bce42d031599e4d59.tar.gz | |
Fix crash when there's no screensaver objects, and add assertion guards in
2007-09-26 Bastien Nocera <hadess@hadess.net>
* browser-plugin/totem-plugin-viewer.c: (totem_embedded_set_state):
* lib/totem-scrsaver.c: (totem_scrsaver_disable),
(totem_scrsaver_enable), (totem_scrsaver_set_state):
Fix crash when there's no screensaver objects, and add assertion
guards in totem-scrsaver.c (Closes: #480558)
svn path=/branches/gnome-2-20/; revision=4734
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | browser-plugin/totem-plugin-viewer.c | 3 | ||||
| -rw-r--r-- | lib/totem-scrsaver.c | 6 |
3 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,11 @@ +2007-09-26 Bastien Nocera <hadess@hadess.net> + + * browser-plugin/totem-plugin-viewer.c: (totem_embedded_set_state): + * lib/totem-scrsaver.c: (totem_scrsaver_disable), + (totem_scrsaver_enable), (totem_scrsaver_set_state): + Fix crash when there's no screensaver objects, and add assertion + guards in totem-scrsaver.c (Closes: #480558) + 2007-09-25 Bastien Nocera <hadess@hadess.net> * data/mime-type-list.txt: Add audio/x-vorbis as used in diff --git a/browser-plugin/totem-plugin-viewer.c b/browser-plugin/totem-plugin-viewer.c index 6258d8509..eb380d2d4 100644 --- a/browser-plugin/totem-plugin-viewer.c +++ b/browser-plugin/totem-plugin-viewer.c @@ -339,7 +339,8 @@ totem_embedded_set_state (TotemEmbedded *emb, TotemStates state) break; } - totem_scrsaver_set_state (emb->scrsaver, (state == STATE_PLAYING) ? FALSE : TRUE); + if (emb->scrsaver != NULL) + totem_scrsaver_set_state (emb->scrsaver, (state == STATE_PLAYING) ? FALSE : TRUE); gtk_image_set_from_stock (GTK_IMAGE (image), id, GTK_ICON_SIZE_MENU); gtk_tool_button_set_stock_id (GTK_TOOL_BUTTON (emb->pp_fs_button), id); diff --git a/lib/totem-scrsaver.c b/lib/totem-scrsaver.c index 06d145a1b..a1ea44c5e 100644 --- a/lib/totem-scrsaver.c +++ b/lib/totem-scrsaver.c @@ -385,6 +385,8 @@ totem_scrsaver_init (TotemScrsaver *scr) void totem_scrsaver_disable (TotemScrsaver *scr) { + g_return_if_fail (TOTEM_SCRSAVER (scr)); + if (scr->priv->disabled != FALSE) return; @@ -404,6 +406,8 @@ totem_scrsaver_disable (TotemScrsaver *scr) void totem_scrsaver_enable (TotemScrsaver *scr) { + g_return_if_fail (TOTEM_SCRSAVER (scr)); + if (scr->priv->disabled == FALSE) return; @@ -423,6 +427,8 @@ totem_scrsaver_enable (TotemScrsaver *scr) void totem_scrsaver_set_state (TotemScrsaver *scr, gboolean enable) { + g_return_if_fail (TOTEM_SCRSAVER (scr)); + if (scr->priv->disabled == !enable) return; |