comparison pidgin-audacious.c @ 8:8af1f090ba9a

branch merge

7:feb13e877029

                                        AUDACIOUS_DBUS_PATH,
                                        AUDACIOUS_DBUS_INTERFACE);

    g_clear_error(&error);
    return session;
#if 0
    if (audacious_remote_is_running(session)) {
        return session;
    }
    else {
        return NULL;
    }
#endif
}

static gboolean
watchdog_func(void)
{
	gint playpos = 0;
	gchar *song = NULL, *tmp = NULL;
//    DBusGProxy *session = get_dbus_proxy();

	gboolean rv = TRUE;
	size_t dummy;

    aud_debug("session = %p\n", session);

	/* generate key for hash table*/
	key = g_strdup_printf("%s %s", account->username, account->protocol_id);

	/* retrieve current alias */
//	current = purple_url_decode(purple_account_get_alias(account));
	current = purple_account_get_alias(account);
	if(current == NULL || strlen(current) == 0) {
		aud_error("couldn't get current alias\n");
        g_free(key);
		return;

    pushed = g_hash_table_lookup(pushed_alias, key);

    /* if current alias differs from pushed_alias or contains token, replace seed with current. */
    if( (pushed && g_ascii_strcasecmp(current, pushed)) || strstr(current, SONG_TOKEN) ) {
		g_hash_table_replace(seed_alias, g_strdup(key), g_strdup(current));
//		g_hash_table_replace(pushed_alias, g_strdup(key), g_strdup(current)); //XXX should do?
    }

	/* construct new status message */
	seed = g_hash_table_lookup(seed_alias, key);
	g_return_if_fail(seed != NULL);

	0,						    /**< flags	*/
	NULL,						/**< deps	*/
	PURPLE_PRIORITY_DEFAULT,	/**< priority	*/
	PIDGINAUD_PLUGIN_ID,		/**< id		*/
	"Pidgin-Audacious",			/**< name	*/
	"2.0.0d4",					/**< version	*/
	"Automatically updates your Pidgin status info	with the currently "
			"playing music in Audacious.", /**  summary	*/
	"Automatically updates your Pidgin status info with the currently "
			"playing music in Audacious.", /**  desc	*/
	"Yoshiki Yazawa ([e-mail])", /**< author	*/

8:8af1f090ba9a

                                        AUDACIOUS_DBUS_PATH,
                                        AUDACIOUS_DBUS_INTERFACE);

    g_clear_error(&error);
    return session;
}

static gboolean
watchdog_func(void)
{
	gint playpos = 0;
	gchar *song = NULL, *tmp = NULL;

	gboolean rv = TRUE;
	size_t dummy;

    aud_debug("session = %p\n", session);

	/* generate key for hash table*/
	key = g_strdup_printf("%s %s", account->username, account->protocol_id);

	/* retrieve current alias */
	current = purple_account_get_alias(account);
	if(current == NULL || strlen(current) == 0) {
		aud_error("couldn't get current alias\n");
        g_free(key);
		return;

    pushed = g_hash_table_lookup(pushed_alias, key);

    /* if current alias differs from pushed_alias or contains token, replace seed with current. */
    if( (pushed && g_ascii_strcasecmp(current, pushed)) || strstr(current, SONG_TOKEN) ) {
		g_hash_table_replace(seed_alias, g_strdup(key), g_strdup(current));
    }

	/* construct new status message */
	seed = g_hash_table_lookup(seed_alias, key);
	g_return_if_fail(seed != NULL);

	0,						    /**< flags	*/
	NULL,						/**< deps	*/
	PURPLE_PRIORITY_DEFAULT,	/**< priority	*/
	PIDGINAUD_PLUGIN_ID,		/**< id		*/
	"Pidgin-Audacious",			/**< name	*/
	"2.0.0",					/**< version	*/
	"Automatically updates your Pidgin status info	with the currently "
			"playing music in Audacious.", /**  summary	*/
	"Automatically updates your Pidgin status info with the currently "
			"playing music in Audacious.", /**  desc	*/
	"Yoshiki Yazawa ([e-mail])", /**< author	*/