diff options
| author | Carlos Garcia Campos <carlosgc@gnome.org> | 2008-09-04 11:32:12 (GMT) |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@src.gnome.org> | 2008-09-04 11:32:12 (GMT) |
| commit | e01d6f5fd8c8682948d87cbfe3456a424652ad71 (patch) | |
| tree | 073fd98fd4fbe243f55662f3aca82ef1a64733d9 /shell/ev-application.c | |
| parent | eb120a34995e8be1b37e86f4eae2bdd3a8878146 (diff) | |
Clean up the media player keys stuff.
2008-09-04 Carlos Garcia Campos <carlosgc@gnome.org>
* shell/ev-application.c: (ev_application_get_media_keys):
* shell/ev-media-player-keys.[ch]:
(ev_media_player_keys_class_init), (on_media_player_key_pressed),
(ev_media_player_keys_grab_keys),
(ev_media_player_keys_release_keys), (ev_media_player_keys_init),
(ev_media_player_keys_focused), (ev_media_player_keys_finalize):
* shell/ev-window.[ch]: (ev_window_dispose),
(view_actions_focus_in_cb), (ev_window_media_player_key_pressed),
(ev_window_init):
Clean up the media player keys stuff.
svn path=/trunk/; revision=3148
Diffstat (limited to 'shell/ev-application.c')
| -rw-r--r-- | shell/ev-application.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/shell/ev-application.c b/shell/ev-application.c index fd43c88..e852561 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -722,6 +722,13 @@ ev_application_shutdown (EvApplication *application) application->print_settings = NULL; } #endif /* GTK 2.11.0 */ + +#ifdef ENABLE_DBUS + if (application->keys) { + g_object_unref (application->keys); + application->keys = NULL; + } +#endif /* ENABLE_DBUS */ g_free (application->last_chooser_uri); g_object_unref (application); @@ -825,13 +832,11 @@ ev_application_get_windows (EvApplication *application) * * Returns: A #EvMediaPlayerKeys. */ -GObject -*ev_application_get_media_keys (EvApplication *application) +GObject * +ev_application_get_media_keys (EvApplication *application) { #ifdef ENABLE_DBUS - if (!application->keys) - return NULL; - return g_object_ref (G_OBJECT (application->keys)); + return G_OBJECT (application->keys); #else return NULL; #endif /* ENABLE_DBUS */ |