diff options
| author | Mathias Hasselmann <hasselmm@src.gnome.org> | 2007-11-29 16:28:44 +0000 |
|---|---|---|
| committer | Mathias Hasselmann <hasselmm@src.gnome.org> | 2007-11-29 16:28:44 +0000 |
| commit | 7eb9f8e7cfef4a0dcd96cdef0ca3f67117ef52de (patch) | |
| tree | f47913049d1e81114e879f7ba950f50e2609cc9a | |
| parent | 4e93aaf805f0b015f32185694d549659af3281cd (diff) | |
| download | totem-LIBEPC.tar.gz | |
Shutdown the publisher before trying to change the network protocol.LIBEPC
Use HTTP instead of HTTPS by default: Neon, as used by GStreamer seems
to have problems with self-signed certificates.
* src/plugins/publish/totem-publish.c: Shutdown the publisher in
totem_publish_plugin_protocol_changed_cb. Use other default protocol
in totem_publish_plugin_activate.
svn path=/branches/LIBEPC/; revision=4923
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/plugins/publish/totem-publish.c | 11 |
2 files changed, 20 insertions, 1 deletions
@@ -1,5 +1,15 @@ 2007-11-29 Mathias Hasselmann <mathias@openismus.com> + Shutdown the publisher before trying to change the network protocol. + Use HTTP instead of HTTPS by default: Neon, as used by GStreamer seems + to have problems with self-signed certificates. + + * src/plugins/publish/totem-publish.c: Shutdown the publisher in + totem_publish_plugin_protocol_changed_cb. Use other default protocol + in totem_publish_plugin_activate. + +2007-11-29 Mathias Hasselmann <mathias@openismus.com> + Don't destroy the settings dialog on response signal. * src/plugins/publish/totem-publish.c: Just hide hide settings dialog. diff --git a/src/plugins/publish/totem-publish.c b/src/plugins/publish/totem-publish.c index 13e9578fe..edaa40873 100644 --- a/src/plugins/publish/totem-publish.c +++ b/src/plugins/publish/totem-publish.c @@ -162,10 +162,19 @@ totem_publish_plugin_protocol_changed_cb (GConfClient *client, TotemPublishPlugin *self = TOTEM_PUBLISH_PLUGIN (data); const gchar *protocol_name; EpcProtocol protocol; + GError *error = NULL; protocol_name = gconf_value_get_string (entry->value); protocol = epc_protocol_from_name (protocol_name, EPC_PROTOCOL_HTTPS); + + epc_publisher_quit (self->publisher); epc_publisher_set_protocol (self->publisher, protocol); + epc_publisher_run_async (self->publisher, &error); + + if (error) { + g_warning ("%s: %s", G_STRFUNC, error->message); + g_error_free (error); + } } static gchar* @@ -551,7 +560,7 @@ totem_publish_plugin_activate (TotemPlugin *plugin, service_pattern = gconf_client_get_string (self->totem->gc, TOTEM_PUBLISH_CONFIG_NAME, NULL); if (!protocol_name) { - protocol_name = g_strdup ("https"); + protocol_name = g_strdup ("http"); gconf_client_set_string (self->totem->gc, TOTEM_PUBLISH_CONFIG_PROTOCOL, protocol_name, NULL); |