head	1.4;
access;
symbols
	pkgsrc-2019Q3:1.3.0.36
	pkgsrc-2019Q3-base:1.3
	pkgsrc-2019Q2:1.3.0.34
	pkgsrc-2019Q2-base:1.3
	pkgsrc-2019Q1:1.3.0.32
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.3.0.30
	pkgsrc-2018Q4-base:1.3
	pkgsrc-2018Q3:1.3.0.28
	pkgsrc-2018Q3-base:1.3
	pkgsrc-2018Q2:1.3.0.26
	pkgsrc-2018Q2-base:1.3
	pkgsrc-2018Q1:1.3.0.24
	pkgsrc-2018Q1-base:1.3
	pkgsrc-2017Q4:1.3.0.22
	pkgsrc-2017Q4-base:1.3
	pkgsrc-2017Q3:1.3.0.20
	pkgsrc-2017Q3-base:1.3
	pkgsrc-2017Q2:1.3.0.16
	pkgsrc-2017Q2-base:1.3
	pkgsrc-2017Q1:1.3.0.14
	pkgsrc-2017Q1-base:1.3
	pkgsrc-2016Q4:1.3.0.12
	pkgsrc-2016Q4-base:1.3
	pkgsrc-2016Q3:1.3.0.10
	pkgsrc-2016Q3-base:1.3
	pkgsrc-2016Q2:1.3.0.8
	pkgsrc-2016Q2-base:1.3
	pkgsrc-2016Q1:1.3.0.6
	pkgsrc-2016Q1-base:1.3
	pkgsrc-2015Q4:1.3.0.4
	pkgsrc-2015Q4-base:1.3
	pkgsrc-2015Q3:1.3.0.2
	pkgsrc-2015Q3-base:1.3
	pkgsrc-2015Q2:1.2.0.42
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.40
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.38
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.36
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.34
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.32
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.30
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.28
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.26
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.24
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.22
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.20
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.2.0.18
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.2.0.16
	pkgsrc-2012Q1-base:1.2
	pkgsrc-2011Q4:1.2.0.14
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.2.0.12
	pkgsrc-2011Q3-base:1.2
	pkgsrc-2011Q2:1.2.0.10
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2011Q1:1.2.0.8
	pkgsrc-2011Q1-base:1.2
	pkgsrc-2010Q4:1.2.0.6
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.2.0.4
	pkgsrc-2010Q3-base:1.2
	pkgsrc-2010Q2:1.2.0.2
	pkgsrc-2010Q2-base:1.2
	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.4
date	2019.10.18.12.34.19;	author nia;	state dead;
branches;
next	1.3;
commitid	CsjRAVagkjTPzlHB;

1.3
date	2015.08.25.07.13.03;	author richard;	state Exp;
branches;
next	1.2;
commitid	1LDy2SaUCnQNuCyy;

1.2
date	2010.05.18.20.03.04;	author drochner;	state Exp;
branches;
next	1.1;

1.1
date	2009.08.10.10.00.19;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.4
log
@sound-juicer: Update to 3.24.0

Switch to gtk3 and away from gstreamer0.10.
@
text
@$NetBSD: patch-ac,v 1.3 2015/08/25 07:13:03 richard Exp $

--- src/sj-main.c.orig	2010-08-04 13:35:35.000000000 +0000
+++ src/sj-main.c
@@@@ -673,11 +673,11 @@@@ AlbumDetails* multiple_album_dialog(GLis
  */
 static void baseuri_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
 {
-  g_assert (strcmp (entry->key, GCONF_BASEURI) == 0);
+  g_assert (!entry || strcmp (entry->key, GCONF_BASEURI) == 0);
   if (base_uri) {
     g_object_unref (base_uri);
   }
-  if (entry->value == NULL) {
+  if (!entry || entry->value == NULL) {
     base_uri = sj_get_default_music_directory ();
   } else {
     base_uri = g_file_new_for_uri (gconf_value_get_string (entry->value));
@@@@ -690,8 +690,8 @@@@ static void baseuri_changed_cb (GConfCli
  */
 static void path_pattern_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
 {
-  g_assert (strcmp (entry->key, GCONF_PATH_PATTERN) == 0);
-  if (entry->value == NULL) {
+  g_assert (!entry || strcmp (entry->key, GCONF_PATH_PATTERN) == 0);
+  if (!entry || entry->value == NULL) {
     /* TODO: this value and the value in sj-prefs need to be in one place */
     path_pattern = g_strdup ("%aa/%at");
   } else {
@@@@ -705,8 +705,8 @@@@ static void path_pattern_changed_cb (GCo
  */
 static void file_pattern_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
 {
-  g_assert (strcmp (entry->key, GCONF_FILE_PATTERN) == 0);
-  if (entry->value == NULL) {
+  g_assert (!entry || strcmp (entry->key, GCONF_FILE_PATTERN) == 0);
+  if (!entry || entry->value == NULL) {
     /* TODO: this value and the value in sj-prefs need to be in one place */
     file_pattern = g_strdup ("%tN-%tt");
   } else {
@@@@ -720,8 +720,8 @@@@ static void file_pattern_changed_cb (GCo
  */
 static void paranoia_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
 {
-  g_assert (strcmp (entry->key, GCONF_PARANOIA) == 0);
-  if (entry->value == NULL) {
+  g_assert (!entry || strcmp (entry->key, GCONF_PARANOIA) == 0);
+  if (!entry || entry->value == NULL) {
     sj_extractor_set_paranoia (extractor, DEFAULT_PARANOIA);
   } else {
     int value = gconf_value_get_int (entry->value);
@@@@ -736,8 +736,8 @@@@ static void paranoia_changed_cb (GConfCl
  */
 static void strip_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
 {
-  g_assert (strcmp (entry->key, GCONF_STRIP) == 0);
-  if (entry->value == NULL) {
+  g_assert (!entry || strcmp (entry->key, GCONF_STRIP) == 0);
+  if (!entry || entry->value == NULL) {
     strip_chars = FALSE;
   } else {
     strip_chars = gconf_value_get_bool (entry->value);
@@@@ -749,8 +749,8 @@@@ static void strip_changed_cb (GConfClien
  */
 static void eject_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
 {
-  g_assert (strcmp (entry->key, GCONF_EJECT) == 0);
-  if (entry->value == NULL) {
+  g_assert (!entry || strcmp (entry->key, GCONF_EJECT) == 0);
+  if (!entry || entry->value == NULL) {
     eject_finished = FALSE;
   } else {
     eject_finished = gconf_value_get_bool (entry->value);
@@@@ -762,8 +762,8 @@@@ static void eject_changed_cb (GConfClien
  */
 static void open_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
 {
-  g_assert (strcmp (entry->key, GCONF_OPEN) == 0);
-  if (entry->value == NULL) {
+  g_assert (!entry || strcmp (entry->key, GCONF_OPEN) == 0);
+  if (!entry || entry->value == NULL) {
     open_finished = FALSE;
   } else {
     open_finished = gconf_value_get_bool (entry->value);
@@@@ -775,10 +775,10 @@@@ static void open_changed_cb (GConfClient
  */
 static void audio_volume_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
 {
-  g_assert (strcmp (entry->key, GCONF_AUDIO_VOLUME) == 0);
+  g_assert (!entry || strcmp (entry->key, GCONF_AUDIO_VOLUME) == 0);
 
   GtkWidget *volb = GET_WIDGET ("volume_button");
-  if (entry->value == NULL) {
+  if (!entry || entry->value == NULL) {
     gtk_scale_button_set_value (GTK_SCALE_BUTTON (volb), 1.0);
   } else {
     gtk_scale_button_set_value (GTK_SCALE_BUTTON (volb), gconf_value_get_float (entry->value));
@@@@ -1099,9 +1099,9 @@@@ static void device_changed_cb (GConfClie
 {
   const char *device;
   gboolean ignore_no_media = GPOINTER_TO_INT (user_data);
-  g_assert (strcmp (entry->key, GCONF_DEVICE) == 0);
+  g_assert (!entry || strcmp (entry->key, GCONF_DEVICE) == 0);
 
-  if (entry->value == NULL || !cd_drive_exists (gconf_value_get_string (entry->value))) {
+  if (!entry || entry->value == NULL || !cd_drive_exists (gconf_value_get_string (entry->value))) {
     device = prefs_get_default_device();
     if (device == NULL) {
 #ifndef IGNORE_MISSING_CD
@@@@ -1128,8 +1128,8 @@@@ static void profile_changed_cb (GConfCli
 {
   GMAudioProfile *profile;
 
-  g_assert (strcmp (entry->key, GCONF_AUDIO_PROFILE) == 0);
-  if (!entry->value) return;
+  g_assert (!entry || strcmp (entry->key, GCONF_AUDIO_PROFILE) == 0);
+  if (!entry || !entry->value) return;
   profile = gm_audio_profile_lookup (gconf_value_get_string (entry->value));
   if (profile != NULL)
     g_object_set (extractor, "profile", profile, NULL);
@@@@ -1181,8 +1181,8 @@@@ http_proxy_setup (GConfClient *client)
  */
 static void http_proxy_enable_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
 {
-  g_assert (strcmp (entry->key, GCONF_HTTP_PROXY_ENABLE) == 0);
-  if (entry->value == NULL) return;
+  g_assert (!entry || strcmp (entry->key, GCONF_HTTP_PROXY_ENABLE) == 0);
+  if (!entry || entry->value == NULL) return;
   http_proxy_setup (client);
 }
 
@@@@ -1191,8 +1191,8 @@@@ static void http_proxy_enable_changed_cb
  */
 static void http_proxy_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
 {
-  g_assert (strcmp (entry->key, GCONF_HTTP_PROXY) == 0);
-  if (entry->value == NULL) return;
+  g_assert (!entry || strcmp (entry->key, GCONF_HTTP_PROXY) == 0);
+  if (!entry || entry->value == NULL) return;
   http_proxy_setup (client);
 }
 
@@@@ -1201,8 +1201,8 @@@@ static void http_proxy_changed_cb (GConf
  */
 static void http_proxy_port_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
 {
-  g_assert (strcmp (entry->key, GCONF_HTTP_PROXY_PORT) == 0);
-  if (entry->value == NULL) return;
+  g_assert (!entry || strcmp (entry->key, GCONF_HTTP_PROXY_PORT) == 0);
+  if (!entry || entry->value == NULL) return;
   http_proxy_setup (client);
 }
 
@@@@ -1404,7 +1404,8 @@@@ G_MODULE_EXPORT void on_artist_edit_chan
 
   if (current_album->artist) {
     former_album_artist = current_album->artist;
-  }
+  } else
+    former_album_artist = g_strdup("");
   current_album->artist = gtk_editable_get_chars (widget, 0, -1); /* get all the characters */
 
   if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (track_store), &iter)) {
@


1.3
log
@Sound Juicer "Here we are now, entertain us" 2.32.0
===================================================

* Many translations


Sound Juicer "Ce soir la femme du torero dormira sur ses deux oreilles" 2.31.6
==============================================================================

* Many translations
* Add --with-gtk=2.0|3.0 configure flag, defaulting to 2.0 (Vincent Untz)


Sound Juicer "L'amour c'est pas confortable" 2.31.5
===================================================

* Many translations
* Remove unnecessary markup from glade messages in sound-juicer (Claude Paroz)
* Use GtkBuilder and drop libglade support (Tadej Borovšak)
* Fix crash in sanitize_path at sj-extracting.c:859 (Bastien Nocera)
* Compile with -DGSEAL_ENABLED (André Klapper)
* Fix build: conflict with unistd.h (Vincent Untz)
* Use GtkInfoBar (Javier Jardón)
* Port to GTK+ 3 (Matthias Clasen)


Sound Juicer "But I remember us riding in my brother's car" 2.28.2
==================================================================

* Many translations
* Fix crasher when MusicBrainz can't read a disc (Bastien Nocera)
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.2 2010/05/18 20:03:04 drochner Exp $
@


1.2
log
@update to 2.28.2
changes:
-Fix crasher when MusicBrainz can't read a disc
-translation updates
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- src/sj-main.c.orig	2010-03-30 14:29:55.000000000 +0000
d5 1
a5 1
@@@@ -680,11 +680,11 @@@@ AlbumDetails* multiple_album_dialog(GLis
d19 1
a19 1
@@@@ -697,8 +697,8 @@@@ static void baseuri_changed_cb (GConfCli
d30 1
a30 1
@@@@ -712,8 +712,8 @@@@ static void path_pattern_changed_cb (GCo
d41 1
a41 1
@@@@ -727,8 +727,8 @@@@ static void file_pattern_changed_cb (GCo
d52 1
a52 1
@@@@ -743,8 +743,8 @@@@ static void paranoia_changed_cb (GConfCl
d63 1
a63 1
@@@@ -756,8 +756,8 @@@@ static void strip_changed_cb (GConfClien
d74 1
a74 1
@@@@ -769,8 +769,8 @@@@ static void eject_changed_cb (GConfClien
d85 1
a85 1
@@@@ -782,10 +782,10 @@@@ static void open_changed_cb (GConfClient
d92 1
a92 1
   GtkWidget *volb = glade_xml_get_widget (glade, "volume_button");
d98 1
a98 1
@@@@ -1107,9 +1107,9 @@@@ static void device_changed_cb (GConfClie
d110 1
a110 1
@@@@ -1137,8 +1137,8 @@@@ static void profile_changed_cb (GConfCli
d121 1
a121 1
@@@@ -1190,8 +1190,8 @@@@ http_proxy_setup (GConfClient *client)
d132 1
a132 1
@@@@ -1200,8 +1200,8 @@@@ static void http_proxy_enable_changed_cb
d143 1
a143 1
@@@@ -1210,8 +1210,8 @@@@ static void http_proxy_changed_cb (GConf
d154 1
a154 1
@@@@ -1414,7 +1414,8 @@@@ void on_artist_edit_changed(GtkEditable 
@


1.1
log
@avoid crashes if the disk title or artist cannot be identified
(just workarounds, the code is too messy for a real fix),
bump PKGREVISION
@
text
@d3 1
a3 1
--- src/sj-main.c.orig	2009-02-24 13:05:50.000000000 +0100
d5 150
a154 1
@@@@ -1416,7 +1416,8 @@@@ void on_artist_edit_changed(GtkEditable 
@