diff -pruN 0.4.22-2/debian/changelog 0.4.22-3/debian/changelog --- 0.4.22-2/debian/changelog 2011-01-05 03:54:28.000000000 +0000 +++ 0.4.22-3/debian/changelog 2013-08-05 12:12:45.000000000 +0000 @@ -1,3 +1,12 @@ +pidgin-musictracker (0.4.22-3) unstable; urgency=low + + * Updated to standards version 3.9.4 + * Update to debhelper 9 + * Removed musictracker.la file Closes: #633174 + * Patched mpris to remove GValueArray Closes: #707449 + + -- Craig Small Mon, 05 Aug 2013 21:08:43 +1000 + pidgin-musictracker (0.4.22-2) unstable; urgency=low * Added ignore regexp for po files to source options diff -pruN 0.4.22-2/debian/compat 0.4.22-3/debian/compat --- 0.4.22-2/debian/compat 2010-03-15 10:17:25.000000000 +0000 +++ 0.4.22-3/debian/compat 2013-08-05 11:11:22.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -pruN 0.4.22-2/debian/control 0.4.22-3/debian/control --- 0.4.22-2/debian/control 2011-01-05 03:25:26.000000000 +0000 +++ 0.4.22-3/debian/control 2013-08-05 11:44:39.000000000 +0000 @@ -2,8 +2,8 @@ Source: pidgin-musictracker Section: net Priority: extra Maintainer: Craig Small -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, pidgin-dev, libdbus-glib-1-dev, libpcre3-dev, libxmmsclient-dev -Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 9), autotools-dev, pidgin-dev, libdbus-glib-1-dev, libpcre3-dev, libxmmsclient-dev +Standards-Version: 3.9.4 Package: pidgin-musictracker Architecture: any diff -pruN 0.4.22-2/debian/patches/debian-changes-0.4.22-1 0.4.22-3/debian/patches/debian-changes-0.4.22-1 --- 0.4.22-2/debian/patches/debian-changes-0.4.22-1 2011-01-05 03:53:17.000000000 +0000 +++ 0.4.22-3/debian/patches/debian-changes-0.4.22-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -Description: Upstream changes introduced in version 0.4.22-1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - pidgin-musictracker (0.4.22-1) unstable; urgency=low - . - * New upstream release - * Updated to standards version 3.9.1, no changes - . - The person named in the Author field signed this changelog entry. -Author: Craig Small - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- /dev/null -+++ pidgin-musictracker-0.4.22/po/stamp-po -@@ -0,0 +1 @@ -+timestamp diff -pruN 0.4.22-2/debian/patches/mpris_gvalue 0.4.22-3/debian/patches/mpris_gvalue --- 0.4.22-2/debian/patches/mpris_gvalue 1970-01-01 00:00:00.000000000 +0000 +++ 0.4.22-3/debian/patches/mpris_gvalue 2013-08-05 12:11:10.000000000 +0000 @@ -0,0 +1,47 @@ +Description: GValueArray changed for mpris +Bug-Debian: http://bugs.debian.org/707449 +Last-Update: 2013-08-05 +--- a/src/mpris.c ++++ b/src/mpris.c +@@ -57,7 +57,7 @@ + #define DBUS_MPRIS_STATUS_SIGNAL "StatusChange" + + #define DBUS_TYPE_G_STRING_VALUE_HASHTABLE (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE)) +-#define DBUS_TYPE_MPRIS_STATUS (dbus_g_type_get_struct ("GValueArray", G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID)) ++#define DBUS_TYPE_MPRIS_STATUS (dbus_g_type_get_struct ("GArray", G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID)) + + #define mpris_debug(fmt, ...) purple_debug(PURPLE_DEBUG_INFO, "MPRIS", \ + fmt, ## __VA_ARGS__); +@@ -145,12 +145,12 @@ + } + + static void +-mpris_status_signal_struct_cb(DBusGProxy *player_proxy, GValueArray *sigstruct, struct TrackInfo *ti) ++mpris_status_signal_struct_cb(DBusGProxy *player_proxy, GArray *sigstruct, struct TrackInfo *ti) + { + int status = -1; + if (sigstruct) + { +- GValue *v = g_value_array_get_nth(sigstruct, 0); ++ GValue *v = &g_array_index(sigstruct, GValue,0); + status = g_value_get_int(v); + } + +@@ -324,7 +324,7 @@ + } + else + { +- GValueArray *s = 0; ++ GArray *s = 0; + result = dbus_g_proxy_call_with_timeout(player->proxy, "GetStatus", DBUS_TIMEOUT*10, &error, + G_TYPE_INVALID, + DBUS_TYPE_MPRIS_STATUS, &s, +@@ -333,7 +333,7 @@ + if (result) + { + mpris_status_signal_struct_cb(NULL, s, &(player->ti)); +- g_value_array_free(s); ++ g_array_free(s, TRUE); + } + } + diff -pruN 0.4.22-2/debian/patches/series 0.4.22-3/debian/patches/series --- 0.4.22-2/debian/patches/series 2011-01-05 03:53:17.000000000 +0000 +++ 0.4.22-3/debian/patches/series 2013-08-05 11:20:37.000000000 +0000 @@ -1 +1 @@ -debian-changes-0.4.22-1 +mpris_gvalue diff -pruN 0.4.22-2/debian/rules 0.4.22-3/debian/rules --- 0.4.22-2/debian/rules 2010-03-15 11:01:56.000000000 +0000 +++ 0.4.22-3/debian/rules 2013-08-05 12:27:47.000000000 +0000 @@ -5,6 +5,15 @@ %: dh $@ +DPKG_BUILDFLAGS=$(shell dpkg-buildflags --export=cmdline) + +override_dh_auto_configure: + ./configure ${DPKG_BUILDFLAGS} + override_dh_auto_build: dh_auto_build make -C po update-po + +override_dh_auto_install: + dh_auto_install + rm debian/pidgin-musictracker/usr/lib/pidgin/musictracker.la diff -pruN 0.4.22-2/debian/source/options 0.4.22-3/debian/source/options --- 0.4.22-2/debian/source/options 2011-01-05 03:51:52.000000000 +0000 +++ 0.4.22-3/debian/source/options 2013-08-05 11:17:45.000000000 +0000 @@ -1 +1 @@ -extend-diff-ignore=po/.*\.pot? +extend-diff-ignore=po/(.*\.pot?|stamp-po) diff -pruN 0.4.22-2/.pc/applied-patches 0.4.22-3/.pc/applied-patches --- 0.4.22-2/.pc/applied-patches 2013-08-05 15:39:59.707770431 +0000 +++ 0.4.22-3/.pc/applied-patches 2013-08-05 15:40:00.095780574 +0000 @@ -1 +1 @@ -debian-changes-0.4.22-1 +mpris_gvalue diff -pruN 0.4.22-2/.pc/mpris_gvalue/src/mpris.c 0.4.22-3/.pc/mpris_gvalue/src/mpris.c --- 0.4.22-2/.pc/mpris_gvalue/src/mpris.c 1970-01-01 00:00:00.000000000 +0000 +++ 0.4.22-3/.pc/mpris_gvalue/src/mpris.c 2010-07-21 19:59:44.000000000 +0000 @@ -0,0 +1,469 @@ +/* + * musictracker + * mpris.c + * retrieve track info over DBUS from MRPIS-compliant player + * + * Copyright (c) 2007 Sabin Iacob (m0n5t3r) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +// +// totally ripped off from pidgin-mpris http://m0n5t3r.info/work/pidgin-mpris +// keep the signal/cb structure around for the moment, even though we have +// to bodge it to integrate with our current polling architecture, it may +// come in useful later when we change it... +// + +// +// See http://wiki.xmms2.xmms.se/wiki/MPRIS for MRPIS specification +// +// Notes: +// +// BMPx 0.40 doesn't have GetStatus, so we need to listen for the StatusChange signal +// it also uses a uint64 value for the time metadata +// +// Audacious 1.4 and BMPx 0.40 implement the wrong signature for StatusChange/GetStatus, +// returning a single int rather than 4 ints +// +// VLC 0.9.1 seems to be quite slow to respond to requests, so timeout needs to be large +// + +#include +#include +#include +#include + +#include "musictracker.h" +#include "utils.h" + +#define DBUS_MPRIS_NAMESPACE "org.mpris." +#define DBUS_MPRIS_PLAYER "org.freedesktop.MediaPlayer" +#define DBUS_MPRIS_PLAYER_PATH "/Player" +#define DBUS_MPRIS_TRACK_SIGNAL "TrackChange" +#define DBUS_MPRIS_STATUS_SIGNAL "StatusChange" + +#define DBUS_TYPE_G_STRING_VALUE_HASHTABLE (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE)) +#define DBUS_TYPE_MPRIS_STATUS (dbus_g_type_get_struct ("GValueArray", G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID)) + +#define mpris_debug(fmt, ...) purple_debug(PURPLE_DEBUG_INFO, "MPRIS", \ + fmt, ## __VA_ARGS__); +#define mpris_error(fmt, ...) purple_debug(PURPLE_DEBUG_ERROR, "MPRIS", \ + fmt, ## __VA_ARGS__); + +#define MPRIS_HINT_STATUSCHANGE 1 +#define MPRIS_HINT_METADATA_METHOD_CASE 2 + +typedef struct { + unsigned int hints; + DBusGProxy *proxy; + gchar *service_name; + gchar *player_name; + struct TrackInfo ti; +} pidginmpris_t; + +static GHashTable *players = NULL; + +static +void +mpris_debug_dump_helper(gpointer key, gpointer value, gpointer user_data) +{ + char *s = g_strdup_value_contents(value); + mpris_debug("For key '%s' value is '%s' as a %s\n", (char *)key, s, G_VALUE_TYPE_NAME(value)); + g_free(s); +} + +static void +mpris_track_signal_cb(DBusGProxy *player_proxy, GHashTable *table, struct TrackInfo *ti) +{ + GValue *value; + + // clear any previous data in case some keys are absent + g_strlcpy(ti->artist, "", STRLEN); + g_strlcpy(ti->album, "", STRLEN); + g_strlcpy(ti->track, "", STRLEN); + ti->totalSecs = 0; + + /* fetch values from hash table */ + value = (GValue *) g_hash_table_lookup(table, "artist"); + if (value != NULL && G_VALUE_HOLDS_STRING(value)) { + g_strlcpy(ti->artist, g_value_get_string(value), STRLEN); + } + value = (GValue *) g_hash_table_lookup(table, "album"); + if (value != NULL && G_VALUE_HOLDS_STRING(value)) { + g_strlcpy(ti->album, g_value_get_string(value), STRLEN); + } + value = (GValue *) g_hash_table_lookup(table, "title"); + if (value != NULL && G_VALUE_HOLDS_STRING(value)) { + g_strlcpy(ti->track, g_value_get_string(value), STRLEN); + } + value = (GValue *) g_hash_table_lookup(table, "time"); + if (value != NULL) + { + if (G_VALUE_HOLDS_UINT(value)) { + ti->totalSecs = g_value_get_uint(value); + } else if (G_VALUE_HOLDS_UINT64(value)) { + ti->totalSecs = g_value_get_uint64(value); + } + } + + // debug dump + g_hash_table_foreach(table, mpris_debug_dump_helper ,0); +} + +static void +mpris_status_signal_int_cb(DBusGProxy *player_proxy, gint status, struct TrackInfo *ti) +{ + mpris_debug("StatusChange %d\n", status); + + switch (status) + { + case 0: + ti->status = PLAYER_STATUS_PLAYING; + break; + case 1: + ti->status = PLAYER_STATUS_PAUSED; + break; + case 2: + default: + ti->status = PLAYER_STATUS_STOPPED; + break; + } +} + +static void +mpris_status_signal_struct_cb(DBusGProxy *player_proxy, GValueArray *sigstruct, struct TrackInfo *ti) +{ + int status = -1; + if (sigstruct) + { + GValue *v = g_value_array_get_nth(sigstruct, 0); + status = g_value_get_int(v); + } + + mpris_debug("StatusChange %d\n", status); + + switch (status) + { + case 0: + ti->status = PLAYER_STATUS_PLAYING; + break; + case 1: + ti->status = PLAYER_STATUS_PAUSED; + break; + case 2: + default: + ti->status = PLAYER_STATUS_STOPPED; + break; + } +} + +static void mpris_connect_dbus_signals(pidginmpris_t *player) +{ + player->proxy = dbus_g_proxy_new_for_name(connection, + player->service_name, DBUS_MPRIS_PLAYER_PATH, DBUS_MPRIS_PLAYER); + + dbus_g_proxy_add_signal(player->proxy, DBUS_MPRIS_TRACK_SIGNAL, + DBUS_TYPE_G_STRING_VALUE_HASHTABLE, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(player->proxy, DBUS_MPRIS_TRACK_SIGNAL, + G_CALLBACK(mpris_track_signal_cb), &(player->ti), NULL); + + if (player->hints & MPRIS_HINT_STATUSCHANGE) + { + dbus_g_proxy_add_signal(player->proxy, DBUS_MPRIS_STATUS_SIGNAL, + G_TYPE_INT, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(player->proxy, DBUS_MPRIS_STATUS_SIGNAL, + G_CALLBACK(mpris_status_signal_int_cb), &(player->ti), NULL); + } + else + { + dbus_g_proxy_add_signal(player->proxy, DBUS_MPRIS_STATUS_SIGNAL, + DBUS_TYPE_MPRIS_STATUS, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(player->proxy, DBUS_MPRIS_STATUS_SIGNAL, + G_CALLBACK(mpris_status_signal_struct_cb), &(player->ti), NULL); + } +} + +static gboolean mpris_app_running(pidginmpris_t *player) +{ + DBusGProxy *proxy = dbus_g_proxy_new_for_name_owner(connection, + player->service_name, DBUS_MPRIS_PLAYER_PATH, DBUS_MPRIS_PLAYER, NULL); + + if(!proxy) + return FALSE; + + g_object_unref(proxy); + return TRUE; +} + +static void +player_new(const char *service_name) +{ + mpris_debug("Setting up %s\n", service_name); + + pidginmpris_t *player = g_malloc0(sizeof(pidginmpris_t)); + player->service_name = g_strdup(service_name); + + if ((strcmp(service_name, "org.mpris.audacious") == 0) || + (strcmp(service_name, "org.mpris.bmp") == 0) || + (strncmp(service_name, "org.mpris.dragonplayer", strlen("org.mpris.dragonplayer")) == 0)) + { + mpris_debug("Setting non-standard status change hint\n"); + player->hints |= MPRIS_HINT_STATUSCHANGE; + } + + if (strncmp(service_name, "org.mpris.dragonplayer", strlen("org.mpris.dragonplayer")) == 0) + { + mpris_debug("Setting non-standard metadata method name hint\n"); + player->hints |= MPRIS_HINT_METADATA_METHOD_CASE; + } + + g_hash_table_insert(players, g_strdup(service_name), player); + + /* connect mpris's dbus signals */ + mpris_connect_dbus_signals(player); + + mpris_status_signal_int_cb(NULL, -1, &(player->ti)); + + /* Try to discover how this player likes to be known */ + DBusGProxy *proxy = dbus_g_proxy_new_for_name(connection, player->service_name, "/", DBUS_MPRIS_PLAYER); + if (proxy) + { + GError *error = 0; + char *identity; + if (dbus_g_proxy_call(proxy, "Identity", &error, + G_TYPE_INVALID, G_TYPE_STRING, &identity, G_TYPE_INVALID)) + { + mpris_debug("Player Identity '%s'\n", identity); + /* Use the first word of the Identity string (as it contains a version as well */ + gchar **v = g_strsplit(identity, " ", 2); + if (v) + { + player->player_name = g_strdup(*v); + g_strfreev(v); + } + else + { + player->player_name = g_strdup(""); + } + } + else + { + mpris_error("Identity method failed: %s\n", error->message); + g_error_free(error); + } + g_object_unref(proxy); + } + + /* Fallback to using the service name with leading 'org.mpris.' removed */ + if (!player->player_name) + { + player->player_name = g_strdup(service_name + strlen(DBUS_MPRIS_NAMESPACE)); + player->player_name[0] = g_ascii_toupper(player->player_name[0]); + } + + mpris_debug("created player record for service '%s'\n", service_name); +} + +static void +player_delete(gpointer data) +{ + pidginmpris_t *player = (pidginmpris_t *)data; + + if (player) + { + g_free(player->service_name); + g_free(player->player_name); + g_free(player); + } +} + +static void +mpris_check_player(gpointer key, gpointer value, gpointer user_data) +{ + pidginmpris_t *player = (pidginmpris_t *)value; + struct TrackInfo *ti = (struct TrackInfo *)user_data; + + /* If we've already found an active player, don't carry on checking... */ + if (ti->status != PLAYER_STATUS_CLOSED) + { + return; + } + + GError *error = 0; + mpris_debug("Trying %s\n", player->service_name); + + if(mpris_app_running(player)) { + error = 0; + gboolean result; + int status; + if (player->hints & MPRIS_HINT_STATUSCHANGE) + { + result = dbus_g_proxy_call_with_timeout(player->proxy, "GetStatus", DBUS_TIMEOUT*10, &error, + G_TYPE_INVALID, + G_TYPE_INT, &status, + G_TYPE_INVALID); + + if (result) + { + mpris_status_signal_int_cb(NULL, status, &(player->ti)); + } + } + else + { + GValueArray *s = 0; + result = dbus_g_proxy_call_with_timeout(player->proxy, "GetStatus", DBUS_TIMEOUT*10, &error, + G_TYPE_INVALID, + DBUS_TYPE_MPRIS_STATUS, &s, + G_TYPE_INVALID); + + if (result) + { + mpris_status_signal_struct_cb(NULL, s, &(player->ti)); + g_value_array_free(s); + } + } + + if (!result) + { + if (error) + { + mpris_debug("GetStatus failed %s\n", error->message); + g_error_free(error); + } + else + { + mpris_debug("GetStatus failed with no error\n"); + } + + return; + } + + error = 0; + GHashTable *table = NULL; + if(dbus_g_proxy_call_with_timeout(player->proxy, + (player->hints & MPRIS_HINT_METADATA_METHOD_CASE) ? "GetMetaData" : "GetMetadata", + DBUS_TIMEOUT*10, &error, + G_TYPE_INVALID, DBUS_TYPE_G_STRING_VALUE_HASHTABLE, &table, + G_TYPE_INVALID)) { + mpris_track_signal_cb(NULL, table, &(player->ti)); + g_hash_table_destroy(table); + } + else + { + if (error) + { + mpris_debug("GetMetadata failed %s\n", error->message); + g_error_free(error); + } + else + { + mpris_debug("GetMetadata failed with no error\n"); + } + + return; + } + + error = 0; + int position; + if(dbus_g_proxy_call_with_timeout(player->proxy, "PositionGet", DBUS_TIMEOUT*10, &error, + G_TYPE_INVALID, G_TYPE_INT, &position, + G_TYPE_INVALID)) { + player->ti.currentSecs = position/1000; + } + else + { + if (error) + { + mpris_debug("PositionGet failed %s\n", error->message); + g_error_free(error); + } + else + { + mpris_debug("PositionGet failed with no error\n"); + } + + return; + } + + player->ti.player = player->player_name; + + if (player->ti.status != PLAYER_STATUS_CLOSED) + { + *ti = player->ti; + } + } +} + +void +get_mpris_info(struct TrackInfo* ti) +{ + if (!connection) + { + if (!dbus_g_init_connection()) + return; + } + + if (!players) + { + players = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, player_delete); + } + + /* Look for "org.mpris.*" service names on the bus */ + GError *error = 0; + + static DBusGProxy *proxy = 0; + if (!proxy) + { + proxy = dbus_g_proxy_new_for_name(connection, "org.freedesktop.DBus", "/", "org.freedesktop.DBus"); + } + + if (proxy) + { + char **v; + if (dbus_g_proxy_call(proxy, "ListNames", &error, G_TYPE_INVALID, G_TYPE_STRV, &v, G_TYPE_INVALID)) + { + for (char **i = v; (*i) != 0; i++) + { + /* Is this an org.mpris.* sevice ? */ + if (strncmp(DBUS_MPRIS_NAMESPACE, *i, strlen(DBUS_MPRIS_NAMESPACE)) == 0) + { + /* Is it already in our list ? */ + if (!g_hash_table_lookup(players, *i)) + { + /* Allocate, populate and add a new player info structure */ + player_new(*i); + } + } + } + g_strfreev(v); + } + else + { + mpris_debug("ListNames failed %s\n", error->message); + g_error_free(error); + } + } + else + { + mpris_debug("Failed to connect to Dbus%s\n", error->message); + g_error_free(error); + } + + ti->status = PLAYER_STATUS_CLOSED; + + g_hash_table_foreach(players, mpris_check_player, ti); +} diff -pruN 0.4.22-2/po/stamp-po 0.4.22-3/po/stamp-po --- 0.4.22-2/po/stamp-po 2013-08-05 15:39:59.000000000 +0000 +++ 0.4.22-3/po/stamp-po 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -timestamp diff -pruN 0.4.22-2/src/mpris.c 0.4.22-3/src/mpris.c --- 0.4.22-2/src/mpris.c 2010-07-21 19:59:44.000000000 +0000 +++ 0.4.22-3/src/mpris.c 2013-08-05 15:40:00.000000000 +0000 @@ -57,7 +57,7 @@ #define DBUS_MPRIS_STATUS_SIGNAL "StatusChange" #define DBUS_TYPE_G_STRING_VALUE_HASHTABLE (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE)) -#define DBUS_TYPE_MPRIS_STATUS (dbus_g_type_get_struct ("GValueArray", G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID)) +#define DBUS_TYPE_MPRIS_STATUS (dbus_g_type_get_struct ("GArray", G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID)) #define mpris_debug(fmt, ...) purple_debug(PURPLE_DEBUG_INFO, "MPRIS", \ fmt, ## __VA_ARGS__); @@ -145,12 +145,12 @@ mpris_status_signal_int_cb(DBusGProxy *p } static void -mpris_status_signal_struct_cb(DBusGProxy *player_proxy, GValueArray *sigstruct, struct TrackInfo *ti) +mpris_status_signal_struct_cb(DBusGProxy *player_proxy, GArray *sigstruct, struct TrackInfo *ti) { int status = -1; if (sigstruct) { - GValue *v = g_value_array_get_nth(sigstruct, 0); + GValue *v = &g_array_index(sigstruct, GValue,0); status = g_value_get_int(v); } @@ -324,7 +324,7 @@ mpris_check_player(gpointer key, gpointe } else { - GValueArray *s = 0; + GArray *s = 0; result = dbus_g_proxy_call_with_timeout(player->proxy, "GetStatus", DBUS_TIMEOUT*10, &error, G_TYPE_INVALID, DBUS_TYPE_MPRIS_STATUS, &s, @@ -333,7 +333,7 @@ mpris_check_player(gpointer key, gpointe if (result) { mpris_status_signal_struct_cb(NULL, s, &(player->ti)); - g_value_array_free(s); + g_array_free(s, TRUE); } }