head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.134
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.132
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.130
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.128
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.126
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.124
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.122
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.120
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.118
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.116
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.114
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.112
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.110
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.108
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.106
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.104
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.102
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.100
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.98
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.96
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.94
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.92
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.90
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.86
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.66
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.88
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.84
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.82
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.80
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.78
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.76
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.74
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.72
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.70
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.68
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.64
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.62
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.60
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.58
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.56
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.54
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.52
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.50
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.48
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.46
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.44
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.42
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.40
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.38
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.36
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.34
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.32
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.30
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.28
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.26
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.24
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.22
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.20
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.18
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.16
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.14
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.12
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.10
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.8
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.6
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.4
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.2
	pkgsrc-2009Q3-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2009.09.03.01.29.34;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.1
log
@Fix a number of annoying issues in gbemol:
- sort albums for the selector
- fix crash if authentication failed
- make authentication actually work
- be consistent in section of the config file used
Bump revision
@
text
@$NetBSD$

--- src/gbemol-mpd.c.orig	2009-04-25 04:38:51.000000000 +0200
+++ src/gbemol-mpd.c
@@@@ -2,6 +2,7 @@@@
 
 #include "gbemol-mpd.h"
 #include "gbemol-marshal.h"
+#include "gbemol-utils.h"
 
 /* Properties */
 enum {
@@@@ -454,51 +455,31 @@@@ gboolean gbemol_mpd_connect (GbemolMpd* 
 	obj->priv->conn = mpd_newConnection (obj->priv->host, obj->priv->port, obj->priv->timeout);
 	
 	if (gbemol_mpd_finish_and_handle (obj))
-		obj->priv->connected = FALSE;
-	else
-	{
-		gbemol_mpd_get_not_commands_list (obj);
-		if (obj->status)
-			mpd_freeStatus (obj->status);
-		obj->status = gbemol_mpd_get_status (obj);
-		obj->priv->connected = TRUE;
-		/* Emit a song-changed signal */
-		g_signal_emit (obj, gbemol_mpd_signals [SONG_CHANGED_SIGNAL], 0, NULL);
-	}
-
-	return obj->priv->connected;
-}
-
-/* Connect */
-gboolean gbemol_mpd_connect_and_authenticate (GbemolMpd* obj)
-{
-	if (obj->priv->conn)
-		mpd_closeConnection (obj->priv->conn);
-
-	obj->priv->conn = mpd_newConnection (obj->priv->host, obj->priv->port, obj->priv->timeout);
-	
-	if (gbemol_mpd_finish_and_handle (obj))
 	{
 		obj->priv->connected = FALSE;
 		return FALSE;
 	}
-	else
-		obj->priv->connected = TRUE;
 
-	/* Not authenticated, yet connected, so return TRUE, but mark as disconnected */
-	if (!gbemol_mpd_authenticate (obj))
-		obj->priv->connected = FALSE;
-	else
+	if (gbemol_cfg_get_bool("mpd", "use_auth"))
 	{
-		gbemol_mpd_get_not_commands_list (obj);
-		if (obj->status)
-			mpd_freeStatus (obj->status);
-		obj->status = gbemol_mpd_get_status (obj);
-		/* Emit a song-changed signal */
-		g_signal_emit (obj, gbemol_mpd_signals [SONG_CHANGED_SIGNAL], 0, NULL);
+		if (!obj->priv->pass)
+			obj->priv->pass = gbemol_cfg_get_string("mpd", "pass");
+		if (!obj->priv->pass || !gbemol_mpd_authenticate (obj))
+		{
+			obj->priv->connected = FALSE;
+			return FALSE;		
+		}
 	}
 
-	return TRUE;
+	gbemol_mpd_get_not_commands_list (obj);
+	if (obj->status)
+		mpd_freeStatus (obj->status);
+	obj->status = gbemol_mpd_get_status (obj);
+	obj->priv->connected = TRUE;
+	/* Emit a song-changed signal */
+	g_signal_emit (obj, gbemol_mpd_signals [SONG_CHANGED_SIGNAL], 0, NULL);
+
+	return obj->priv->connected;
 }
 
 void gbemol_mpd_disconnect (GbemolMpd *obj)
@