From 9478378284ecb2aa059c0db76d55e96d341cb744 Mon Sep 17 00:00:00 2001 From: "Zeeshan Ali (Khattak)" Date: Wed, 9 Dec 2009 03:14:35 +0200 Subject: [PATCH] core: Rename HTTPRequest.request_handler to handler --- src/rygel/rygel-http-request.vala | 14 +++++++------- src/rygel/rygel-http-time-seek.vala | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/rygel/rygel-http-request.vala b/src/rygel/rygel-http-request.vala index 683648f..f3a499b 100644 --- a/src/rygel/rygel-http-request.vala +++ b/src/rygel/rygel-http-request.vala @@ -51,7 +51,7 @@ internal class Rygel.HTTPRequest : GLib.Object, Rygel.StateMachine { public Thumbnail thumbnail; public HTTPSeek seek; - public HTTPRequestHandler request_handler; + public HTTPRequestHandler handler; public HTTPRequest (HTTPServer http_server, Soup.Server server, @@ -91,8 +91,8 @@ internal class Rygel.HTTPRequest : GLib.Object, Rygel.StateMachine { return; } - if (this.request_handler == null) { - this.request_handler = new HTTPIdentityHandler (this.cancellable); + if (this.handler == null) { + this.handler = new HTTPIdentityHandler (this.cancellable); } yield this.find_item (); @@ -138,7 +138,7 @@ internal class Rygel.HTTPRequest : GLib.Object, Rygel.StateMachine { } // Add headers - this.request_handler.add_response_headers (this); + this.handler.add_response_headers (this); debug ("Following HTTP headers appended to response:"); this.msg.response_headers.foreach ((name, value) => { debug ("%s : %s", name, value); @@ -151,7 +151,7 @@ internal class Rygel.HTTPRequest : GLib.Object, Rygel.StateMachine { return; } - this.response = this.request_handler.render_body (this); + this.response = this.handler.render_body (this); this.response.completed += on_response_completed; yield this.response.run (); } catch (Error error) { @@ -170,8 +170,8 @@ internal class Rygel.HTTPRequest : GLib.Object, Rygel.StateMachine { debug ("Transcoding target: %s", target); var transcoder = this.http_server.get_transcoder (target); - this.request_handler = new HTTPTranscodeHandler (transcoder, - this.cancellable); + this.handler = new HTTPTranscodeHandler (transcoder, + this.cancellable); } var index = this.query.lookup ("thumbnail"); diff --git a/src/rygel/rygel-http-time-seek.vala b/src/rygel/rygel-http-time-seek.vala index 87bb032..0c1ecbf 100644 --- a/src/rygel/rygel-http-time-seek.vala +++ b/src/rygel/rygel-http-time-seek.vala @@ -81,7 +81,7 @@ internal class Rygel.HTTPTimeSeek : Rygel.HTTPSeek { var range = request.msg.request_headers.get ("TimeSeekRange.dlna.org"); return range != null && - (request.request_handler is HTTPTranscodeHandler || + (request.handler is HTTPTranscodeHandler || (request.thumbnail == null && request.item.should_stream ())); } -- 2.7.4