diff options
| author | Jan Arne Petersen <jpetersen@jpetersen.org> | 2007-04-25 12:40:57 +0000 |
|---|---|---|
| committer | Jan Arne Petersen <jap@src.gnome.org> | 2007-04-25 12:40:57 +0000 |
| commit | 8971496a58da6ae68ceaca33bbef4cfe564ed814 (patch) | |
| tree | 4ac8a0dbebe14f894df9729f1ed41d1b58f4e96b /src/plugins/lirc | |
| parent | b74f69171acd6aa9467d18d843ca78a7faea4f42 (diff) | |
| download | totem-8971496a58da6ae68ceaca33bbef4cfe564ed814.tar.gz | |
Explicitly shutdown the plugins engine at the totem exit. Remove
2007-04-25 Jan Arne Petersen <jpetersen@jpetersen.org>
* src/plugins/lirc/totem-lirc.c: (totem_lirc_plugin_finalize):
* src/plugins/media-player-keys/totem-media-player-keys.c:
(totem_media_player_keys_plugin_finalize):
* src/totem-object.c: (totem_object_finalize),
(totem_object_plugins_shutdown):
* src/totem.c: (totem_action_exit):
* src/totem.h: Explicitly shutdown the plugins engine at the totem
exit. Remove workarounds. (Closes: #433064)
svn path=/trunk/; revision=4264
Diffstat (limited to 'src/plugins/lirc')
| -rw-r--r-- | src/plugins/lirc/totem-lirc.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/plugins/lirc/totem-lirc.c b/src/plugins/lirc/totem-lirc.c index 6a25d4f56..d07c814fb 100644 --- a/src/plugins/lirc/totem-lirc.c +++ b/src/plugins/lirc/totem-lirc.c @@ -120,31 +120,6 @@ totem_lirc_plugin_init (TotemLircPlugin *plugin) static void totem_lirc_plugin_finalize (GObject *object) { - TotemLircPlugin *pi = TOTEM_LIRC_PLUGIN (object); - GError *error = NULL; - - if (pi->lirc_channel) { - g_io_channel_shutdown (pi->lirc_channel, FALSE, &error); - if (error != NULL) { - g_warning ("Couldn't destroy lirc connection: %s", - error->message); - g_error_free (error); - } - pi->lirc_channel = NULL; - } - - if (pi->lirc_config) { - lirc_freeconfig (pi->lirc_config); - pi->lirc_config = NULL; - - lirc_deinit (); - } - - if (pi->totem) { - g_object_unref (pi->totem); - pi->totem = NULL; - } - G_OBJECT_CLASS (totem_lirc_plugin_parent_class)->finalize (object); } |