head	1.2;
access;
symbols
	pkgsrc-2019Q3:1.1.0.78
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.76
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.74
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.72
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.70
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.68
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.66
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.64
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.62
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.58
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.56
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.54
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.52
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.50
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.48
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.46
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.44
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.42
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.40
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.38
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.36
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.34
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.32
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.30
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.28
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.26
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.24
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.22
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.20
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.18
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.16
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.14
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.12
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.10
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.8
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.6
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.4
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.2
	pkgsrc-2010Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2019.10.18.12.34.19;	author nia;	state dead;
branches;
next	1.1;
commitid	CsjRAVagkjTPzlHB;

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


desc
@@


1.2
log
@sound-juicer: Update to 3.24.0

Switch to gtk3 and away from gstreamer0.10.
@
text
@$NetBSD: patch-ae,v 1.1 2010/05/18 20:03:04 drochner Exp $

--- src/sj-prefs.c.orig	2010-04-13 18:06:56.000000000 +0000
+++ src/sj-prefs.c
@@@@ -171,8 +171,8 @@@@ void prefs_edit_profile_clicked (GtkButt
 static void audio_profile_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
 {
   const char *value;
-  g_return_if_fail (strcmp (entry->key, GCONF_AUDIO_PROFILE) == 0);
-  if (!entry->value) return;
+  g_return_if_fail (!entry || strcmp (entry->key, GCONF_AUDIO_PROFILE) == 0);
+  if (!entry || !entry->value) return;
   value = gconf_value_get_string (entry->value);
   
   /* If the value is empty, unset the combo. Otherwise try and set it. */
@@@@ -193,10 +193,10 @@@@ static void baseuri_changed_cb (GConfCli
    * into sj-utils?
    */
   const char* base_uri, *current_uri;
-  g_return_if_fail (strcmp (entry->key, GCONF_BASEURI) == 0);
+  g_return_if_fail (!entry || strcmp (entry->key, GCONF_BASEURI) == 0);
 
   base_uri = NULL;
-  if (entry->value != NULL)
+  if (entry && entry->value != NULL)
     base_uri = gconf_value_get_string (entry->value);
 
   if (base_uri == NULL || base_uri[0] == '\0') {
@@@@ -288,9 +288,9 @@@@ static void path_pattern_changed_cb (GCo
 {
   char *value;
   int i = 0;
-  g_return_if_fail (strcmp (entry->key, GCONF_PATH_PATTERN) == 0);
+  g_return_if_fail (!entry || strcmp (entry->key, GCONF_PATH_PATTERN) == 0);
 
-  if (entry->value == NULL) {
+  if (!entry || entry->value == NULL) {
     value = g_strdup (path_patterns[0].pattern);
   } else if (entry->value->type == GCONF_VALUE_STRING) {
     value = g_strdup (gconf_value_get_string (entry->value));
@@@@ -309,9 +309,9 @@@@ static void file_pattern_changed_cb (GCo
   char *value;
   int i = 0;
   
-  g_return_if_fail (strcmp (entry->key, GCONF_FILE_PATTERN) == 0);
+  g_return_if_fail (!entry || strcmp (entry->key, GCONF_FILE_PATTERN) == 0);
   
-  if (entry->value == NULL) {
+  if (!entry || entry->value == NULL) {
     value = g_strdup (file_patterns[0].pattern);
   } else if (entry->value->type == GCONF_VALUE_STRING) {
     value = g_strdup (gconf_value_get_string (entry->value));
@@@@ -330,9 +330,9 @@@@ static void file_pattern_changed_cb (GCo
  */
 static void device_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
 {
-  g_return_if_fail (strcmp (entry->key, GCONF_DEVICE) == 0);
+  g_return_if_fail (!entry || strcmp (entry->key, GCONF_DEVICE) == 0);
 
-  if (entry->value == NULL)
+  if (!entry || entry->value == NULL)
     return;
 
   if (entry->value->type == GCONF_VALUE_STRING) {
@@@@ -363,9 +363,9 @@@@ static void strip_changed_cb (GConfClien
   /* NOTE that strip_changed_cb in sj-main.c will also be called, and will also update
      the global value strip_chars - but which function will get called first?
      Make sure strip_chars is up to date BEFORE calling pattern_label_update */
-  g_return_if_fail (strcmp (entry->key, GCONF_STRIP) == 0);
+  g_return_if_fail (!entry || strcmp (entry->key, GCONF_STRIP) == 0);
 
-  if (entry->value == NULL) {
+  if (!entry || entry->value == NULL) {
     strip_chars = FALSE;
   } else {
     strip_chars = gconf_value_get_bool (entry->value);
@


1.1
log
@update to 2.28.2
changes:
-Fix crasher when MusicBrainz can't read a disc
-translation updates
@
text
@d1 1
a1 1
$NetBSD$
@