From e01d6f5fd8c8682948d87cbfe3456a424652ad71 Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Thu, 04 Sep 2008 11:32:12 +0000
Subject: 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
---
(limited to 'shell/ev-application.c')

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 */
--
cgit v0.9.1