diff options
| author | Jan Schmidt <jschmidt@src.gnome.org> | 2007-03-06 16:56:19 +0000 |
|---|---|---|
| committer | Jan Schmidt <jschmidt@src.gnome.org> | 2007-03-06 16:56:19 +0000 |
| commit | 8d4ae9b66397dc3ed461433d20195bb6b6782aeb (patch) | |
| tree | 0054dc3a5eea9623cc84d9fbce7cc30914d8e711 | |
| parent | 954af5fd68bcafc6b9b03f06c3a709578304362a (diff) | |
| download | totem-8d4ae9b66397dc3ed461433d20195bb6b6782aeb.tar.gz | |
Don't allocate a lirc_config structure - LIRC will do that on its own. If
* src/totem-remote.c: (totem_remote_init):
Don't allocate a lirc_config structure - LIRC will do that on its own.
If lirc_readconfig fails, don't pass data to LIRC that it didn't
create in the first place. (Closes: #415326)
svn path=/trunk/; revision=4092
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/totem-remote.c | 3 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2007-03-06 Jan Schmidt <thaytan@mad.scientist.com> + + * src/totem-remote.c: (totem_remote_init): + Don't allocate a lirc_config structure - LIRC will do that on its own. + If lirc_readconfig fails, don't pass data to LIRC that it didn't + create in the first place. (Closes: #415326) + 2007-03-05 Bastien Nocera <hadess@hadess.net> * configure.in: Patch from Damien Carbery <damien.carbery@sun.com> diff --git a/src/totem-remote.c b/src/totem-remote.c index 074b1a837..017c774bc 100644 --- a/src/totem-remote.c +++ b/src/totem-remote.c @@ -323,10 +323,9 @@ totem_remote_init (TotemRemote *remote) return; } - config = g_new(struct lirc_config, 1); - if (lirc_readconfig (NULL, &config, NULL) != 0) { g_message ("Couldn't read lirc config."); + config = NULL; return; } |