rpms/rhythmbox/devel soup24.patch,1.3,1.4
Bastien Nocera (hadess)
fedora-extras-commits at redhat.com
Wed Feb 6 01:08:29 UTC 2008
- Previous message (by thread): rpms/knetworkmanager/devel .cvsignore, 1.11, 1.12 knetworkmanager.spec, 1.15, 1.16 sources, 1.11, 1.12
- Next message (by thread): rpms/kernel/F-7 linux-2.6-acpi-dont-init-ec-early-with-no-ini.patch, NONE, 1.1 linux-2.6-acpi-git-ec-init-fixes.patch, NONE, 1.1 linux-2.6-acpi_ec_early_init_fix.patch, NONE, 1.1 kernel-2.6.spec, 1.3426, 1.3427
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: hadess
Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20414
Modified Files:
soup24.patch
Log Message:
Update patch without the conflicts
soup24.patch:
Index: soup24.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/soup24.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- soup24.patch 5 Feb 2008 23:40:44 -0000 1.3
+++ soup24.patch 6 Feb 2008 01:07:58 -0000 1.4
@@ -1,8 +1,7 @@
-diff --git a/configure.ac b/configure.ac
-index 84212e9..a43c3ac 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -441,18 +441,25 @@ fi
+diff -urN rhythmbox-0.11.4/configure.ac rhythmbox-0.11.4.new/configure.ac
+--- rhythmbox-0.11.4/configure.ac 2007-12-20 11:56:44.000000000 +0000
++++ rhythmbox-0.11.4.new/configure.ac 2008-02-06 00:57:27.000000000 +0000
+@@ -441,18 +441,25 @@
dnl Check for libsoup, needed for DAAP and audioscrobbler
if test "x$enable_daap" = "xyes" || test "x$enable_audioscrobbler" != "xno"; then
PKG_CHECK_MODULES(SOUP, \
@@ -36,7 +35,7 @@
fi
AM_CONDITIONAL(USE_LIBSOUP, test x"$have_libsoup" = "xyes")
-@@ -513,27 +520,9 @@ AM_CONDITIONAL(HAVE_MUSICBRAINZ, test "x$enable_musicbrainz" = "xyes")
+@@ -513,27 +520,9 @@
@@ -67,7 +66,7 @@
dnl Multimedia keys
have_xfree=no
-@@ -1168,7 +1157,11 @@ else
+@@ -1167,7 +1156,11 @@
AC_MSG_NOTICE([ CD burning support disabled])
fi
if test x"$enable_daap" = xyes; then
@@ -80,7 +79,7 @@
else
AC_MSG_NOTICE([ DAAP (music sharing) support is disabled])
fi
-@@ -1198,7 +1191,11 @@ else
+@@ -1197,7 +1190,11 @@
AC_MSG_NOTICE([ gnome-keyring support disabled])
fi
if test x"$enable_audioscrobbler" != xno; then
@@ -93,11 +92,10 @@
else
AC_MSG_NOTICE([ Audioscrobbler support disabled])
fi
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 48eb4e4..21fc6d8 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -34,7 +34,8 @@ librb_la_SOURCES = \
+diff -urN rhythmbox-0.11.4/lib/Makefile.am rhythmbox-0.11.4.new/lib/Makefile.am
+--- rhythmbox-0.11.4/lib/Makefile.am 2007-08-01 09:04:11.000000000 +0100
++++ rhythmbox-0.11.4.new/lib/Makefile.am 2008-02-06 00:57:27.000000000 +0000
+@@ -34,7 +34,8 @@
rb-string-value-map.c \
rb-string-value-map.h \
rb-async-queue-watch.c \
@@ -107,11 +105,10 @@
if WITH_INTERNAL_GSEQUENCE
librb_la_SOURCES += gsequence.c gsequence.h
-diff --git a/lib/rb-proxy-config.c b/lib/rb-proxy-config.c
-index e531446..c0eab16 100644
---- a/lib/rb-proxy-config.c
-+++ b/lib/rb-proxy-config.c
-@@ -231,7 +231,28 @@ get_proxy_config (RBProxyConfig *config)
+diff -urN rhythmbox-0.11.4/lib/rb-proxy-config.c rhythmbox-0.11.4.new/lib/rb-proxy-config.c
+--- rhythmbox-0.11.4/lib/rb-proxy-config.c 2007-06-03 02:55:02.000000000 +0100
++++ rhythmbox-0.11.4.new/lib/rb-proxy-config.c 2008-02-06 00:57:27.000000000 +0000
+@@ -231,7 +231,28 @@
}
}
@@ -141,10 +138,9 @@
SoupUri *
rb_proxy_config_get_libsoup_uri (RBProxyConfig *config)
{
-diff --git a/lib/rb-proxy-config.h b/lib/rb-proxy-config.h
-index 5e95819..60eb04e 100644
---- a/lib/rb-proxy-config.h
-+++ b/lib/rb-proxy-config.h
+diff -urN rhythmbox-0.11.4/lib/rb-proxy-config.h rhythmbox-0.11.4.new/lib/rb-proxy-config.h
+--- rhythmbox-0.11.4/lib/rb-proxy-config.h 2007-06-03 02:55:02.000000000 +0100
++++ rhythmbox-0.11.4.new/lib/rb-proxy-config.h 2008-02-06 00:57:27.000000000 +0000
@@ -24,8 +24,8 @@
#include <glib-object.h>
@@ -155,7 +151,7 @@
#endif
G_BEGIN_DECLS
-@@ -65,9 +65,7 @@ GType rb_proxy_config_get_type (void);
+@@ -65,9 +65,7 @@
RBProxyConfig * rb_proxy_config_new (void);
@@ -166,11 +162,9 @@
#endif /* RB_PROXY_CONFIG_H */
-diff --git a/lib/rb-soup-compat.h b/lib/rb-soup-compat.h
-new file mode 100644
-index 0000000..8cfb005
---- /dev/null
-+++ b/lib/rb-soup-compat.h
+diff -urN rhythmbox-0.11.4/lib/rb-soup-compat.h rhythmbox-0.11.4.new/lib/rb-soup-compat.h
+--- rhythmbox-0.11.4/lib/rb-soup-compat.h 1970-01-01 01:00:00.000000000 +0100
++++ rhythmbox-0.11.4.new/lib/rb-soup-compat.h 2008-02-06 00:57:27.000000000 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2008 Jonathan Matthew <jonathan at d14n.org>
@@ -231,10 +225,9 @@
+
+#endif /* RB_SOUP_COMPAT_H */
+
-diff --git a/plugins/audioscrobbler/rb-audioscrobbler.c b/plugins/audioscrobbler/rb-audioscrobbler.c
-index 192e62d..73ea7a5 100644
---- a/plugins/audioscrobbler/rb-audioscrobbler.c
-+++ b/plugins/audioscrobbler/rb-audioscrobbler.c
+diff -urN rhythmbox-0.11.4/plugins/audioscrobbler/rb-audioscrobbler.c rhythmbox-0.11.4.new/plugins/audioscrobbler/rb-audioscrobbler.c
+--- rhythmbox-0.11.4/plugins/audioscrobbler/rb-audioscrobbler.c 2007-12-17 09:26:53.000000000 +0000
++++ rhythmbox-0.11.4.new/plugins/audioscrobbler/rb-audioscrobbler.c 2008-02-06 00:59:48.000000000 +0000
@@ -24,6 +24,8 @@
#define __EXTENSIONS__
@@ -256,7 +249,7 @@
#include "eel-gconf-extensions.h"
#include "rb-audioscrobbler.h"
#include "rb-debug.h"
-@@ -195,14 +196,20 @@ static gboolean rb_audioscrobbler_timeout_cb (RBAudioscrobbler *audioscrobb
+@@ -193,14 +194,20 @@
static gchar * mkmd5 (char *string);
static void rb_audioscrobbler_parse_response (RBAudioscrobbler *audioscrobbler, SoupMessage *msg);
@@ -282,7 +275,7 @@
static void rb_audioscrobbler_import_settings (RBAudioscrobbler *audioscrobbler);
static void rb_audioscrobbler_preferences_sync (RBAudioscrobbler *audioscrobbler);
-@@ -690,18 +697,31 @@ mkmd5 (char *string)
+@@ -688,18 +695,31 @@
static void
rb_audioscrobbler_parse_response (RBAudioscrobbler *audioscrobbler, SoupMessage *msg)
{
@@ -318,7 +311,7 @@
g_free (audioscrobbler->priv->status_msg);
audioscrobbler->priv->status = STATUS_OK;
-@@ -773,10 +793,12 @@ rb_audioscrobbler_parse_response (RBAudioscrobbler *audioscrobbler, SoupMessage
+@@ -771,10 +791,12 @@
audioscrobbler->priv->submit_next = time(NULL) + audioscrobbler->priv->submit_interval;
g_strfreev (breaks);
@@ -332,7 +325,7 @@
}
}
-@@ -795,25 +817,25 @@ static void
+@@ -793,24 +815,25 @@
rb_audioscrobbler_perform (RBAudioscrobbler *audioscrobbler,
char *url,
char *post_data,
@@ -342,7 +335,6 @@
SoupMessage *msg;
msg = soup_message_new (post_data == NULL ? "GET" : "POST", url);
-- soup_message_add_header (msg->request_headers, "User-Agent", USER_AGENT);
+ soup_message_headers_append (msg->request_headers, "User-Agent", USER_AGENT);
if (post_data != NULL) {
@@ -362,7 +354,7 @@
uri = rb_proxy_config_get_libsoup_uri (audioscrobbler->priv->proxy_config);
audioscrobbler->priv->soup_session = soup_session_async_new_with_options (
-@@ -894,8 +916,13 @@ rb_audioscrobbler_do_handshake (RBAudioscrobbler *audioscrobbler)
+@@ -891,8 +914,13 @@
}
@@ -376,7 +368,7 @@
{
RBAudioscrobbler *audioscrobbler = RB_AUDIOSCROBBLER(user_data);
-@@ -1052,8 +1079,13 @@ rb_g_queue_concat (GQueue *q1, GQueue *q2)
+@@ -1049,8 +1077,13 @@
}
}
@@ -390,7 +382,7 @@
{
RBAudioscrobbler *audioscrobbler = RB_AUDIOSCROBBLER (user_data);
-@@ -1235,7 +1267,7 @@ static void
+@@ -1232,7 +1265,7 @@
rb_audioscrobbler_proxy_config_changed_cb (RBProxyConfig *config,
RBAudioscrobbler *audioscrobbler)
{
@@ -399,10 +391,9 @@
if (audioscrobbler->priv->soup_session) {
uri = rb_proxy_config_get_libsoup_uri (config);
-diff --git a/plugins/audioscrobbler/rb-lastfm-gst-src.c b/plugins/audioscrobbler/rb-lastfm-gst-src.c
-index dad1afd..86c6b53 100644
---- a/plugins/audioscrobbler/rb-lastfm-gst-src.c
-+++ b/plugins/audioscrobbler/rb-lastfm-gst-src.c
+diff -urN rhythmbox-0.11.4/plugins/audioscrobbler/rb-lastfm-gst-src.c rhythmbox-0.11.4.new/plugins/audioscrobbler/rb-lastfm-gst-src.c
+--- rhythmbox-0.11.4/plugins/audioscrobbler/rb-lastfm-gst-src.c 2007-06-19 12:38:41.000000000 +0100
++++ rhythmbox-0.11.4.new/plugins/audioscrobbler/rb-lastfm-gst-src.c 2008-02-06 00:57:27.000000000 +0000
@@ -25,7 +25,6 @@
#include "rb-debug.h"
@@ -411,10 +402,9 @@
#include <gst/gst.h>
#define RB_TYPE_LASTFM_SRC (rb_lastfm_src_get_type())
-diff --git a/plugins/audioscrobbler/rb-lastfm-source.c b/plugins/audioscrobbler/rb-lastfm-source.c
-index 4859cce..9661fcd 100644
---- a/plugins/audioscrobbler/rb-lastfm-source.c
-+++ b/plugins/audioscrobbler/rb-lastfm-source.c
+diff -urN rhythmbox-0.11.4/plugins/audioscrobbler/rb-lastfm-source.c rhythmbox-0.11.4.new/plugins/audioscrobbler/rb-lastfm-source.c
+--- rhythmbox-0.11.4/plugins/audioscrobbler/rb-lastfm-source.c 2007-12-04 03:05:39.000000000 +0000
++++ rhythmbox-0.11.4.new/plugins/audioscrobbler/rb-lastfm-source.c 2008-02-06 01:01:13.000000000 +0000
@@ -42,8 +42,8 @@
#include <gconf/gconf-value.h>
@@ -425,7 +415,7 @@
#include "md5.h"
-@@ -101,8 +101,12 @@ static char* rb_lastfm_source_get_playback_uri (RhythmDBEntry *entry, gpointer d
+@@ -100,8 +100,12 @@
static void rb_lastfm_perform (RBLastfmSource *lastfm,
const char *url,
char *post_data, /* this takes ownership */
@@ -439,7 +429,7 @@
static void rb_lastfm_change_station (RBLastfmSource *source, const char *station);
static void rb_lastfm_proxy_config_changed_cb (RBProxyConfig *config,
-@@ -725,31 +729,29 @@ static void
+@@ -724,30 +728,29 @@
rb_lastfm_perform (RBLastfmSource *source,
const char *url,
char *post_data,
@@ -448,7 +438,6 @@
{
SoupMessage *msg;
msg = soup_message_new ("GET", url);
-- soup_message_add_header (msg->request_headers, "User-Agent", USER_AGENT);
+ soup_message_headers_append (msg->request_headers, "User-Agent", USER_AGENT);
if (msg == NULL)
@@ -475,7 +464,7 @@
uri = rb_proxy_config_get_libsoup_uri (source->priv->proxy_config);
source->priv->soup_session = soup_session_async_new_with_options (
-@@ -761,27 +763,45 @@ rb_lastfm_perform (RBLastfmSource *source,
+@@ -759,27 +762,45 @@
soup_session_queue_message (source->priv->soup_session,
msg,
@@ -525,7 +514,7 @@
rb_debug ("response body: %s", body);
-@@ -789,7 +809,6 @@ rb_lastfm_message_cb (SoupMessage *req, gpointer user_data)
+@@ -787,7 +808,6 @@
source->priv->status = NO_ARTIST;
}
@@ -533,7 +522,7 @@
pieces = g_strsplit (body, "\n", 0);
for (i = 0; pieces[i] != NULL; i++) {
gchar **values = g_strsplit (pieces[i], "=", 2);
-@@ -858,10 +877,14 @@ rb_lastfm_message_cb (SoupMessage *req, gpointer user_data)
+@@ -856,10 +876,14 @@
rhythmdb_commit (source->priv->db);
}
@@ -549,7 +538,7 @@
/* doesn't work yet
if (source->priv->pending_entry) {
-@@ -900,7 +923,7 @@ static void
+@@ -898,7 +922,7 @@
rb_lastfm_proxy_config_changed_cb (RBProxyConfig *config,
RBLastfmSource *source)
{
@@ -558,7 +547,7 @@
if (source->priv->soup_session) {
uri = rb_proxy_config_get_libsoup_uri (config);
-@@ -1165,10 +1188,16 @@ rb_lastfm_source_add_station_cb (GtkButton *button, gpointer *data)
+@@ -1163,10 +1187,16 @@
g_free(title);
}
@@ -576,7 +565,7 @@
char **pieces;
int p;
RhythmDBEntry *entry;
-@@ -1181,10 +1210,16 @@ rb_lastfm_source_metadata_cb (SoupMessage *req, RBLastfmSource *source)
+@@ -1179,10 +1209,16 @@
}
rb_debug ("got response to metadata request");
@@ -596,7 +585,7 @@
pieces = g_strsplit (body, "\n", 0);
found_cover = FALSE;
-@@ -1240,7 +1275,9 @@ rb_lastfm_source_metadata_cb (SoupMessage *req, RBLastfmSource *source)
+@@ -1238,7 +1274,9 @@
}
g_strfreev (pieces);
@@ -607,7 +596,7 @@
if (found_cover == FALSE) {
GValue v = {0,};
-@@ -1273,7 +1310,7 @@ rb_lastfm_source_new_song_cb (GObject *player_backend,
+@@ -1271,7 +1309,7 @@
source->priv->base_url,
source->priv->base_path,
source->priv->session);
@@ -616,10 +605,9 @@
g_free (uri);
/* re-enable actions */
-diff --git a/plugins/daap/rb-daap-connection.c b/plugins/daap/rb-daap-connection.c
-index 249cceb..5cac933 100644
---- a/plugins/daap/rb-daap-connection.c
-+++ b/plugins/daap/rb-daap-connection.c
+diff -urN rhythmbox-0.11.4/plugins/daap/rb-daap-connection.c rhythmbox-0.11.4.new/plugins/daap/rb-daap-connection.c
+--- rhythmbox-0.11.4/plugins/daap/rb-daap-connection.c 2007-11-22 08:23:50.000000000 +0000
++++ rhythmbox-0.11.4.new/plugins/daap/rb-daap-connection.c 2008-02-06 00:57:27.000000000 +0000
@@ -33,10 +33,8 @@
#include <glib/gi18n.h>
#include <gdk/gdk.h>
@@ -632,7 +620,7 @@
#include "rb-daap-hash.h"
#include "rb-daap-connection.h"
-@@ -84,7 +82,7 @@ struct RBDAAPConnectionPrivate {
+@@ -84,7 +82,7 @@
gboolean is_connecting;
SoupSession *session;
@@ -641,7 +629,7 @@
gchar *daap_base_uri;
gdouble daap_version;
-@@ -329,7 +327,7 @@ build_message (RBDAAPConnection *connection,
+@@ -329,7 +327,7 @@
{
RBDAAPConnectionPrivate *priv = connection->priv;
SoupMessage *message = NULL;
@@ -650,7 +638,7 @@
uri = soup_uri_new_with_base (priv->base_uri, path);
if (uri == NULL) {
-@@ -337,14 +335,13 @@ build_message (RBDAAPConnection *connection,
+@@ -337,14 +335,13 @@
}
message = soup_message_new_from_uri (SOUP_METHOD_GET, uri);
@@ -669,7 +657,7 @@
if (priv->password_protected) {
char *h;
-@@ -352,13 +349,17 @@ build_message (RBDAAPConnection *connection,
+@@ -352,13 +349,17 @@
char *token;
user_pass = g_strdup_printf ("%s:%s", priv->username, priv->password);
@@ -688,7 +676,7 @@
g_free (h);
}
-@@ -372,10 +373,10 @@ build_message (RBDAAPConnection *connection,
+@@ -372,10 +373,10 @@
rb_daap_hash_generate ((short)floor (version), (const guchar*)no_daap_path, 2, (guchar*)hash, req_id);
@@ -701,7 +689,7 @@
}
soup_uri_free (uri);
-@@ -425,16 +426,22 @@ actual_http_response_handler (DAAPResponseData *data)
+@@ -425,16 +426,22 @@
{
RBDAAPConnectionPrivate *priv;
GNode *structure;
@@ -726,7 +714,7 @@
message_path = soup_uri_to_string (soup_message_get_uri (data->message), FALSE);
-@@ -444,13 +451,12 @@ actual_http_response_handler (DAAPResponseData *data)
+@@ -444,13 +451,12 @@
data->message->reason_phrase);
if (data->message->response_headers) {
@@ -741,7 +729,7 @@
unsigned int factor = 4;
unsigned int unc_size = response_length * factor;
-@@ -575,19 +581,23 @@ actual_http_response_handler (DAAPResponseData *data)
+@@ -575,19 +581,23 @@
rb_daap_structure_destroy (structure);
}
@@ -769,7 +757,7 @@
{
DAAPResponseData *data;
int response_length;
-@@ -599,7 +609,11 @@ http_response_handler (SoupMessage *message,
+@@ -599,7 +609,11 @@
data = g_new0 (DAAPResponseData, 1);
data->status = message->status_code;
@@ -781,7 +769,7 @@
g_object_ref (G_OBJECT (connection));
data->connection = connection;
-@@ -655,7 +669,7 @@ http_get (RBDAAPConnection *connection,
+@@ -655,7 +669,7 @@
priv->use_response_handler_thread = use_thread;
priv->response_handler = handler;
soup_session_queue_message (priv->session, message,
@@ -790,7 +778,7 @@
connection);
rb_debug ("Queued message for http://%s:%d/%s",
priv->base_uri->host,
-@@ -1674,7 +1688,11 @@ rb_daap_connection_get_headers (RBDAAPConnection *connection,
+@@ -1662,7 +1676,11 @@
char *token;
user_pass = g_strdup_printf ("%s:%s", priv->username, priv->password);
@@ -802,10 +790,9 @@
g_string_append_printf (headers, "Authentication: Basic %s\r\n", token);
g_free (token);
g_free (user_pass);
-diff --git a/plugins/daap/rb-daap-plugin.c b/plugins/daap/rb-daap-plugin.c
-index c9eb020..2903a70 100644
---- a/plugins/daap/rb-daap-plugin.c
-+++ b/plugins/daap/rb-daap-plugin.c
+diff -urN rhythmbox-0.11.4/plugins/daap/rb-daap-plugin.c rhythmbox-0.11.4.new/plugins/daap/rb-daap-plugin.c
+--- rhythmbox-0.11.4/plugins/daap/rb-daap-plugin.c 2007-09-03 08:24:09.000000000 +0100
++++ rhythmbox-0.11.4.new/plugins/daap/rb-daap-plugin.c 2008-02-06 00:57:27.000000000 +0000
@@ -29,8 +29,8 @@
#include <glib.h>
#include <glib-object.h>
@@ -816,7 +803,7 @@
#include "rb-daap-plugin.h"
#include "rb-debug.h"
-@@ -647,6 +647,9 @@ new_daap_share_location_added_cb (RBURIDialog *dialog,
+@@ -647,6 +647,9 @@
g_free (host);
soup_address_resolve_async (addr,
@@ -826,10 +813,9 @@
(SoupAddressCallback) new_daap_share_resolve_cb,
data);
}
-diff --git a/plugins/daap/rb-daap-share.c b/plugins/daap/rb-daap-share.c
-index a246864..9be71ec 100644
---- a/plugins/daap/rb-daap-share.c
-+++ b/plugins/daap/rb-daap-share.c
+diff -urN rhythmbox-0.11.4/plugins/daap/rb-daap-share.c rhythmbox-0.11.4.new/plugins/daap/rb-daap-share.c
+--- rhythmbox-0.11.4/plugins/daap/rb-daap-share.c 2007-11-08 13:09:20.000000000 +0000
++++ rhythmbox-0.11.4.new/plugins/daap/rb-daap-share.c 2008-02-06 00:57:27.000000000 +0000
@@ -27,13 +27,9 @@
#include <glib/gi18n.h>
@@ -846,7 +832,7 @@
#include <libgnomevfs/gnome-vfs.h>
#include "rb-daap-share.h"
-@@ -513,20 +509,22 @@ rb_daap_share_new (const char *name,
+@@ -513,20 +509,22 @@
static void
message_add_standard_headers (SoupMessage *message)
{
@@ -874,7 +860,7 @@
}
static void
-@@ -543,14 +541,15 @@ message_set_from_rb_daap_structure (SoupMessage *message,
+@@ -543,14 +541,15 @@
return;
}
@@ -894,7 +880,7 @@
}
#define DMAP_STATUS_OK 200
-@@ -559,10 +558,20 @@ message_set_from_rb_daap_structure (SoupMessage *message,
+@@ -559,10 +558,20 @@
#define DAAP_VERSION 3.0
#define DMAP_TIMEOUT 1800
@@ -915,7 +901,7 @@
{
/* MSRV server info response
* MSTT status
-@@ -619,10 +628,20 @@ server_info_cb (RBDAAPShare *share,
+@@ -619,10 +628,20 @@
rb_daap_structure_destroy (msrv);
}
@@ -936,7 +922,7 @@
{
/* MCCR content codes response
* MSTT status
-@@ -656,6 +675,48 @@ content_codes_cb (RBDAAPShare *share,
+@@ -656,6 +675,48 @@
rb_daap_structure_destroy (mccr);
}
@@ -985,7 +971,7 @@
static gboolean
message_get_session_id (SoupMessage *message,
guint32 *id)
-@@ -729,11 +790,13 @@ message_get_revision_number (SoupMessage *message,
+@@ -729,11 +790,13 @@
return TRUE;
}
@@ -1000,7 +986,7 @@
guint32 *id)
{
guint32 session_id;
-@@ -745,7 +808,11 @@ session_id_validate (RBDAAPShare *share,
+@@ -745,7 +808,11 @@
*id = 0;
}
@@ -1012,7 +998,7 @@
if (! res) {
rb_debug ("Validation failed: Unable to parse session id from message");
return FALSE;
-@@ -758,7 +825,7 @@ session_id_validate (RBDAAPShare *share,
+@@ -758,7 +825,7 @@
return FALSE;
}
@@ -1021,7 +1007,7 @@
rb_debug ("Validating session id %u from %s matches %s",
session_id, remote_address, addr);
if (remote_address == NULL || strcmp (addr, remote_address) != 0) {
-@@ -775,7 +842,7 @@ session_id_validate (RBDAAPShare *share,
+@@ -775,7 +842,7 @@
static guint32
session_id_generate (RBDAAPShare *share,
@@ -1030,7 +1016,7 @@
{
guint32 id;
-@@ -786,7 +853,7 @@ session_id_generate (RBDAAPShare *share,
+@@ -786,7 +853,7 @@
static guint32
session_id_create (RBDAAPShare *share,
@@ -1039,7 +1025,7 @@
{
guint32 id;
const char *addr;
-@@ -802,7 +869,7 @@ session_id_create (RBDAAPShare *share,
+@@ -802,7 +869,7 @@
} while (addr != NULL);
/* store session id and remote address */
@@ -1048,7 +1034,7 @@
g_hash_table_insert (share->priv->session_ids, GUINT_TO_POINTER (id), remote_address);
return id;
-@@ -810,16 +877,26 @@ session_id_create (RBDAAPShare *share,
+@@ -810,16 +877,26 @@
static void
session_id_remove (RBDAAPShare *share,
@@ -1078,7 +1064,7 @@
{
/* MLOG login response
* MSTT status
-@@ -840,15 +917,28 @@ login_cb (RBDAAPShare *share,
+@@ -840,15 +917,28 @@
rb_daap_structure_destroy (mlog);
}
@@ -1108,7 +1094,7 @@
rb_debug ("Handling logout session id %u", id);
session_id_remove (share, context, id);
-@@ -858,18 +948,34 @@ logout_cb (RBDAAPShare *share,
+@@ -858,18 +948,34 @@
}
soup_message_set_status (message, status);
@@ -1143,7 +1129,7 @@
if (res && revision_number != share->priv->revision_number) {
/* MUPD update response
-@@ -885,8 +991,15 @@ update_cb (RBDAAPShare *share,
+@@ -885,8 +991,15 @@
message_set_from_rb_daap_structure (message, mupd);
rb_daap_structure_destroy (mupd);
} else {
@@ -1159,7 +1145,7 @@
}
}
-@@ -1151,14 +1264,47 @@ add_playlist_entry_to_mlcl (GtkTreeModel *model,
+@@ -1148,14 +1261,47 @@
}
static bitwise
@@ -1210,7 +1196,7 @@
start_of_attrs = strstr (s, "meta=");
if (start_of_attrs == NULL) {
-@@ -1173,23 +1319,12 @@ parse_meta (const gchar *s)
+@@ -1170,23 +1316,12 @@
attrs = g_strdup (start_of_attrs);
}
@@ -1236,7 +1222,7 @@
static void
write_next_chunk (SoupMessage *message, GnomeVFSHandle *handle)
-@@ -1200,10 +1335,18 @@ write_next_chunk (SoupMessage *message, GnomeVFSHandle *handle)
+@@ -1197,10 +1332,18 @@
result = gnome_vfs_read (handle, chunk, DAAP_SHARE_CHUNK_SIZE, &read_size);
if (result == GNOME_VFS_OK && read_size > 0) {
@@ -1255,7 +1241,7 @@
}
}
-@@ -1241,7 +1384,11 @@ send_chunked_file (SoupMessage *message, RhythmDBEntry *entry, guint64 file_size
+@@ -1238,7 +1381,11 @@
file_size -= offset;
}
@@ -1267,7 +1253,7 @@
g_signal_connect (message, "wrote_chunk", G_CALLBACK (write_next_chunk), handle);
g_signal_connect (message, "finished", G_CALLBACK (chunked_message_finished), handle);
-@@ -1271,11 +1418,14 @@ send_mapped_file (SoupMessage *message, RhythmDBEntry *entry, guint64 file_size,
+@@ -1268,11 +1415,14 @@
g_warning ("Unable to map file %s: %s", path, error->message);
soup_message_set_status (message, SOUP_STATUS_INTERNAL_SERVER_ERROR);
} else {
@@ -1285,7 +1271,7 @@
g_signal_connect (message,
"finished",
-@@ -1286,22 +1436,40 @@ send_mapped_file (SoupMessage *message, RhythmDBEntry *entry, guint64 file_size,
+@@ -1283,22 +1433,40 @@
}
#endif
@@ -1329,7 +1315,7 @@
rest_of_path = strchr (path + 1, '/');
-@@ -1338,7 +1506,11 @@ databases_cb (RBDAAPShare *share,
+@@ -1335,7 +1503,11 @@
message_set_from_rb_daap_structure (message, avdb);
rb_daap_structure_destroy (avdb);
@@ -1341,7 +1327,7 @@
/* ADBS database songs
* MSTT status
* MUTY update type
-@@ -1354,7 +1526,11 @@ databases_cb (RBDAAPShare *share,
+@@ -1351,7 +1523,11 @@
gint32 num_songs = rhythmdb_entry_count_by_type (share->priv->db, share->priv->entry_type);
struct MLCL_Bits mb = {NULL,0};
@@ -1353,7 +1339,7 @@
adbs = rb_daap_structure_add (NULL, RB_DAAP_CC_ADBS);
rb_daap_structure_add (adbs, RB_DAAP_CC_MSTT, (gint32) DMAP_STATUS_OK);
-@@ -1368,7 +1544,11 @@ databases_cb (RBDAAPShare *share,
+@@ -1365,7 +1541,11 @@
message_set_from_rb_daap_structure (message, adbs);
rb_daap_structure_destroy (adbs);
adbs = NULL;
@@ -1365,7 +1351,7 @@
/* APLY database playlists
* MSTT status
* MUTY update type
-@@ -1405,6 +1585,7 @@ databases_cb (RBDAAPShare *share,
+@@ -1402,6 +1582,7 @@
message_set_from_rb_daap_structure (message, aply);
rb_daap_structure_destroy (aply);
@@ -1373,7 +1359,7 @@
} else if (g_ascii_strncasecmp ("/1/containers/", rest_of_path, 14) == 0) {
/* APSO playlist songs
* MSTT status
-@@ -1423,7 +1604,11 @@ databases_cb (RBDAAPShare *share,
+@@ -1420,7 +1601,11 @@
struct MLCL_Bits mb = {NULL,0};
gint pl_id = atoi (rest_of_path + 14);
@@ -1385,7 +1371,7 @@
apso = rb_daap_structure_add (NULL, RB_DAAP_CC_APSO);
rb_daap_structure_add (apso, RB_DAAP_CC_MSTT, (gint32) DMAP_STATUS_OK);
-@@ -1450,9 +1635,11 @@ databases_cb (RBDAAPShare *share,
+@@ -1447,9 +1632,11 @@
_find_by_id);
if (idl == NULL) {
soup_message_set_status (message, SOUP_STATUS_NOT_FOUND);
@@ -1397,7 +1383,7 @@
goto out;
}
id = (RBPlaylistID *)idl->data;
-@@ -1473,7 +1660,7 @@ databases_cb (RBDAAPShare *share,
+@@ -1470,7 +1657,7 @@
rb_daap_structure_destroy (apso);
} else if (g_ascii_strncasecmp ("/1/items/", rest_of_path, 9) == 0) {
/* just the file :) */
@@ -1406,7 +1392,7 @@
gint id;
RhythmDBEntry *entry;
const gchar *location;
-@@ -1489,9 +1676,9 @@ databases_cb (RBDAAPShare *share,
+@@ -1486,9 +1673,9 @@
file_size = rhythmdb_entry_get_uint64 (entry, RHYTHMDB_PROP_FILE_SIZE);
message_add_standard_headers (message);
@@ -1418,7 +1404,7 @@
if (range_header) {
const gchar *s;
gchar *content_range;
-@@ -1500,7 +1687,7 @@ databases_cb (RBDAAPShare *share,
+@@ -1497,7 +1684,7 @@
offset = atoll (s);
content_range = g_strdup_printf ("bytes %" G_GUINT64_FORMAT "-%" G_GUINT64_FORMAT "/%" G_GUINT64_FORMAT, offset, file_size, file_size);
@@ -1427,7 +1413,7 @@
g_free (content_range);
soup_message_set_status (message, SOUP_STATUS_PARTIAL_CONTENT);
-@@ -1525,9 +1712,92 @@ databases_cb (RBDAAPShare *share,
+@@ -1522,9 +1709,92 @@
}
out:
@@ -1520,7 +1506,7 @@
typedef void (* DAAPPathFunction) (RBDAAPShare *share,
SoupServerContext *context,
SoupMessage *message);
-@@ -1570,42 +1840,6 @@ server_cb (SoupServerContext *context,
+@@ -1567,42 +1837,6 @@
g_free (path);
}
@@ -1563,7 +1549,7 @@
static gboolean
soup_auth_callback (SoupServerAuthContext *auth_ctx,
SoupServerAuth *auth,
-@@ -1645,12 +1879,14 @@ soup_auth_callback (SoupServerAuthContext *auth_ctx,
+@@ -1642,12 +1876,14 @@
return allowed;
}
@@ -1579,7 +1565,7 @@
share->priv->server = soup_server_new (SOUP_SERVER_PORT, port, NULL);
if (share->priv->server == NULL) {
-@@ -1669,6 +1905,22 @@ rb_daap_share_server_start (RBDAAPShare *share)
+@@ -1666,6 +1902,22 @@
password_required = (share->priv->auth_method != RB_DAAP_SHARE_AUTH_METHOD_NONE);
if (password_required) {
@@ -1602,7 +1588,7 @@
auth_ctx.types = SOUP_AUTH_TYPE_BASIC;
auth_ctx.callback = (SoupServerAuthCallbackFn)soup_auth_callback;
auth_ctx.user_data = share;
-@@ -1692,14 +1944,36 @@ rb_daap_share_server_start (RBDAAPShare *share)
+@@ -1689,14 +1941,36 @@
(SoupServerCallbackFn)server_cb,
NULL,
share);
@@ -1639,10 +1625,9 @@
soup_server_run_async (share->priv->server);
/* using direct since there is no g_uint_hash or g_uint_equal */
-diff --git a/plugins/daap/rb-daap-src.c b/plugins/daap/rb-daap-src.c
-index 7ecd7bc..994926e 100644
---- a/plugins/daap/rb-daap-src.c
-+++ b/plugins/daap/rb-daap-src.c
+diff -urN rhythmbox-0.11.4/plugins/daap/rb-daap-src.c rhythmbox-0.11.4.new/plugins/daap/rb-daap-src.c
+--- rhythmbox-0.11.4/plugins/daap/rb-daap-src.c 2007-06-17 12:56:21.000000000 +0100
++++ rhythmbox-0.11.4.new/plugins/daap/rb-daap-src.c 2008-02-06 00:57:27.000000000 +0000
@@ -34,8 +34,8 @@
#include <unistd.h>
#include <ctype.h>
@@ -1654,7 +1639,7 @@
#include <glib/gi18n.h>
#include <gst/gst.h>
-@@ -432,7 +432,12 @@ rb_daap_src_open (RBDAAPSrc *src)
+@@ -432,7 +432,12 @@
gchar *host;
guint port;
gchar *path;
@@ -1667,7 +1652,7 @@
gchar *request;
gchar *response;
gchar *end_headers;
-@@ -441,7 +446,6 @@ rb_daap_src_open (RBDAAPSrc *src)
+@@ -441,7 +446,6 @@
guint http_status;
gchar *http_status_phrase = NULL;
gboolean parse_result;
@@ -1675,7 +1660,7 @@
if (src->buffer_base) {
g_free (src->buffer_base);
-@@ -536,6 +540,15 @@ rb_daap_src_open (RBDAAPSrc *src)
+@@ -536,6 +540,15 @@
return FALSE;
}
@@ -1691,7 +1676,7 @@
/* for compatibility with older versions of libsoup, we may need to retry
* the soup_headers_parse_response call with slightly different arguments.
* since this function modifies the string passed in, we need to copy it
-@@ -567,28 +580,42 @@ rb_daap_src_open (RBDAAPSrc *src)
+@@ -567,28 +580,42 @@
&http_status,
&http_status_phrase);
}
@@ -1742,7 +1727,7 @@
ok = FALSE;
}
} else {
-@@ -609,8 +636,13 @@ rb_daap_src_open (RBDAAPSrc *src)
+@@ -609,8 +636,13 @@
ok = FALSE;
}
g_free (http_status_phrase);
- Previous message (by thread): rpms/knetworkmanager/devel .cvsignore, 1.11, 1.12 knetworkmanager.spec, 1.15, 1.16 sources, 1.11, 1.12
- Next message (by thread): rpms/kernel/F-7 linux-2.6-acpi-dont-init-ec-early-with-no-ini.patch, NONE, 1.1 linux-2.6-acpi-git-ec-init-fixes.patch, NONE, 1.1 linux-2.6-acpi_ec_early_init_fix.patch, NONE, 1.1 kernel-2.6.spec, 1.3426, 1.3427
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list