Commit 63305dc8 authored by Andreas Henriksson's avatar Andreas Henriksson

Imported Upstream version 0.22.1

parent 8efc69b3
# Generated by Makefile. Do not edit.
commit 7b08bdc5e19171d03a7ea9ce740904a9b895c7e6
Author: Jens Georg <mail@jensge.org>
Date: Mon Apr 14 20:43:27 2014 +0200
Prepare 0.22.1
NEWS | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
commit 654cf420dca52c7dbbfe445b8066575859239224
Author: Christian Kirbach <christian.kirbach@gmail.com>
Date: Sat Apr 5 23:03:48 2014 +0200
Updated German translation
po/de.po | 172 ++++++++++++++++++++++++++++++++++++++++++---------------------
1 file changed, 116 insertions(+), 56 deletions(-)
commit 4988de04a200dd7c70de2a5db2248abfd00521e6
Author: Peter Mráz <etkinator@gmail.com>
Date: Sat Mar 29 21:27:55 2014 +0100
Updated slovak translation
po/sk.po | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
commit 663f9993ffc1983e88195a70a5881f5703c60c47
Author: Dušan Kazik <prescott66@gmail.com>
Date: Sat Mar 29 21:18:21 2014 +0100
Updated slovak translation
po/sk.po | 288 ++++++++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 184 insertions(+), 104 deletions(-)
commit d0a0c77823583f3b047730f60f1674fe1172a4ae
Author: Jens Georg <mail@jensge.org>
Date: Fri Mar 21 20:25:30 2014 +0100
core: Don't spam debug log
Only try to read /etc/machine-info once, not all the time.
Signed-off-by: Jens Georg <mail@jensge.org>
src/librygel-core/rygel-root-device-factory.vala | 29 +++++++++++++++---------
1 file changed, 18 insertions(+), 11 deletions(-)
commit 708b95d706a4c87d76bce6928f08abc517cda912
Author: Jens Georg <mail@jensge.org>
Date: Thu Mar 20 20:02:10 2014 +0100
renderer: Fix URI handling
Signed-off-by: Jens Georg <mail@jensge.org>
https://bugzilla.gnome.org/show_bug.cgi?id=726776
src/librygel-renderer/rygel-av-transport.vala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 5efcf575a5498300ffa72833422332be7cba3d03
Author: Jens Georg <mail@jensge.org>
Date: Mon Mar 24 21:36:27 2014 +0100
0.22.1
======
A new stable release of Rygel!
Core:
- Don't spam debug log.
Renderer:
- Fix URI handling for playlists.
Bugs fixed in this release:
- https://bugzilla.gnome.org/show_bug.cgi?id=726776
All contributors to this release:
- Jens Georg <mail@jensge.org>
- Peter Mráz <etkinator@gmail.com>
- Dušan Kazik <prescott66@gmail.com>
- Christian Kirbach <christian.kirbach@gmail.com>
Added/updated translations
- de, courtesy of Christian Kirbach
- sk, courtesy of Peter Mráz
0.22.0
======
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for Rygel 0.22.0.
# Generated by GNU Autoconf 2.69 for Rygel 0.22.1.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=Rygel>.
#
......@@ -651,8 +651,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Rygel'
PACKAGE_TARNAME='rygel'
PACKAGE_VERSION='0.22.0'
PACKAGE_STRING='Rygel 0.22.0'
PACKAGE_VERSION='0.22.1'
PACKAGE_STRING='Rygel 0.22.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=Rygel'
PACKAGE_URL='http://live.gnome.org/Rygel'
......@@ -1582,7 +1582,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures Rygel 0.22.0 to adapt to many kinds of systems.
\`configure' configures Rygel 0.22.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1652,7 +1652,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Rygel 0.22.0:";;
short | recursive ) echo "Configuration of Rygel 0.22.1:";;
esac
cat <<\_ACEOF
......@@ -1886,7 +1886,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Rygel configure 0.22.0
Rygel configure 0.22.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2255,7 +2255,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by Rygel $as_me 0.22.0, which was
It was created by Rygel $as_me 0.22.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -5177,7 +5177,7 @@ fi
# Define the identity of the package.
PACKAGE='rygel'
VERSION='0.22.0'
VERSION='0.22.1'
cat >>confdefs.h <<_ACEOF
......@@ -18343,7 +18343,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by Rygel $as_me 0.22.0, which was
This file was extended by Rygel $as_me 0.22.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -18410,7 +18410,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
Rygel config.status 0.22.0
Rygel config.status 0.22.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
......@@ -11,4 +11,4 @@ NotShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=Rygel
X-GNOME-Bugzilla-Component=rygel-preferences
X-GNOME-Bugzilla-Version=0.22.0
X-GNOME-Bugzilla-Version=0.22.1
......@@ -13,4 +13,4 @@ X-GNOME-Autostart-enabled=true
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=Rygel
X-GNOME-Bugzilla-Component=general
X-GNOME-Bugzilla-Version=0.22.0
X-GNOME-Bugzilla-Version=0.22.1
......@@ -10,7 +10,7 @@
<manufacturer>Rygel Developers</manufacturer>
<manufacturerURL>http://live.gnome.org/Rygel</manufacturerURL>
<modelName>Rygel</modelName>
<modelNumber>0.22.0</modelNumber>
<modelNumber>0.22.1</modelNumber>
<modelURL>http://live.gnome.org/Rygel</modelURL>
<UDN></UDN>
<serviceList>
......
......@@ -10,7 +10,7 @@
<manufacturer>Rygel Developers.</manufacturer>
<manufacturerURL>http://live.gnome.org/Rygel</manufacturerURL>
<modelName>Rygel</modelName>
<modelNumber>0.22.0</modelNumber>
<modelNumber>0.22.1</modelNumber>
<serialNumber>0000001</serialNumber>
<UDN></UDN>
<serviceList></serviceList>
......
......@@ -2,12 +2,12 @@
.\" Title: RYGEL
.\" Author: Jens Georg <mail@jensge.org>
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/24/2014
.\" Date: 04/14/2014
.\" Manual: Rygel User Manual
.\" Source: rygel
.\" Language: English
.\"
.TH "RYGEL" "1" "03/24/2014" "rygel" "Rygel User Manual"
.TH "RYGEL" "1" "04/14/2014" "rygel" "Rygel User Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
......@@ -2,12 +2,12 @@
.\" Title: rygel.conf
.\" Author: Jens Georg <mail@jensge.org>
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 03/24/2014
.\" Date: 04/14/2014
.\" Manual: Rygel User Manual
.\" Source: rygel
.\" Language: English
.\"
.TH "RYGEL\&.CONF" "5" "03/24/2014" "rygel" "Rygel User Manual"
.TH "RYGEL\&.CONF" "5" "04/14/2014" "rygel" "Rygel User Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......
This diff is collapsed.
This diff is collapsed.
......@@ -220,6 +220,8 @@ struct _RygelIconInfoClass {
};
extern gchar* rygel_pretty_host_name;
gchar* rygel_pretty_host_name = NULL;
static gpointer rygel_root_device_factory_parent_class = NULL;
static GInitableIface* rygel_root_device_factory_g_initable_parent_iface = NULL;
......@@ -304,113 +306,119 @@ GQuark root_device_factory_error_quark (void) {
gchar* rygel_get_pretty_host_name (void) {
gchar* result = NULL;
gchar* machine_info = NULL;
const gchar* _tmp16_ = NULL;
gchar* _tmp17_ = NULL;
const gchar* _tmp0_ = NULL;
const gchar* _tmp19_ = NULL;
gchar* _tmp20_ = NULL;
GError * _inner_error_ = NULL;
{
gchar* _tmp0_ = NULL;
gchar** lines = NULL;
const gchar* _tmp1_ = NULL;
gchar** _tmp2_ = NULL;
gchar** _tmp3_ = NULL;
gint lines_length1 = 0;
gint _lines_size_ = 0;
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
g_file_get_contents ("/etc/machine-info", &_tmp0_, NULL, &_inner_error_);
_g_free0 (machine_info);
machine_info = _tmp0_;
if (_inner_error_ != NULL) {
goto __catch7_g_error;
}
_tmp1_ = machine_info;
_tmp3_ = _tmp2_ = g_strsplit (_tmp1_, "\n", 0);
lines = _tmp3_;
lines_length1 = _vala_array_length (_tmp2_);
_lines_size_ = lines_length1;
_tmp4_ = lines;
_tmp4__length1 = lines_length1;
_tmp0_ = rygel_pretty_host_name;
if (_tmp0_ == NULL) {
const gchar* _tmp17_ = NULL;
gchar* _tmp18_ = NULL;
{
gchar** line_collection = NULL;
gint line_collection_length1 = 0;
gint _line_collection_size_ = 0;
gint line_it = 0;
line_collection = _tmp4_;
line_collection_length1 = _tmp4__length1;
for (line_it = 0; line_it < _tmp4__length1; line_it = line_it + 1) {
gchar* _tmp5_ = NULL;
gchar* line = NULL;
_tmp5_ = g_strdup (line_collection[line_it]);
line = _tmp5_;
{
gchar** parts = NULL;
const gchar* _tmp6_ = NULL;
gchar** _tmp7_ = NULL;
gchar** _tmp8_ = NULL;
gint parts_length1 = 0;
gint _parts_size_ = 0;
gchar** _tmp9_ = NULL;
gint _tmp9__length1 = 0;
const gchar* _tmp10_ = NULL;
_tmp6_ = line;
_tmp8_ = _tmp7_ = g_strsplit (_tmp6_, "=", 0);
parts = _tmp8_;
parts_length1 = _vala_array_length (_tmp7_);
_parts_size_ = parts_length1;
_tmp9_ = parts;
_tmp9__length1 = parts_length1;
_tmp10_ = _tmp9_[0];
if (g_strcmp0 (_tmp10_, "PRETTY_HOSTNAME") == 0) {
gchar** _tmp11_ = NULL;
gint _tmp11__length1 = 0;
gchar** _tmp12_ = NULL;
gint _tmp12__length1 = 0;
gchar* _tmp13_ = NULL;
_tmp11_ = parts;
_tmp11__length1 = parts_length1;
_tmp12_ = parts;
_tmp12__length1 = parts_length1;
_tmp13_ = g_strjoinv ("=", _tmp11_ + 1);
result = _tmp13_;
gchar* machine_info = NULL;
gchar* _tmp1_ = NULL;
gchar** lines = NULL;
const gchar* _tmp2_ = NULL;
gchar** _tmp3_ = NULL;
gchar** _tmp4_ = NULL;
gint lines_length1 = 0;
gint _lines_size_ = 0;
gchar** _tmp5_ = NULL;
gint _tmp5__length1 = 0;
g_file_get_contents ("/etc/machine-info", &_tmp1_, NULL, &_inner_error_);
_g_free0 (machine_info);
machine_info = _tmp1_;
if (_inner_error_ != NULL) {
_g_free0 (machine_info);
goto __catch7_g_error;
}
_tmp2_ = machine_info;
_tmp4_ = _tmp3_ = g_strsplit (_tmp2_, "\n", 0);
lines = _tmp4_;
lines_length1 = _vala_array_length (_tmp3_);
_lines_size_ = lines_length1;
_tmp5_ = lines;
_tmp5__length1 = lines_length1;
{
gchar** line_collection = NULL;
gint line_collection_length1 = 0;
gint _line_collection_size_ = 0;
gint line_it = 0;
line_collection = _tmp5_;
line_collection_length1 = _tmp5__length1;
for (line_it = 0; line_it < _tmp5__length1; line_it = line_it + 1) {
gchar* _tmp6_ = NULL;
gchar* line = NULL;
_tmp6_ = g_strdup (line_collection[line_it]);
line = _tmp6_;
{
gchar** parts = NULL;
const gchar* _tmp7_ = NULL;
gchar** _tmp8_ = NULL;
gchar** _tmp9_ = NULL;
gint parts_length1 = 0;
gint _parts_size_ = 0;
gchar** _tmp10_ = NULL;
gint _tmp10__length1 = 0;
const gchar* _tmp11_ = NULL;
_tmp7_ = line;
_tmp9_ = _tmp8_ = g_strsplit (_tmp7_, "=", 0);
parts = _tmp9_;
parts_length1 = _vala_array_length (_tmp8_);
_parts_size_ = parts_length1;
_tmp10_ = parts;
_tmp10__length1 = parts_length1;
_tmp11_ = _tmp10_[0];
if (g_strcmp0 (_tmp11_, "PRETTY_HOSTNAME") == 0) {
gchar** _tmp12_ = NULL;
gint _tmp12__length1 = 0;
gchar** _tmp13_ = NULL;
gint _tmp13__length1 = 0;
gchar* _tmp14_ = NULL;
_tmp12_ = parts;
_tmp12__length1 = parts_length1;
_tmp13_ = parts;
_tmp13__length1 = parts_length1;
_tmp14_ = g_strjoinv ("=", _tmp12_ + 1);
_g_free0 (rygel_pretty_host_name);
rygel_pretty_host_name = _tmp14_;
}
parts = (_vala_array_free (parts, parts_length1, (GDestroyNotify) g_free), NULL);
_g_free0 (line);
lines = (_vala_array_free (lines, lines_length1, (GDestroyNotify) g_free), NULL);
_g_free0 (machine_info);
return result;
}
parts = (_vala_array_free (parts, parts_length1, (GDestroyNotify) g_free), NULL);
_g_free0 (line);
}
}
lines = (_vala_array_free (lines, lines_length1, (GDestroyNotify) g_free), NULL);
_g_free0 (machine_info);
}
lines = (_vala_array_free (lines, lines_length1, (GDestroyNotify) g_free), NULL);
}
goto __finally7;
__catch7_g_error:
{
GError* e = NULL;
GError* _tmp14_ = NULL;
const gchar* _tmp15_ = NULL;
e = _inner_error_;
_inner_error_ = NULL;
_tmp14_ = e;
_tmp15_ = _tmp14_->message;
g_debug ("rygel-root-device-factory.vala:52: Failed to parse /etc/machine-info: " \
"%s", _tmp15_);
_g_error_free0 (e);
}
__finally7:
if (_inner_error_ != NULL) {
_g_free0 (machine_info);
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
g_clear_error (&_inner_error_);
return NULL;
goto __finally7;
__catch7_g_error:
{
GError* e = NULL;
GError* _tmp15_ = NULL;
const gchar* _tmp16_ = NULL;
e = _inner_error_;
_inner_error_ = NULL;
_tmp15_ = e;
_tmp16_ = _tmp15_->message;
g_debug ("rygel-root-device-factory.vala:56: Failed to parse /etc/machine-info: " \
"%s", _tmp16_);
_g_error_free0 (e);
}
__finally7:
if (_inner_error_ != NULL) {
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
g_clear_error (&_inner_error_);
return NULL;
}
_tmp17_ = g_get_host_name ();
_tmp18_ = g_strdup (_tmp17_);
_g_free0 (rygel_pretty_host_name);
rygel_pretty_host_name = _tmp18_;
}
_tmp16_ = g_get_host_name ();
_tmp17_ = g_strdup (_tmp16_);
result = _tmp17_;
_g_free0 (machine_info);
_tmp19_ = rygel_pretty_host_name;
_tmp20_ = g_strdup (_tmp19_);
result = _tmp20_;
return result;
}
......@@ -1130,7 +1138,7 @@ static void rygel_root_device_factory_add_icons_to_desc (RygelRootDeviceFactory*
_tmp10_ = plugin;
_tmp11_ = rygel_plugin_get_name (_tmp10_);
_tmp12_ = _tmp11_;
g_debug ("rygel-root-device-factory.vala:173: No icon provided by plugin '%s'. U" \
g_debug ("rygel-root-device-factory.vala:180: No icon provided by plugin '%s'. U" \
"sing Rygel logo.", _tmp12_);
_tmp13_ = plugin;
_tmp14_ = rygel_plugin_get_default_icons (_tmp13_);
......
......@@ -33,26 +33,33 @@ public errordomain RootDeviceFactoryError {
}
namespace Rygel {
private static string pretty_host_name = null;
public string get_pretty_host_name () {
string machine_info;
try {
FileUtils.get_contents ("/etc/machine-info", out machine_info);
if (pretty_host_name == null) {
try {
string machine_info;
var lines = machine_info.split ("\n");
FileUtils.get_contents ("/etc/machine-info", out machine_info);
foreach (var line in lines) {
var parts = line.split ("=");
var lines = machine_info.split ("\n");
if (parts[0] == "PRETTY_HOSTNAME") {
return string.joinv("=", parts[1:parts.length]);
foreach (var line in lines) {
var parts = line.split ("=");
if (parts[0] == "PRETTY_HOSTNAME") {
pretty_host_name = string.joinv("=", parts[1:parts.length]);
}
}
} catch (GLib.Error e) {
debug("Failed to parse /etc/machine-info: %s", e.message);
}
} catch (GLib.Error e) {
debug("Failed to parse /etc/machine-info: %s", e.message);
pretty_host_name = Environment.get_host_name ();
}
return Environment.get_host_name ();
return pretty_host_name;
}
}
......
This diff is collapsed.
......@@ -693,7 +693,7 @@ internal class Rygel.AVTransport : Service {
string metadata,
string mime,
string features) {
var message = new Message ("GET", this.controller.uri);
var message = new Message ("GET", uri);
this.session.queue_message (message, () => {
handle_playlist.callback ();
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment